From: limb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Date: Fri, 1 Dec 2006 16:52:35 +0000 (+0000)
Subject: Fixed massive draw bug from last bugfix.  Wrap and draw are really, really fixed... 
X-Git-Tag: 1.01~119
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=8a30f579386ce764f322aee0843bcc3a8fbbcf9e;p=curblaster.git

Fixed massive draw bug from last bugfix.  Wrap and draw are really, really fixed now.


git-svn-id: svn+ssh://svn/var/repos/curfender@547 bc5cbbab-a4ec-0310-bb52-ff3d296db539
---

diff --git a/main.cpp b/main.cpp
index 092627c..e240cc1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -178,11 +178,11 @@ int draw_object(game_object object, int drawlocation){
     if(drawlocation>=540&&object.y<620-drawlocation&&object.number!=1){
       offset = 620-drawlocation+object.y;  //right of player wrap correction
     };
-
+    
     if(drawlocation<0&&object.y>=540&&object.number!=1){
-      offset = abs(drawlocation)-(620-object.y);  //left of player wrap correction
+      offset = abs(drawlocation)-abs(620-object.y);  //left of player wrap correction
     };
-
+    
     if(object.active==1){
       if(object.face==0){
 	mvprintw(object.x,offset,"%s",object.line0);
@@ -341,10 +341,10 @@ int main(){
   };
   pod3.face = 0;
   pod3.speed = 1;
-  strcpy (pod3.line0, " x ");
-  strcpy (pod3.line1, " x ");
-  strcpy (pod3.line2, " + ");
-  strcpy (pod3.line3, " + ");
+  strcpy (pod3.line0, " + ");
+  strcpy (pod3.line1, " + ");
+  strcpy (pod3.line2, " x ");
+  strcpy (pod3.line3, " x ");
   strcpy (pod3.radar, "x");
 
   game_object pod4;
@@ -379,10 +379,10 @@ game_object pod5;
   };
   pod5.face = 0;
   pod5.speed = 1;
-  strcpy (pod5.line0, " x ");
-  strcpy (pod5.line1, " x ");
-  strcpy (pod5.line2, " + ");
-  strcpy (pod5.line3, " + ");
+  strcpy (pod5.line0, " + ");
+  strcpy (pod5.line1, " + ");
+  strcpy (pod5.line2, " x ");
+  strcpy (pod5.line3, " x ");
   strcpy (pod5.radar, "x");
 
 game_object pod6;
@@ -417,10 +417,10 @@ game_object pod7;
   };
   pod7.face = 0;
   pod7.speed = 1;
-  strcpy (pod7.line0, " x ");
-  strcpy (pod7.line1, " x ");
-  strcpy (pod7.line2, " + ");
-  strcpy (pod7.line3, " + ");
+  strcpy (pod7.line0, " + ");
+  strcpy (pod7.line1, " + ");
+  strcpy (pod7.line2, " x ");
+  strcpy (pod7.line3, " x ");
   strcpy (pod7.radar, "x");
 
 game_object pod8;
@@ -455,10 +455,10 @@ game_object pod9;
   };
   pod9.face = 0;
   pod9.speed = 1;
-  strcpy (pod9.line0, " x ");
-  strcpy (pod9.line1, " x ");
-  strcpy (pod9.line2, " + ");
-  strcpy (pod9.line3, " + ");
+  strcpy (pod9.line0, " + ");
+  strcpy (pod9.line1, " + ");
+  strcpy (pod9.line2, " x ");
+  strcpy (pod9.line3, " x ");
   strcpy (pod9.radar, "x");
 
   game_object pods[8] = { { pod2 }, { pod3 }, { pod4 }, { pod5 }, { pod6 }, { pod7 }, { pod8 }, { pod9 } };
@@ -497,7 +497,6 @@ game_object pod9;
 
     // Draw pods objects 2-9
     drawlocation = draw_object(pod2, drawlocation);
-    /*
     drawlocation = draw_object(pod3, drawlocation);
     drawlocation = draw_object(pod4, drawlocation);
     drawlocation = draw_object(pod5, drawlocation);
@@ -505,7 +504,6 @@ game_object pod9;
     drawlocation = draw_object(pod7, drawlocation);
     drawlocation = draw_object(pod8, drawlocation);
     drawlocation = draw_object(pod9, drawlocation);
-    */
     
     // Draw gate object 10
     drawlocation = draw_object(gate, drawlocation);
@@ -522,7 +520,6 @@ game_object pod9;
     radar_plot(gatebeam2, drawlocation);
     radar_plot(gatebeam3, drawlocation);
     radar_plot(pod2, drawlocation);
-    /*
     radar_plot(pod3, drawlocation);
     radar_plot(pod4, drawlocation);
     radar_plot(pod5, drawlocation);
@@ -530,11 +527,10 @@ game_object pod9;
     radar_plot(pod7, drawlocation);
     radar_plot(pod8, drawlocation);
     radar_plot(pod9, drawlocation);
-    */
     radar_plot(player, drawlocation);
 
     //debug
-    mvprintw(21,1,"y:%d drawloc:%d", pod2.y, drawlocation);
+    //mvprintw(21,1,"y:%d drawloc:%d", pod2.y, drawlocation);
 
     //get the cursor out of the way
     mvprintw(23,79,"|");