- [NEW] Ja perd vides, i ja es veuen en el marcador

source/actor.cpp

@@ -716,6 +716,9 @@ namespace actor
         vec3_t max = room::getMax();
 
         if ( (act->push & PUSH_KILL) && (act->flags & FLAG_HERO) ) {
+            const int lives = hero::getLives()-1;
+            hero::setLives(lives);
+            // [TODO] If lives == 0 anar a la pantalla de game-over o cat's life
             actor_t *act = actor::find("HERO");
             act = actor::replaceWithTemplate(act, "EXPLOSION");
             actor_t *act2 = actor::createFromTemplate("EXPLOSION");
@@ -1327,6 +1330,7 @@ namespace actor
         int parts = PART_NONE;
         bool boosters_collected[100];
         vec3_t first_pos = {0,0,0};
+        int first_orient = 0;
 
         void init(const bool complete)
         {
@@ -1344,6 +1348,7 @@ namespace actor
                 for (int i=0; i<100; ++i) boosters_collected[i] = false;
             } else {
                 hero->pos = first_pos;
+                hero->orient = first_orient;
             }
         }
 
@@ -1523,6 +1528,7 @@ namespace actor
         {
             actor_t *hero = actor::find("HERO");
             first_pos = hero->pos;
+            first_orient = hero->orient;
         }
 
     }

source/m_game.cpp

@@ -312,13 +312,18 @@ namespace modules
                 const int col1 = room::getColor(1);
                 const int col2 = room::getColor(2);
                 const int col3 = room::getColor(3);
-                draw::print2("a", 4, 26, col1, FONT_ZOOM_NONE);
-                draw::print2("b", 7, 26, col2, FONT_ZOOM_NONE);
-                draw::print2("c", 10, 26, col3, FONT_ZOOM_NONE);
 
-                draw::print2(actor::hero::getBoostJump(), 2, 3, 27, col3, FONT_ZOOM_NONE);
+                //draw::print2("hi", 4, 24, col3, FONT_ZOOM_NONE);
-                draw::print2(actor::hero::getBoostGod()/2, 2, 6, 27, col1, FONT_ZOOM_NONE);
+                draw::print2("no", 4, 25, col3, FONT_ZOOM_NONE);
-                draw::print2(actor::hero::getBoostRun()/2, 2, 9, 27, col2, FONT_ZOOM_NONE);
+                draw::print2(actor::hero::getLives(), 2, 4, 26, col1, FONT_ZOOM_VERTICAL);
+
+                draw::print2("a", 9, 26, col1, FONT_ZOOM_NONE);
+                draw::print2("b", 12, 26, col2, FONT_ZOOM_NONE);
+                draw::print2("c", 15, 26, col3, FONT_ZOOM_NONE);
+                
+                draw::print2(actor::hero::getBoostJump(), 2, 8, 27, col3, FONT_ZOOM_NONE);
+                draw::print2(actor::hero::getBoostGod()/2, 2, 11, 27, col1, FONT_ZOOM_NONE);
+                draw::print2(actor::hero::getBoostRun()/2, 2, 14, 27, col2, FONT_ZOOM_NONE);
 
                 draw::stencil::enable();
                 draw::stencil::clear(255);