Revision 7:4c8ad4f91c8b, committed 2017-05-03

Comitter:

rpgjake

Date:

Wed May 03 08:07:49 2017 +0000

Parent:

6:b17d76960330

Commit message:

fdfdfd

Changed in this revision

--- a/main.cpp	Wed May 03 03:00:23 2017 +0000
+++ b/main.cpp	Wed May 03 08:07:49 2017 +0000
@@ -260,46 +260,46 @@
     //uLCD.set_sector_address(Mapx, Mapy);
     //uLCD.display_image(0,0);
     p_Princess.job = j_Erika;
-    p_Thief = j_Thief;
-    p_WhiteMage = j_Cleric;
-    p_Pirate = j_Pirate;
-    p_Lancer = j_Knight;
-    p_Archer = j_Archer;
-    p_Dragon = j_Myrrh;
-    p_Sage = j_Sage_M;
-    p_Caster = j_Sage_F;
-    p_Assassin = j_Assassin_F;
-    p_Medic = j_Bard;
-    p_Brigand = j_Brigand;
-    p_Wolf_a = j_Wolf;
-    p_Wolf_b = j_Wolf;
-    p_Wolf_c = j_Wolf;
-    p_Assassin_e = j_Boss_Assassin_F;
-    p_Fighter_a = j_Fighter;
-    p_Fighter_b = j_Fighter;
-    p_Fighter_c = j_Fighter;
-    person_t p_RedSpider = j_RedSpider;
-    p_Spider_a = j_Spider;
-    p_Spider_b = j_Spider;
-    p_Spider_c = j_Spider;
-    p_FallenHero = j_Hero;
-    p_Mage_4a = j_Mage;
-    p_Mage_4b = j_Mage;
-    p_Mage_4c = j_Mage;
-    p_TrueAssassin = j_Assassin_M;
-    p_Zombie_5a = j_Zombie;
-    p_Zombie_5b = j_Zombie;
-    p_Zombie_5c = j_Zombie;
-    p_General = j_General;
-    p_Zombie_6a = j_Zombie;
-    p_Zombie_6b = j_Zombie;
-    p_Mage_6a = j_Mage;
-    p_Mage_6b = j_Mage;
-    p_Summoner = j_Summoner;
-    p_Zombie_7a = j_Zombie;
-    p_Zombie_7b = j_Zombie;
-    p_Zombie_7c = j_Zombie;
-    p_Zombie_7d = j_Zombie;
+    p_Thief.job = j_Thief;
+    p_WhiteMage.job = j_Cleric;
+    p_Pirate.job = j_Pirate;
+    p_Lancer.job = j_Knight;
+    p_Archer.job = j_Archer;
+    p_Dragon.job = j_Myrrh;
+    p_Sage.job = j_Sage_M;
+    p_Caster.job = j_Sage_F;
+    p_Assassin.job = j_Assassin_F;
+    p_Medic.job = j_Bard;
+    p_Brigand.job = j_Brigand;
+    p_Wolf_a.job = j_Wolf;
+    p_Wolf_b.job = j_Wolf;
+    p_Wolf_c.job = j_Wolf;
+    p_Assassin_e.job = j_Boss_Assassin_F;
+    p_Fighter_a.job = j_Fighter;
+    p_Fighter_b.job = j_Fighter;
+    p_Fighter_c.job = j_Fighter;
+    p_RedSpider.job = j_RedSpider;
+    p_Spider_a.job = j_Spider;
+    p_Spider_b.job = j_Spider;
+    p_Spider_c.job = j_Spider;
+    p_FallenHero.job = j_Hero;
+    p_Mage_4a.job = j_Mage;
+    p_Mage_4b.job = j_Mage;
+    p_Mage_4c.job = j_Mage;
+    p_TrueAssassin.job = j_Assassin_M;
+    p_Zombie_5a.job = j_Zombie;
+    p_Zombie_5b.job = j_Zombie;
+    p_Zombie_5c.job = j_Zombie;
+    p_General.job = j_General;
+    p_Zombie_6a.job = j_Zombie;
+    p_Zombie_6b.job = j_Zombie;
+    p_Mage_6a.job = j_Mage;
+    p_Mage_6b.job = j_Mage;
+    p_Summoner.job = j_Summoner;
+    p_Zombie_7a.job = j_Zombie;
+    p_Zombie_7b.job = j_Zombie;
+    p_Zombie_7c.job = j_Zombie;
+    p_Zombie_7d.job = j_Zombie;
     
     
     
@@ -310,8 +310,8 @@
         temp_person_init->v = i;
         temp_person_init->status = 1;
         Mc.remain_moves = Mc.job.movement;
-        temp_person_init->remain_moves = temp_person_init->job->movement;
-        temp_person_init->health = temp_person_init->job->maxHealth;
+        temp_person_init->remain_moves = temp_person_init->job.movement;
+        temp_person_init->health = temp_person_init->job.maxHealth;
         if (i<=11)
             temp_person_init->FoF = USER;
         else
@@ -600,12 +600,6 @@
     Julio_Mbed.putc(User_person->v);
     Julio_Mbed.putc(User_person->health);
     Julio_Mbed.putc(User_person->job.maxHealth);
-    Julio_Mbed.putc(User_person->job.v);
-    Julio_Mbed.putc(User_person->job.attack);
-    Julio_Mbed.putc(User_person->job.movement);
-    Julio_Mbed.putc(User_person->job.rng);
-    Julio_Mbed.putc(User_person->job.defence);
-    Julio_Mbed.putc(User_person->job.res);
     int j = pb7;
     int xloc_u = 1;
     int yloc_u = 1;
@@ -1139,7 +1133,7 @@
     while (units_received == 0){
         waitForAck();
     }
-    load_floor(stageneumber);
+    load_floor(stagenumber);
     load_units_map();
     
     
@@ -1289,6 +1283,7 @@
     }
 }
  
+ 
 void combatPhase(char a, char d)
 {
     pc.putc('1');