From: limb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Date: Fri, 29 May 2009 14:59:36 +0000 (+0000)
Subject: Fixed boss display issue.
X-Git-Tag: 1.01~42
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=b8dcdecab6bfed87b4b53cf20359d8cc9fbf40ef;p=curblaster.git

Fixed boss display issue.


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

diff --git a/CHANGELOG b/CHANGELOG
index fcf4a9c..fc7d98b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+Merged saucer boss into unified boss system.
 All objects save bullets explode now, still nonkilling.
 Added death explosions, nonkilling, for player only so far.
 Added saucer boss, level 4.
diff --git a/main.cpp b/main.cpp
index 35ba39a..41beb62 100644
--- a/main.cpp
+++ b/main.cpp
@@ -61,10 +61,10 @@ struct game_object {
   int ytrail[10]; //y history
   int chase; //the pod a lander is targeting
   int phase; //chase phase, also used to hold boss life
-  char line0[6]; //object: left
-  char line1[6]; //object: right
-  char line2[6]; //object: alt1
-  char line3[6]; //object: alt2
+  char line0[17]; //object: left
+  char line1[17]; //object: right
+  char line2[17]; //object: alt1
+  char line3[17]; //object: alt2
   char radar[1]; //radar symbol
 };
 
@@ -1069,23 +1069,23 @@ int main(){
   };
 
   struct game_object bosses[6] = {
-    { 300, 0, 0, 0, 5, 1, 0, 0, 0, 0 },
-    { 301, 0, 0, 0, 5, 1, 0, 0, 0, 0 },
-    { 302, 0, 0, 0, 5, 1, 0, 0, 0, 0 },
-    { 303, 0, 0, 0, 5, 1, 0, 0, 0, 0 },
-    { 304, 0, 0, 0, 5, 1, 0, 0, 0, 0 },
-    { 305, 0, 0, 0, 5, 1, 0, 0, 0, 0 }
+    { 300, 0, 0, 0, 5, 4, 0, 0, 0, 0 },
+    { 301, 0, 0, 0, 5, 4, 0, 0, 0, 0 },
+    { 302, 0, 0, 0, 5, 4, 0, 0, 0, 0 },
+    { 303, 0, 0, 0, 5, 4, 0, 0, 0, 0 },
+    { 304, 0, 0, 0, 5, 4, 0, 0, 0, 0 },
+    { 305, 0, 0, 0, 5, 4, 0, 0, 0, 0 }
   };
-  
-  strcpy (bosses[0].line0, "/==O==\\");
+
+  strcpy (bosses[0].line0, "");  
   strcpy (bosses[0].line1, "/==O==\\");
   strcpy (bosses[0].radar, "O");
 
-  strcpy (bosses[1].line0, "/=O=\\");
+  strcpy (bosses[1].line0, "   /=O=\\");
   strcpy (bosses[1].line1, "/===+=+===\\");
   strcpy (bosses[1].radar, "O");
   
-  strcpy (bosses[2].line0, "/O\\");
+  strcpy (bosses[2].line0, "      /O\\");
   strcpy (bosses[2].line1, "<==/==[=]==\\==>");
   strcpy (bosses[2].radar, "O");
   
@@ -1094,10 +1094,10 @@ int main(){
   strcpy (bosses[3].radar, "O");
   
   strcpy (bosses[4].line0, "(----)");
-  strcpy (bosses[4].line1, "/||\\");
+  strcpy (bosses[4].line1, " /||\\");
   strcpy (bosses[4].radar, "O");
   
-  strcpy (bosses[5].line0, ".");
+  strcpy (bosses[5].line0, "");
   strcpy (bosses[5].line1, ".");
   strcpy (bosses[5].radar, "O");
 
@@ -2259,7 +2259,7 @@ int main(){
 	    };
 	  };
 	  //Gen bosses
-	  if(level==4){
+	  if(level==2){
 	    bosses[0] = boss_init(bosses[0]);
 	  };
           if(level==8){