Repositories / curblaster.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 873f2d5)
Fixed ref marked out of bounds draw bug.
authorlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Tue, 10 Jul 2007 16:40:24 +0000 (16:40 +0000)
committerlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Tue, 10 Jul 2007 16:40:24 +0000 (16:40 +0000)
git-svn-id: svn+ssh://svn/var/repos/curfender@653 bc5cbbab-a4ec-0310-bb52-ff3d296db539

main.cpp patch | blob | blame | history

diff --git a/main.cpp b/main.cpp
index a7e2e59..e66cdad 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -503,7 +503,7 @@ int draw_object(game_object object, int drawlocation){
       offset = abs(drawlocation)-abs(620-object.y);  //left of player wrap correction
     };
     
-    if((object.active==1&&object.x>=1&&object.x<=18&&offset>=0&&offset<=79)||(object.number>=200&&object.number<=230)){
+    if((object.active==1&&object.x>=1&&object.x<=18&&offset>=0&&offset<=79)||((object.number>=200&&object.number<=230)&&(offset>=0&&offset<=79))){
       if(object.face==0){
        mvprintw(object.x,offset,"%s",object.line0);
       } else if(object.face==1){
@@ -579,6 +579,7 @@ void boom_object(game_object boomstuff, game_object object){
            } else {
              boomstuff.face = 1;
            };
+           mvprintw(20,20,"Boom");
            drawlocation = draw_object(boomstuff, drawlocation);
            refresh();
          };
@@ -1543,6 +1544,7 @@ int main(){
                };
              };
            };
+           boom_object(boomstuff, landers[landerloop]);
            landers[landerloop] = object_out(landers[landerloop]);
            score = score + 10;
          };
@@ -1559,6 +1561,7 @@ int main(){
                };
              };
            };
+           boom_object(boomstuff, crazies[crazyloop]);
            crazies[crazyloop] = object_out(crazies[crazyloop]);
            score = score + 10;
          };
@@ -1575,6 +1578,7 @@ int main(){
                };
              };
            };
+           boom_object(boomstuff, crawlers[crawlerloop]);
            crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
            score = score + 10;
          };
@@ -1593,6 +1597,7 @@ int main(){
                  };
                };
              };
+             boom_object(boomstuff, saucer);
              saucer = object_out(saucer);
              score = score + 100;
            };
@@ -1665,18 +1670,21 @@ int main(){
              };
            };
          };
+         boom_object(boomstuff, landers[landerloop]);
          landers[landerloop] = object_out(landers[landerloop]);
          score = score + 20;
        };
       };
       for(int crazyloop = 0; crazyloop<landermax; crazyloop++){
        if(abs(player.y-crazies[crazyloop].y)<=40){
+         boom_object(boomstuff, crazies[crazyloop]);
          crazies[crazyloop] = object_out(crazies[crazyloop]);
          score = score + 20;
        };
       };
       for(int crawlerloop = 0; crawlerloop<crawlermax; crawlerloop++){
        if(abs(player.y-crawlers[crawlerloop].y)<=40){
+         boom_object(boomstuff, crawlers[crawlerloop]);
          crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
          score = score + 20;
        };
@@ -1685,6 +1693,7 @@ int main(){
        if(abs(player.y-saucer.y)<=40){
          saucer.phase = saucer.phase - 5;
          if(saucer.phase<=0){
+           boom_object(boomstuff, saucer);
            saucer = object_out(saucer);
            score = score + 100;
          };
@@ -1720,6 +1729,7 @@ int main(){
                  };
                };
              };
+             boom_object(boomstuff, landers[landerloop]);
              landers[landerloop] = object_out(landers[landerloop]);
              bullets[bulletloop].vtime = 100;
              bullets[bulletloop] = age_bullet(bullets[bulletloop]);
@@ -1742,6 +1752,7 @@ int main(){
                  };
                };
              };
+             boom_object(boomstuff, crazies[crazyloop]);
              crazies[crazyloop] = object_out(crazies[crazyloop]);
              bullets[bulletloop].vtime = 100;
              bullets[bulletloop] = age_bullet(bullets[bulletloop]);
@@ -1764,6 +1775,7 @@ int main(){
                  };
                };
              };
+             boom_object(boomstuff, crawlers[crawlerloop]);
              crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
              bullets[bulletloop].vtime = 100;
              bullets[bulletloop] = age_bullet(bullets[bulletloop]);
@@ -1787,6 +1799,7 @@ int main(){
                  };
                };
              };
+             boom_object(boomstuff, saucer);
              saucer = object_out(saucer);
              bullets[bulletloop].vtime = 100;
              bullets[bulletloop] = age_bullet(bullets[bulletloop]);
@@ -1826,6 +1839,7 @@ int main(){
        if(shieldup==1){
          for(int shieldloop = 0; shieldloop<12; shieldloop++){
            if(check_collision(landers[landerloop], shields[shieldloop])==1){
+             boom_object(boomstuff, landers[landerloop]);
              landers[landerloop] = object_out(landers[landerloop]);
              score = score + 20;
            };
Fork of https://codeberg.org/gwync/curblaster.git with improvements