- [FIX] El mode a pantalla completa ja manté proporcions senceres, amb barres negres pels costat quan fa falta

- [NEW] Amb F4 se fa toggle entre mode NORMAL, SCANLINES, FOSFORO i SCANLINES+FOSFORO

.gitignore

@@ -4,4 +4,7 @@
 *.dSYM/*
 build/*
 thepool
-thepool_debug
+thepool_debug
+valgrind*
+release/*
+data.jf2

data/gifs.txt

@@ -9,6 +9,7 @@ end2.gif
 floor.gif
 font.gif
 font2.gif
+fosforo.gif
 gat.gif
 gat2.gif
 intro1.gif
@@ -22,6 +23,10 @@ mapa.gif
 objectes.gif
 obrer.gif
 piscina.gif
+prologo1.gif
+prologo2.gif
+prologo3.gif
+prologo4.gif
 roomaux.gif
 sam.gif
 test.gif

data/rooms/14.txt

@@ -1,7 +1,7 @@
 width: 2
 height: 3
 door-height-xn: 3
-door-height-yp: 2
+door-height-yp: 3
 color: WHITE
 floor-texture: 11
 wall-texture: 2

data/rooms/26.txt

@@ -37,6 +37,17 @@ actor{
     movement: CW
 }
 
+actor{
+    name: ARCADE
+    bmp: altres.gif
+    bmp-rect: 160 0 30 48
+    bmp-offset: 0 49
+    pos: 56 8 0
+    size: 8 8 16
+    orient: YP 
+    movement: CW
+}
+
 actor{
     name: BATMAN
     bmp: batman.gif
@@ -67,7 +78,7 @@ actor{
     bmp: altres.gif
     bmp-rect: 128 0 20 41
     bmp-offset: -6 45
-    pos: 56 8 0
+    pos: 16 8 0
     size: 6 6 16
     movement: CW
 }

data/rooms/27.txt

@@ -11,6 +11,19 @@ exit-xp: 17
 exit-xn: 28
 editor-done: 1
 
+actor{
+    name: B-03-GOD
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 48 -3 16
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
 actor{
     name: BOX-B
     bmp: caixes.gif

data/rooms/51.txt

@@ -21,6 +21,18 @@ actor{
     movement: CW
 }
 
+actor{
+    name: ARCADE
+    bmp: altres.gif
+    bmp-rect: 160 0 30 48
+    bmp-offset: 0 49
+    pos: 8 24 0
+    size: 8 8 16
+    orient: YP 
+    flags: ORIENTABLE 
+    movement: CW
+}
+
 actor{
     name: CADIRA
     bmp: caixes.gif

data/rooms/56.txt

@@ -27,6 +27,19 @@ actor{
     movement: CW
 }
 
+actor{
+    name: B-02-RUN
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 8 8 0
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
 actor{
     name: BATMAN
     bmp: batman.gif

data/rooms/61.txt

@@ -25,7 +25,7 @@ actor{
     bmp: altres.gif
     bmp-rect: 0 133 32 27
     bmp-offset: 0 27
-    pos: 0 48 0
+    pos: 0 51 0
     size: 8 8 6
     flags: REACTIVE DEADLY 
     react-mask: XP XN YP YN ZP ZN 

data/rooms/64.txt

@@ -176,11 +176,11 @@ actor{
 }
 
 actor{
-    name: S-BAG
+    name: X-0
     bmp: objectes.gif
-    bmp-rect: 145 41 20 25
-    bmp-offset: -5 27
-    pos: 31 13 16
+    bmp-rect: 162 0 28 22
+    bmp-offset: -3 24
+    pos: 8 32 0
     size: 4 4 4
     anim-cycle: SEQ
     anim-wait: 2
@@ -189,25 +189,12 @@ actor{
 }
 
 actor{
-    name: S-GLOVES
-    bmp: objectes.gif
-    bmp-rect: 165 45 21 22
-    bmp-offset: -2 26
-    pos: 24 14 4
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: S-PANTS
+    name: X-1
     bmp: objectes.gif
     bmp-rect: 167 22 18 23
     bmp-offset: -7 27
     pos: 16 24 4
-    size: 4 4 4
+    size: 4 4 6
     anim-cycle: SEQ
     anim-wait: 2
     flags: SPECIAL 
@@ -215,12 +202,25 @@ actor{
 }
 
 actor{
-    name: S-SHOES
+    name: X-2
     bmp: objectes.gif
-    bmp-rect: 162 0 28 22
-    bmp-offset: -3 24
-    pos: 0 24 0
-    size: 4 4 4
+    bmp-rect: 165 45 21 22
+    bmp-offset: -2 26
+    pos: 24 14 4
+    size: 4 4 5
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: SPECIAL 
+    movement: CW
+}
+
+actor{
+    name: X-3
+    bmp: objectes.gif
+    bmp-rect: 145 41 20 25
+    bmp-offset: -5 27
+    pos: 34 13 16
+    size: 6 4 6
     anim-cycle: SEQ
     anim-wait: 2
     flags: SPECIAL 

data/rooms/69.txt

@@ -210,19 +210,6 @@ actor{
     movement: Y
 }
 
-actor{
-    name: S-GLOVES
-    bmp: objectes.gif
-    bmp-rect: 165 45 21 22
-    bmp-offset: -2 26
-    pos: 8 22 0
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: SPECIAL 
-    movement: CW
-}
-
 actor{
     name: WC
     bmp: altres.gif
@@ -234,3 +221,16 @@ actor{
     flags: ORIENTABLE 
     movement: CCW
 }
+
+actor{
+    name: Y-2
+    bmp: objectes.gif
+    bmp-rect: 165 45 21 22
+    bmp-offset: -2 26
+    pos: 8 22 0
+    size: 4 4 5
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: SPECIAL 
+    movement: CW
+}

data/rooms/75.txt

@@ -94,19 +94,6 @@ actor{
     movement: Y
 }
 
-actor{
-    name: S-PANTS
-    bmp: objectes.gif
-    bmp-rect: 167 22 18 23
-    bmp-offset: -7 27
-    pos: 0 16 0
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: SPECIAL 
-    movement: CW
-}
-
 actor{
     name: TRANSPA-00
     bmp: altres.gif
@@ -316,3 +303,16 @@ actor{
     size: 8 8 6
     movement: CW
 }
+
+actor{
+    name: Y-1
+    bmp: objectes.gif
+    bmp-rect: 167 22 18 23
+    bmp-offset: -7 27
+    pos: 0 16 0
+    size: 4 4 6
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: SPECIAL 
+    movement: CW
+}

data/rooms/78.txt

@@ -1,7 +1,7 @@
 width: 2
 height: 3
 door-height-xn: 3
-door-height-yp: 2
+door-height-yp: 3
 color: WHITE
 floor-texture: 11
 wall-texture: 2
@@ -402,12 +402,12 @@ actor{
 }
 
 actor{
-    name: S-SHOES
+    name: Y-0
     bmp: objectes.gif
     bmp-rect: 162 0 28 22
     bmp-offset: -3 24
     pos: 40 0 4
-    size: 4 4 4
+    size: 6 6 4
     anim-cycle: SEQ
     anim-wait: 2
     flags: SPECIAL 

data/rooms/85.txt

@@ -155,19 +155,6 @@ actor{
     movement: Y
 }
 
-actor{
-    name: S-BAG
-    bmp: objectes.gif
-    bmp-rect: 145 41 20 25
-    bmp-offset: -5 27
-    pos: 0 56 20
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: SPECIAL 
-    movement: CW
-}
-
 actor{
     name: TRANSPA-00
     bmp: altres.gif
@@ -268,3 +255,16 @@ actor{
     flags: PUSHABLE GRAVITY 
     movement: CW
 }
+
+actor{
+    name: Y-3
+    bmp: objectes.gif
+    bmp-rect: 145 41 20 25
+    bmp-offset: -5 27
+    pos: 0 56 20
+    size: 6 4 6
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: SPECIAL 
+    movement: CW
+}

data/templates.txt

@@ -273,6 +273,18 @@ category{
         movement: CCW
     }
 
+    actor{
+        name: ARCADE
+        bmp: altres.gif
+        bmp-rect: 160 0 30 48
+        bmp-offset: 0 49
+        pos: 0 16 0
+        size: 8 8 16
+        orient: YP 
+        flags: ORIENTABLE 
+        movement: CW
+    }
+
 }
 
 category{

source/actor.cpp

@@ -33,6 +33,7 @@ namespace actor
 
     int walk_channel = -1;
     bool push_sound_already_playing = false;
+    std::vector<actor_t*> purgatory;
 
     void resetTag()
     {
@@ -69,6 +70,7 @@ namespace actor
         act->surface = draw::getSurface(bmp.c_str());
         act->bmp_rect = r;
         act->bmp_offset = o;
+        act->alive = true;
         return act;
     }
 
@@ -89,6 +91,8 @@ namespace actor
         act->react_mask = act->react_push = 0;
         act->flags = FLAG_NONE;
         act->template_category = 0;
+        act->alive = true;
+
         return act;
     }
 
@@ -233,7 +237,7 @@ namespace actor
         newactor->prev = act->prev;
         newactor->next = act->next;
         act->prev = act->next = nullptr;
-        remove(act);
+        sendToPurgatory(act);
         return newactor;
     }
 
@@ -457,13 +461,33 @@ namespace actor
         actor_t *hero = find("HERO");
         while (obj2)
         {
-            if (obj2 != hero && obj1 != obj2 && check_2d_collision(obj1, obj2))
+            if (obj2 != hero && obj1 != obj2 && (obj1->pos.z<obj2->pos.z+obj2->size.z) && check_2d_collision(obj1, obj2))
                 return true;
             obj2 = obj2->next;
         }
         return false;
     }
 
+    void find_non_colliding_position(actor_t *obj)
+    {
+        int dist = 1;
+        while (does_collide(obj))
+        {
+            obj->pos.x += dist;
+            if (!does_collide(obj)) return;
+            obj->pos.x -= dist*2;
+            if (!does_collide(obj)) return;
+            obj->pos.x += dist;
+            obj->pos.y += dist;
+            if (!does_collide(obj)) return;
+            obj->pos.y -= dist*2;
+            if (!does_collide(obj)) return;
+            obj->pos.y += dist;
+            dist++;
+        }
+    }
+
+
     const bool is_above(actor_t *obj1, actor_t *obj2)
     {
         return check_2d_collision(obj1, obj2) && (obj1->pos.z == obj2->pos.z + obj2->size.z);
@@ -636,6 +660,7 @@ namespace actor
             audio::playSound("snd_disappear.wav", SOUND_BASIC);
             act = actor::replaceWithTemplate(act, "EXPLOSION");
             act->name[0] = '_';
+            return PUSH_NONE;
         }
 
         if (source->flags & FLAG_DEADLY)
@@ -675,6 +700,36 @@ namespace actor
                     hero::pickAnbernic(act->name);
                     audio::playSound("snd_pick.wav", SOUND_BASIC);
                 }
+                else if (act->name[0] == 'X')
+                {
+                    if (hero::isCarryingPrologoObject()) {
+                        audio::playSound("snd_push.wav", SOUND_BASIC);
+                        return result;
+                    } else {
+                        hero::pickPrologoObject(act->name[2]-48);
+                        audio::playSound("snd_pick.wav", SOUND_BASIC);
+                    }
+                }
+                else if (act->name[0] == 'Y')
+                {
+                    const int which = act->name[2]-48;
+                    if (hero::getPrologoObjectState(which)==PROLOGO_OBJECT_PICKED)
+                    {
+                        hero::leavePrologoObject(which);
+                        audio::playSound("snd_pick.wav", SOUND_BASIC);
+                        act->name[0] = 'Z';
+                        room::cycleColor(1);
+                        return result;
+                    } else {
+                        audio::playSound("snd_push.wav", SOUND_BASIC);
+                        return result;
+                    }
+                }
+                else if (act->name[0] == 'Z')
+                {
+                    audio::playSound("snd_push.wav", SOUND_BASIC);
+                    return result;
+                }
                 else
                 {
                     SDL_assert(false);
@@ -682,6 +737,7 @@ namespace actor
                 act = actor::replaceWithTemplate(act, "EXPLOSION");
                 act->name[0] = '_';
                 room::cycleColor(1);
+                return PUSH_NONE;
             }
         }
         return result;
@@ -700,6 +756,7 @@ namespace actor
             if ((act->pos.x > min.x && act->pos.y >= min.y && (act->pos.y + act->size.y) <= max.y) || ((room::getDoors() & DOOR_XN) && (act->pos.y >= 24) && (act->pos.y <= 32)))
             {
                 moving = true;
+                // Si està en les vores d'una porta, espenta cap a centrar-lo
                 if ((act->pos.x <= min.x) && (act->pos.z == room::getDoor(XN) * 4) && (room::getDoors() & DOOR_XN))
                 {
                     if (act->pos.y < 28)
@@ -707,10 +764,16 @@ namespace actor
                     else if (act->pos.y > 28)
                         act->push |= PUSH_YN;
                     else
+                    {
                         act->push |= PUSH_XN;
+                        if (hero::getBoostRun() > 0) act->push |= PUSH_DOUBLE;
+                    }
                 }
                 else
+                {
                     act->push |= PUSH_XN;
+                    if (hero::getBoostRun() > 0) act->push |= PUSH_DOUBLE;
+                }
             }
         }
         else if (controller::down(KEY_RIGHT)) //(input::keyDown(SDL_SCANCODE_RIGHT) || input::keyDown(config::getKey(KEY_RIGHT)))
@@ -720,6 +783,7 @@ namespace actor
             if (((act->pos.x + act->size.x) < max.x && act->pos.y >= min.y && (act->pos.y + act->size.y) <= max.y) || ((room::getDoors() & DOOR_XP) && (act->pos.y >= 24) && (act->pos.y <= 32)))
             {
                 moving = true;
+                // Si està en les vores d'una porta, espenta cap a centrar-lo
                 if (((act->pos.x + act->size.x) >= max.x) && (act->pos.z == room::getDoor(XP) * 4) && (room::getDoors() & DOOR_XP))
                 {
                     if (act->pos.y < 28)
@@ -727,10 +791,16 @@ namespace actor
                     else if (act->pos.y > 28)
                         act->push |= PUSH_YN;
                     else
+                    {
                         act->push |= PUSH_XP;
+                        if (hero::getBoostRun() > 0) act->push |= PUSH_DOUBLE;
+                    }
                 }
                 else
+                {
                     act->push |= PUSH_XP;
+                    if (hero::getBoostRun() > 0) act->push |= PUSH_DOUBLE;
+                }
             }
         }
         else if (controller::down(KEY_UP)) // input::keyDown(SDL_SCANCODE_UP) || input::keyDown(config::getKey(KEY_UP)))
@@ -740,6 +810,7 @@ namespace actor
             if ((act->pos.y > min.y && act->pos.x >= min.x && (act->pos.x + act->size.x) <= max.x) || ((room::getDoors() & DOOR_YN) && (act->pos.x >= 24) && (act->pos.x <= 32)))
             {
                 moving = true;
+                // Si està en les vores d'una porta, espenta cap a centrar-lo
                 if ((act->pos.y <= min.y) && (act->pos.z == room::getDoor(YN) * 4) && (room::getDoors() & DOOR_YN))
                 {
                     if (act->pos.x < 28)
@@ -747,10 +818,16 @@ namespace actor
                     else if (act->pos.x > 28)
                         act->push |= PUSH_XN;
                     else
+                    {
                         act->push |= PUSH_YN;
+                        if (hero::getBoostRun() > 0) act->push |= PUSH_DOUBLE;
+                    }
                 }
                 else
+                {
                     act->push |= PUSH_YN;
+                    if (hero::getBoostRun() > 0) act->push |= PUSH_DOUBLE;
+                }
             }
         }
         else if (controller::down(KEY_DOWN)) // input::keyDown(SDL_SCANCODE_DOWN) || input::keyDown(config::getKey(KEY_DOWN)))
@@ -760,6 +837,7 @@ namespace actor
             if (((act->pos.y + act->size.y) < max.y && act->pos.x >= min.x && (act->pos.x + act->size.x) <= max.x) || ((room::getDoors() & DOOR_YP) && (act->pos.x >= 24) && (act->pos.x <= 32)))
             {
                 moving = true;
+                // Si està en les vores d'una porta, espenta cap a centrar-lo
                 if (((act->pos.y + act->size.y) >= max.y) && (act->pos.z == room::getDoor(YP) * 4) && (room::getDoors() & DOOR_YP))
                 {
                     if (act->pos.x < 28)
@@ -767,10 +845,16 @@ namespace actor
                     else if (act->pos.x > 28)
                         act->push |= PUSH_XN;
                     else
+                    {
                         act->push |= PUSH_YP;
+                        if (hero::getBoostRun() > 0) act->push |= PUSH_DOUBLE;
+                    }
                 }
                 else
+                {
                     act->push |= PUSH_YP;
+                    if (hero::getBoostRun() > 0) act->push |= PUSH_DOUBLE;
+                }
             }
         }
         // if ((input::keyPressed(SDL_SCANCODE_RETURN) || input::keyPressed(config::getKey(KEY_PICK))) && (hero::getSkills() & SKILL_PANTS))
@@ -785,7 +869,8 @@ namespace actor
                 if (picked->pos.y + picked->size.y > room::getMax().y)
                     picked->pos.y = room::getMax().y - picked->size.y;
                 picked->pos.z = act->pos.z;
-                if (does_collide(picked))
+                find_non_colliding_position(picked);
+                /*if (does_collide(picked))
                 {
                     picked->pos.x -= 2;
                     if (does_collide(picked))
@@ -793,7 +878,7 @@ namespace actor
                         picked->pos.x += 2;
                         picked->pos.y -= 2;
                     }
-                }
+                }*/
                 act->pos.z += picked->size.z;
                 actor::actor_t *above = act->above;
                 while (above)
@@ -1026,7 +1111,7 @@ namespace actor
         vec3_t min = room::getMin();
         vec3_t max = room::getMax();
 
-        if ((act->push & PUSH_KILL) && (act->flags & FLAG_HERO))
+        if ((act->push & PUSH_KILL) && (act->flags & FLAG_HERO) && (!hero::hasBoostGod()))
         {
             if (!editor::isDevMode())
             {
@@ -1055,6 +1140,8 @@ namespace actor
             return;
         }
 
+        if ((act->flags & FLAG_HERO) && (hero::hasBoostGod())) act->push &= ~PUSH_KILL;
+
         // [RZC 26/09/2024] Hack usant react_push en el moviment RAND per a contar la distancia abans de canviar de direcció
         if (act->movement == MOV_RAND)
         {
@@ -1073,7 +1160,9 @@ namespace actor
             act->pos.z += act->react_push;
         }
 
-        int vel = (act->flags & FLAG_HERO) && (hero::getBoostRun() > 0) ? 2 : 1;
+        //int vel = (act->flags & FLAG_HERO) && (hero::getBoostRun() > 0) ? 2 : 1;
+        int vel = (act->flags & FLAG_HERO) && (act->push & PUSH_DOUBLE) ? 2 : 1;
+        act->push &= ~ PUSH_DOUBLE;
 
         if (act->push & PUSH_ZP)
         {
@@ -1134,8 +1223,10 @@ namespace actor
             actor::actor_t *other = actor::get_collision(act);
             if (other || (act->pos.x < min.x && (!(room::getDoors() & DOOR_XN) || (act->pos.y != 28) || (act->pos.z != room::getDoor(XN) * 4) || !(act->flags & FLAG_HERO))))
             {
-                if (other)
-                    other->push |= push(act, other, PUSH_XN);
+                if (other) {
+                    uint8_t push_value = push(act, other, PUSH_XN);
+                    if (push_value) other->push |= push_value;
+                }
                 act->pos.x += vel;
                 if (act->flags & FLAG_MOVING)
                     changeMoving(act);
@@ -1172,8 +1263,10 @@ namespace actor
             actor::actor_t *other = actor::get_collision(act);
             if (other || ((act->pos.x + act->size.x) > max.x && (!(room::getDoors() & DOOR_XP) || (act->pos.y != 28) || !(act->flags & FLAG_HERO))))
             {
-                if (other)
-                    other->push |= push(act, other, PUSH_XP);
+                if (other) {
+                    uint8_t push_value = push(act, other, PUSH_XP);
+                    if (push_value) other->push |= push_value;
+                }
                 act->pos.x -= vel;
                 if (act->flags & FLAG_MOVING)
                     changeMoving(act);
@@ -1193,7 +1286,7 @@ namespace actor
                     room::load(room::getExit(XP));
                     if (llevar_abad)
                     {
-                        actor::remove(actor::find("ABAD"));
+                        actor::sendToPurgatory(actor::find("ABAD"));
                     }
                     act->pos.x = room::getMin().x - 3;
                     act->pos.z = room::getDoor(XN) * 4;
@@ -1213,8 +1306,10 @@ namespace actor
             actor::actor_t *other = actor::get_collision(act);
             if (other || (act->pos.y < min.y && (!(room::getDoors() & DOOR_YN) || (act->pos.x != 28) || (act->pos.z != room::getDoor(YN) * 4) || !(act->flags & FLAG_HERO))))
             {
-                if (other)
-                    other->push |= push(act, other, PUSH_YN);
+                if (other) {
+                    uint8_t push_value = push(act, other, PUSH_YN);
+                    if (push_value) other->push |= push_value;
+            }
                 act->pos.y += vel;
                 if (act->flags & FLAG_MOVING)
                     changeMoving(act);
@@ -1249,8 +1344,10 @@ namespace actor
             actor::actor_t *other = actor::get_collision(act);
             if (other || ((act->pos.y + act->size.y) > max.y && (!(room::getDoors() & DOOR_YP) || (act->pos.x != 28) || !(act->flags & FLAG_HERO))))
             {
-                if (other)
-                    other->push |= push(act, other, PUSH_YP);
+                if (other) {
+                    uint8_t push_value = push(act, other, PUSH_YP);
+                    if (push_value) other->push |= push_value;
+                }
                 act->pos.y -= vel;
                 if (act->flags & FLAG_MOVING)
                     changeMoving(act);
@@ -1307,7 +1404,8 @@ namespace actor
                 if (is_above(act, act->below))
                 {
                     // ...li pase a ell el push, neteje el meu flag, canvie direcció si pertoca i me ane
-                    act->push |= push(act, act->below, PUSH_ZN); // [RZC 20/09/2024] Canvie "act->below->push" per "act->push". Se li deu passar la reacció al que la inicia
+                    uint8_t push_value = push(act, act->below, PUSH_ZN); // [RZC 20/09/2024] Canvie "act->below->push" per "act->push". Se li deu passar la reacció al que la inicia
+                    if (push_value) act->push |= push_value;
                     act->push &= ~PUSH_ZN;
                     if ((act->flags & FLAG_MOVING) && (act->movement == MOV_Z))
                         changeMoving(act);
@@ -1328,7 +1426,9 @@ namespace actor
                 act->below = below;
                 below->above = act;
                 // ... i li passem el push, netejem el meu flag i gonnem
-                act->push |= push(act, act->below, PUSH_ZN); // [RZC 20/09/2024] Canvie "act->below->push" per "act->push". Se li deu passar la reacció al que la inicia
+                uint8_t push_value = push(act, act->below, PUSH_ZN); // [RZC 20/09/2024] Canvie "act->below->push" per "act->push". Se li deu passar la reacció al que la inicia
+                if (push_value) act->push |= push_value;
+
                 act->push &= ~PUSH_ZN;
                 if ((act->flags & FLAG_MOVING) && (act->movement == MOV_Z))
                     changeMoving(act);
@@ -1384,7 +1484,7 @@ namespace actor
             {
                 if (act->name[0] == '_')
                 {
-                    actor::remove(act);
+                    actor::sendToPurgatory(act);
                     return;
                 }
                 else
@@ -1401,23 +1501,16 @@ namespace actor
             act->anim_wait_count++;
         }
 
-        if (act->flags & FLAG_HERO)
-            updateUserInput(act);
+        if (act->flags & FLAG_HERO) updateUserInput(act);
         if (act->flags & FLAG_MOVING)
         {
             if (act->movement == MOV_HUNT && ((act->pos.x & 7) == 0 || (act->pos.y & 7) == 0))
                 changeMoving(act);
             updateMoving(act);
         }
-        if (act->flags & FLAG_GRAVITY)
-            act->push |= PUSH_ZN;
+        if (act->flags & FLAG_GRAVITY) act->push |= PUSH_ZN;
 
-        // if (act->flags & FLAG_PUSHABLE)
         updatePush(act);
-        // if (act->flags & FLAG_GRAVITY) updateGravity(act);
-        // if (act->flags & FLAG_REACTIVE) updateReactive(act);
-
-        // act->push = PUSH_NONE;
 
         if (!room_changed && update_all && next)
             update(next);
@@ -1500,9 +1593,10 @@ namespace actor
             if (editor::isEditing() && (act == selected) && modules::game::getSection() == modules::game::SECTION_ACTOR)
                 draw::swapcol(1, room::getColor(1)); // Si està seleccionat, que canvie de color
             draw::stencil::set(act->tag);
-            draw::draw(x, y, act->bmp_rect.w, act->bmp_rect.h, act->bmp_rect.x + ao, act->bmp_rect.y + oo, flip);
+            if (!(act->flags & FLAG_SPECIAL) || !(act->name[0] == 'Y') || (brilli_brilli<4) )
+                draw::draw(x, y, act->bmp_rect.w, act->bmp_rect.h, act->bmp_rect.x + ao, act->bmp_rect.y + oo, flip);
             draw::swapcol(1, room::getColor(0)); // Tornem al color per defecte
-            if ((act->flags & FLAG_SPECIAL) && (act->name[0] != 'A'))
+            if ((act->flags & FLAG_SPECIAL) && (act->name[0] != 'A') && (act->name[0] != 'Z'))
             {
                 draw::setSource(brilli);
                 const int dx = (act->bmp_rect.w - 22) >> 1;
@@ -1635,6 +1729,26 @@ namespace actor
         free(act);
     }
 
+    void sendToPurgatory(actor_t *act)
+    {
+        if (!act) return;
+        if (act->prev) act->prev->next = act->next;
+        if (act == first) first = act->next;
+        if (act == dirty) dirty = act->next;
+        if (act->next) act->next->prev = act->prev;
+        if (act == selected) selected = nullptr;
+        if (act->below) act->below->above = nullptr;
+        if (act->above) act->above->below = nullptr;
+        act->alive = false;
+        purgatory.push_back(act);
+    }
+    
+    void cleanPurgatory()
+    {
+        for (auto act : purgatory) remove(act);
+        purgatory.clear();
+    }
+
     void pick(actor_t *act)
     {
         if (!act)
@@ -1917,10 +2031,12 @@ namespace actor
         int first_orient = 0;
         bool dead = false;
         bool prologo = false;
+        int prologo_objects[4] = {PROLOGO_OBJECT_INITIAL, PROLOGO_OBJECT_INITIAL, PROLOGO_OBJECT_INITIAL, PROLOGO_OBJECT_INITIAL};
+        int num_prologo_objects=0;
 
-        void setPrologo()
+        void setPrologo(const bool value)
         {
-            prologo = true;
+            prologo = value;
         }
 
         const bool isPrologo()
@@ -1951,6 +2067,8 @@ namespace actor
                 lives = 8;
                 skills = SKILL_NONE;
                 if (prologo) skills &= SKILL_SHOES;
+                for (int i=0;i<4;++i) prologo_objects[i] = PROLOGO_OBJECT_INITIAL;
+                num_prologo_objects=0;
                 parts = PART_NONE;
                 for (int i = 0; i < 10; ++i)
                     anbernics[i] = false;
@@ -1989,8 +2107,8 @@ namespace actor
         {
             return dead;
         }
-
         const int getBoosterFromString(const char *booster)
+
         {
             static const char *boostset_name[4] = {"RUN", "GOD", "JUMP", "LIVE"};
             for (int i = 0; i < 4; ++i)
@@ -2097,6 +2215,11 @@ namespace actor
                 boost_jumps--;
         }
 
+        const bool hasBoostGod()
+        {
+            return boost_god > 0;
+        }
+
         const int getSkillFromString(char *skill)
         {
             static const char *skillset_name[4] = {"SHOES", "GLOVES", "PANTS", "BAG"};
@@ -2135,7 +2258,12 @@ namespace actor
 
         bool giveSkill(char *skill)
         {
-            return giveSkill(getSkillFromString(skill));
+            const int skill_number = getSkillFromString(skill);
+            if (skill_number==SKILL_SHOES) modules::game::setMissatge("  JA TENS LES SABATES!-   ARA JA POTS BOTAR!");
+            else if (skill_number==SKILL_GLOVES) modules::game::setMissatge("  JA TENS ELS GUANTS!- ARA JA POTS ESPENTAR!");
+            else if (skill_number==SKILL_PANTS) modules::game::setMissatge(" JA TENS ELS PANTALONS!- JA POTS AGAFAR COSES!");
+            else if (skill_number==SKILL_BAG) modules::game::setMissatge("  JA TENS LA MOTXILLA!-  A ARREPLEGAR PECES!");
+            return giveSkill(skill_number);
         }
 
         bool dropSkill(int skill)
@@ -2197,8 +2325,13 @@ namespace actor
         {
             const int value = getPartFromString(part);
             parts |= value;
-            if (value != 0)
-                stats::collectPart();
+            if (value != 0) stats::collectPart();
+
+            int num_parts = stats::getNumPartsCollected();
+            char text[] = "   PECES ARREPLEGADES:-           0/6";
+            text[34] = num_parts + 48;
+            modules::game::setMissatge(text);
+
             return value != 0;
         }
 
@@ -2222,6 +2355,18 @@ namespace actor
         void pickAnbernic(char *name)
         {
             anbernics[name[8] - 48] = true;
+            int num_anbernics = getNumAmbernicsCollected();
+            if (num_anbernics==10)
+            {
+                modules::game::setMissatge("    HAS DESBLOQUEJAT-      EL PROLOGO!");
+                config::setProgoloDesbloquejat();
+            }
+            else
+            {
+                char text[] = " ANBERNICS ARREPLEGADES:-           0/10";
+                text[36] = num_anbernics+48;
+                modules::game::setMissatge(text);
+            }
         }
 
         bool wasAnbernicCollected(char *name)
@@ -2238,6 +2383,33 @@ namespace actor
             return count;
         }
 
+        void pickPrologoObject(int which)
+        {
+            prologo_objects[which] = PROLOGO_OBJECT_PICKED;
+        }
+
+        void leavePrologoObject(int which)
+        {
+            prologo_objects[which] = PROLOGO_OBJECT_LEFT;
+            num_prologo_objects++;
+        }
+
+        const bool isCarryingPrologoObject()
+        {
+            for (auto object : prologo_objects) if (object==PROLOGO_OBJECT_PICKED) return true;
+            return false;
+        }
+
+        const int getPrologoObjectState(int which)
+        {
+            return prologo_objects[which];
+        }
+
+        const int getNumPrologoObjectsDone()
+        {
+            return num_prologo_objects;
+        }
+
         void move(int *x, int *y, int *z)
         {
             actor_t *hero = actor::find("HERO");

source/actor.h

@@ -33,6 +33,7 @@
 #define PUSH_ZP 16
 #define PUSH_ZN 32
 #define PUSH_KILL 64
+#define PUSH_DOUBLE 128
 
 // Tipus de moviment de l'actor
 #define MOV_NONE 0  // Ningun
@@ -109,6 +110,7 @@ namespace actor
 
         int tag;
         int template_category;
+        bool alive;
     };
 
     void resetTag();
@@ -169,6 +171,10 @@ namespace actor
 
     void remove(actor_t *act);
 
+    void sendToPurgatory(actor_t *act);
+
+    void cleanPurgatory();
+
     void pick(actor_t *act);
 
     actor_t *getPicked();
@@ -198,7 +204,16 @@ namespace actor
 
     namespace hero
     {
-        void setPrologo();
+        #define PROLOGO_OBJECT_INITIAL 0
+        #define PROLOGO_OBJECT_PICKED  1
+        #define PROLOGO_OBJECT_LEFT    2
+
+        #define PROLOGO_SHOES  0
+        #define PROLOGO_PANTS  1
+        #define PROLOGO_GLOVES 2
+        #define PROLOGO_BAG    3
+
+        void setPrologo(const bool value);
         const bool isPrologo();
         void init(const bool complete = true);
         int getLives();
@@ -218,6 +233,7 @@ namespace actor
         void useBoostGod();
         void useBoostRun();
         void useBoostJump();
+        const bool hasBoostGod();
 
         const int getSkillFromString(char *skill);
         const char *getSkillName(int skill);
@@ -239,6 +255,12 @@ namespace actor
         bool wasAnbernicCollected(char *name);
         int getNumAmbernicsCollected();
 
+        void pickPrologoObject(int which);
+        void leavePrologoObject(int which);
+        const bool isCarryingPrologoObject();
+        const int getPrologoObjectState(int which);
+        const int getNumPrologoObjectsDone();
+        
         void move(int *x, int *y, int *z);
         void setFirstPos();
     }

source/jdraw.cpp

@@ -15,11 +15,15 @@ namespace draw
     SDL_Renderer *sdl_renderer = nullptr; // El renderer de SDL
     SDL_Texture *sdl_texture = nullptr;   // La textura de SDL a la que pintarem la nostra superficie "screen" i que despres volcarem a pantalla
 
+    SDL_Rect dest_rect = {0, 0, 320, 240};
+    static int fullscreen_scale = 1;
+
     static int screen_zoom = 1;
     static bool screen_fullscreen = false;
     static int screen_width = 320;
     static int screen_height = 240;
     std::string screen_title = "";
+    static int screen_mode = SCREEN_MODE_NORMAL;
 
     surface *screen = nullptr;      // La superficie screen, que representa la pantalla. Se crea i destrueix internament
     surface *destination = nullptr; // Punter a la actual superficie de destí
@@ -89,8 +93,25 @@ namespace draw
         sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0);
         sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, screen_width, screen_height);
 
+        if (screen_fullscreen)        
+        {
+            int w, h;
+            SDL_GetWindowSize(sdl_window, &w, &h);
+            fullscreen_scale = h/screen_height;
+            dest_rect.w = screen_width * fullscreen_scale;
+            dest_rect.h = screen_height * fullscreen_scale;
+            dest_rect.x = (w - dest_rect.w)/2;
+            dest_rect.y = (h - dest_rect.h)/2;
+        }
+        else
+        {
+            dest_rect.x = dest_rect.y = 0;
+            dest_rect.w = screen_width * zoom;
+            dest_rect.h = screen_height * zoom;
+        }
+
         // Establim el tamany "logic", indepndent del tamany de finestra
-        SDL_RenderSetLogicalSize(sdl_renderer, width, height);
+        //SDL_RenderSetLogicalSize(sdl_renderer, width, height);
 
         // Creem la superficie "screen" i la establim com a superficie destinació
         screen = createSurface(width, height);
@@ -152,8 +173,25 @@ namespace draw
         sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0);
         sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, screen_width, screen_height);
 
+        if (screen_fullscreen)        
+        {
+            int w, h;
+            SDL_GetWindowSize(sdl_window, &w, &h);
+            fullscreen_scale = h/screen_height;
+            dest_rect.w = screen_width * fullscreen_scale;
+            dest_rect.h = screen_height * fullscreen_scale;
+            dest_rect.x = (w - dest_rect.w)/2;
+            dest_rect.y = (h - dest_rect.h)/2;
+        }
+        else
+        {
+            dest_rect.x = dest_rect.y = 0;
+            dest_rect.w = screen_width * zoom;
+            dest_rect.h = screen_height * zoom;
+        }
+
         // Establim el tamany "logic", indepndent del tamany de finestra
-        SDL_RenderSetLogicalSize(sdl_renderer, screen_width, screen_height);
+        //SDL_RenderSetLogicalSize(sdl_renderer, screen_width, screen_height);
     }
 
     void setZoom(const int value)
@@ -203,6 +241,23 @@ namespace draw
         return screen_zoom;
     }
 
+    void toggleScreenMode()
+    {
+        screen_mode++;
+        if (screen_mode == SCREEN_MODE_NUM_MODES) screen_mode = 0;
+        //reinit();
+    }
+
+    void setScreenMode(const int value)
+    {
+        screen_mode = value;
+    }
+
+    const int getScreenMode()
+    {
+        return screen_mode;
+    }
+
     // Crea una superficie i torna un punter a ella
     surface *createSurface(const uint16_t w, const uint16_t h)
     {
@@ -629,9 +684,35 @@ namespace draw
         // Desbloquejem la textura
         SDL_UnlockTexture(sdl_texture);
 
-        // Pintem la textura a pantalla
-        SDL_RenderCopy(sdl_renderer, sdl_texture, NULL, NULL);
+        if (screen_fullscreen)
+        {
+            SDL_SetRenderDrawColor(sdl_renderer, 0, 0, 0, 255);
+            SDL_RenderClear(sdl_renderer);
+        }
 
+        // Pintem la textura a pantalla
+        SDL_RenderCopy(sdl_renderer, sdl_texture, NULL, &dest_rect);
+
+        if (screen_mode & SCREEN_MODE_SCANLINES)
+        {
+            if (screen_zoom>=3 || screen_fullscreen)
+            {
+                int zoom = screen_fullscreen ? fullscreen_scale : screen_zoom;
+                SDL_SetRenderDrawBlendMode(sdl_renderer, SDL_BLENDMODE_BLEND);
+                for (int y=0; y<screen_height; ++y)
+                {
+                    SDL_SetRenderDrawColor(sdl_renderer, 0, 0, 0, 192);
+                    SDL_RenderDrawLine(sdl_renderer, dest_rect.x, dest_rect.y + y*zoom, dest_rect.x + dest_rect.w, dest_rect.y + y*zoom);
+                    SDL_SetRenderDrawColor(sdl_renderer, 0, 0, 0, 96);
+                    if (zoom>3) SDL_RenderDrawLine(sdl_renderer, dest_rect.x, 1+dest_rect.y + y*zoom, dest_rect.x + dest_rect.w, 1+dest_rect.y + y*zoom);
+                }
+                SDL_SetRenderDrawColor(sdl_renderer, 0, 0, 0, 16);
+                for (int x=0; x<screen_width; ++x)
+                {
+                    SDL_RenderDrawLine(sdl_renderer, dest_rect.x + x*zoom, dest_rect.y, dest_rect.x + x*zoom, dest_rect.y + dest_rect.h);
+                }
+            }
+        }
         // I ho presentem
         SDL_RenderPresent(sdl_renderer);
     }

source/jdraw.h

@@ -13,6 +13,12 @@
 #define FONT_ZOOM_HORIZONTAL    2
 #define FONT_ZOOM_BOTH          3
 
+#define SCREEN_MODE_NORMAL      0
+#define SCREEN_MODE_SCANLINES   1
+#define SCREEN_MODE_FOSFORO     2
+#define SCREEN_MODE_SCANFOS     3
+#define SCREEN_MODE_NUM_MODES   4
+
 // Unitat per a la gestió dels recursos gràfics i dibuixat en pantalla
 namespace draw
 {
@@ -44,6 +50,10 @@ namespace draw
     const bool getFullscreen();
     const int getZoom();
     
+    void toggleScreenMode();
+    void setScreenMode(const int value);
+    const int getScreenMode();
+
     /// @brief Crea una superficie i torna un punter a ella
     /// @param w ample de la superficie
     /// @param h alt de la superficie

source/jfile.cpp

@@ -54,10 +54,10 @@ OFFSET		CONTINGUT		TAMANY		DESCRIPCIÓ
 25			4					4			tamany del primer axiu
 29			13					1			tamany de la ruta al primer arxiu
 30			"data/hola.txt"		13			la ruta al primer arxiu
-43			16					4			offset al primer arxiu
-47			4					4			tamany del primer axiu
-51			13					1			tamany de la ruta al primer arxiu
-52			"data/adios.txt"	14			la ruta al primer arxiu
+43			16					4			offset al segon arxiu
+47			4					4			tamany del segon axiu
+51			14					1			tamany de la ruta al segon arxiu
+52			"data/adios.txt"	14			la ruta al segon arxiu
 
 
 	- Es un exemple raro, perque ocupa mes la ruta al arxiu que l'arxiu en si, pero espere que la idea quede clara!
@@ -260,6 +260,7 @@ namespace file
 			if (!found)
 			{
 				// [TODO] Donar mes informació de quin recurs no havem trobat
+				printf("Arxiu: %s\n", resourcename.c_str());
 				perror("El recurs no s'ha trobat en l'arxiu de recursos");
 				exit(1);
 			}

source/m_end_prologo_sequence.cpp

@@ -0,0 +1,72 @@
+#include "m_intro.h"
+#include "jgame.h"
+#include "jdraw.h"
+#include "jinput.h"
+#include "jaudio.h"
+#include "controller.h"
+#include "config.h"
+#include <SDL2/SDL.h>
+#include "actor.h"
+
+namespace modules
+{
+    namespace end_prologo_sequence
+    {
+        int stage = 0;
+        uint32_t time = 0;
+
+        void init()
+        {
+            time = SDL_GetTicks();
+            stage = 0;
+            draw::restorecol(2);
+            draw::cls(2);
+
+            draw::swapcol(1, 7);
+            draw::setSource(draw::getSurface("prologo3.gif"));
+            draw::draw(96, 28, 128, 96, 0, 0);
+            draw::print2("ALE! QUE BON", 13, 17, WHITE, FONT_ZOOM_NONE);
+            draw::print2("TRABAJ HE HECH!", 11, 19, WHITE, FONT_ZOOM_NONE);
+            draw::render();
+
+            if (audio::getCurrentMusic() != "mus_menu.ogg") audio::playMusic("mus_menu.ogg");
+            actor::templates::load();
+        }
+
+        const bool shouldGoToNext()
+        {
+            if (SDL_GetTicks()-time < 1000) return false;
+            return (SDL_GetTicks()-time > (stage==15||stage==16?10000:5000)) || 
+                   (controller::pressed(KEY_JUMP)) || (controller::pressed(KEY_PICK)) ||
+                   (input::keyPressed(SDL_SCANCODE_SPACE)) || (input::keyPressed(SDL_SCANCODE_RETURN));
+        }
+
+        bool loop()
+        {
+            if (controller::pressed(KEY_MENU)) return false;
+
+            if (shouldGoToNext())
+            {
+                time = SDL_GetTicks();
+                stage++;
+                if (stage==2) return false;
+
+                switch (stage)
+                {
+                    case 1:
+                        draw::cls(2);
+                        draw::swapcol(1, 8);
+                        draw::setSource(draw::getSurface("prologo4.gif"));
+                        draw::draw(96, 28, 128, 96, 0, 0);
+                        draw::print2("PERO QUE...?", 12, 17, WHITE, FONT_ZOOM_NONE);
+                        //draw::render();
+                        break;
+
+                }
+            }
+
+            draw::render();
+            return true;
+        }
+    }
+}

source/m_end_prologo_sequence.h

@@ -0,0 +1,10 @@
+#pragma once
+
+namespace modules
+{
+    namespace end_prologo_sequence
+    {
+        void init();
+        bool loop();
+    }
+}

source/m_end_sequence.cpp

@@ -17,10 +17,14 @@ namespace modules
         actor::actor_t *act = nullptr;
         const char *actor_names[] = {"JAILDESIGNER", "BATMAN", "ROBIN", "EL ALTRE BATMAN", "EL ABAD", "LA ROOMBA", "EL OBRER", "BAMBOLLA DE CAFE", "EL YONKI", "LA PILOTA", "SAM", "LORD ABAD"};
         const char *actor_ids[] = {"JAILDES", "GAT-BATMAN", "GAT-ROBIN", "BATMAN", "ABAD", "ROOMBA2", "OBRER", "COFFEE", "YONKI", "PILOTA", "SAM", "LORD-ABAD"};
+        char time_text[7] = " 00:00";
 
-        void init()
+        void init(bool go_direct_to_credits)
         {
+            stage = go_direct_to_credits ? 2 : 0;
             time = SDL_GetTicks();
+            if (go_direct_to_credits) time += 5000;
+
             draw::restorecol(2);
             draw::cls(2);
 
@@ -33,10 +37,24 @@ namespace modules
 
             if (audio::getCurrentMusic() != "mus_menu.ogg") audio::playMusic("mus_menu.ogg");
             actor::templates::load();
+
+            int milliseconds = SDL_GetTicks()-actor::stats::getStartTime();
+            int seconds = milliseconds/1000;
+            int minutes = seconds / 60;
+            seconds = seconds % 60;
+
+            time_text[0] = minutes<100 ? ' ' : (minutes/100)+48;
+            time_text[1] = minutes<10 ? ' ' : ((minutes%100)/10)+48;
+            time_text[2] = (minutes%10)+48;
+
+            time_text[4] = (seconds/10)+48;
+            time_text[5] = (seconds%10)+48;
+            time_text[6] = 0;
         }
 
         const bool shouldGoToNext()
         {
+            if (SDL_GetTicks()-time < 1000) return false;
             return (SDL_GetTicks()-time > (stage==15||stage==16?10000:5000)) ||
                    (controller::pressed(KEY_JUMP)) || (controller::pressed(KEY_PICK)) ||
                    (input::keyPressed(SDL_SCANCODE_SPACE)) || (input::keyPressed(SDL_SCANCODE_RETURN));
@@ -126,7 +144,17 @@ namespace modules
                 }
                 case 16:
                     draw::cls(2);
-                    draw::print2("GRACIES PER JUGAR!", 11, 15, PURPLE, FONT_ZOOM_NONE);
+                    draw::print2("GRACIES PER JUGAR!", 11, 9, PURPLE, FONT_ZOOM_VERTICAL);
+
+                    draw::print2(actor::stats::getRoomsVisited(), 2, 8, 14, TEAL, FONT_ZOOM_NONE);
+                    draw::print2("HABITACIONS VISITADES", 11, 14, GREEN, FONT_ZOOM_NONE);
+
+                    draw::print2(actor::stats::getLivesLost(), 2, 11, 16, TEAL, FONT_ZOOM_NONE);
+                    draw::print2("VIDES PERDUDES", 14, 16, GREEN, FONT_ZOOM_NONE);
+
+                    draw::print2(time_text, 11, 18, TEAL, FONT_ZOOM_NONE);
+                    draw::print2("TEMPS TOTAL", 18, 18, GREEN, FONT_ZOOM_NONE);
+
                     break;
 
             }

source/m_end_sequence.h

@@ -4,7 +4,7 @@ namespace modules
 {
     namespace end_sequence
     {
-        void init();
+        void init(bool go_direct_to_credits=false);
         bool loop();
     }
 }

source/m_game.cpp

@@ -24,7 +24,7 @@ namespace modules
 
         void init(const bool prologo)
         {
-            if (prologo) actor::hero::setPrologo();
+            actor::hero::setPrologo(prologo);
             actor::clear(true);
             ::game::setUpdateTicks(64);
             actor::templates::load();
@@ -289,8 +289,38 @@ namespace modules
             return section;
         }
 
+        char missatge[255] = "";
+
+        void mostra_missatge()
+        {
+            if ( (controller::pressed(KEY_MENU)) || (controller::pressed(KEY_PICK)) || (controller::pressed(KEY_JUMP)) )
+            {
+                missatge[0] = 0;
+                return;
+            }
+            draw::color(BLACK);
+            draw::fillrect(56, 68, 208, 48);
+            draw::color(WHITE);
+            draw::rect(56, 68, 208, 48);
+            char text[2][25];
+            int i=0, j=0, k=0;
+            while (missatge[i]!=0)
+            {
+                if (missatge[i]=='-') { text[k][j]=0; i++; j=0; k++; }
+                text[k][j] = missatge[i];
+                i++; j++;
+            }
+            text[k][j]=0;
+            draw::print2(text[0], 8, 10, WHITE, FONT_ZOOM_NONE);
+            draw::print2(text[1], 8, 12, WHITE, FONT_ZOOM_NONE);
+
+            draw::render();
+        }
+
         int loop()
         {
+            if (missatge[0] != 0) { mostra_missatge(); return GAME_NONE; }
+
             int return_value = GAME_NONE;
 
             if (actor::hero::isDead()) return GAME_DEAD;
@@ -325,6 +355,7 @@ namespace modules
                     actor::update(actor::getFirst());
                     actor::hero::useBoostGod();
                     if ( (actor::hero::getParts()==0x3f) && (room::getCurrent()==45) ) return GAME_END;
+                    if ( (actor::hero::getNumPrologoObjectsDone()==4) && (room::getCurrent()==64) ) return GAME_PROLOGO_END;
                 }
             }
 
@@ -339,7 +370,9 @@ namespace modules
             room::draw();
 
             actor::actor_t *selected = actor::getSelected();
-            if (editor::isDevMode() && selected && input::keyPressed(SDL_SCANCODE_M)) actor::setFloatingEditing(true);
+            const bool inside_room_zone = (draw::getLocalX(input::mouseX())>=0 && draw::getLocalY(input::mouseY())>=0 && draw::getLocalX(input::mouseX())<320 && draw::getLocalY(input::mouseY())<240);
+
+            if (editor::isDevMode() && selected && inside_room_zone && input::keyPressed(SDL_SCANCODE_M)) actor::setFloatingEditing(true);
 
             if (editor::isDevMode() && actor::getFloatingEditing() && selected) {
                 draw::swapcol(1, GREEN+LIGHT);
@@ -396,45 +429,64 @@ namespace modules
                 draw::print2("no", 4, 25, col3, 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);
-
-                draw::setSource(draw::getSurface("objectes.gif"));
-                draw::stencil::set(SKILL_SHOES);
-                draw::swapcol(1, actor::hero::getSkills()&SKILL_SHOES ? col1 : col3);
-                draw::draw(276,166, 28, 22, 162, 0);
-                draw::stencil::set(SKILL_PANTS);
-                draw::swapcol(1, actor::hero::getSkills()&SKILL_PANTS ? col1 : col3);
-                draw::draw(250,183, 18, 23, 167, 22);
-                draw::stencil::set(SKILL_GLOVES);
-                draw::swapcol(1, actor::hero::getSkills()&SKILL_GLOVES ? col1 : col3);
-                draw::draw(222,200, 21, 22, 165, 45);
-                draw::stencil::set(SKILL_BAG);
-                draw::swapcol(1, actor::hero::getSkills()&SKILL_BAG ? col1 : col3);
-                draw::draw(279,200, 20, 25, 145, 41);
-
-                draw::stencil::disable();
-
-                // Si estem en el editor, fent click en els skills del marcador els obtenim
-                if (editor::isDevMode() && input::mouseClk(1))
+                if (!actor::hero::isPrologo())
                 {
-                    const uint8_t val = draw::stencil::query(input::mouseX(), input::mouseY());
-                    if (val != 255)
+                    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);
+
+                    draw::setSource(draw::getSurface("objectes.gif"));
+                    draw::stencil::set(SKILL_SHOES);
+                    draw::swapcol(1, actor::hero::getSkills()&SKILL_SHOES ? col1 : col3);
+                    draw::draw(276,166, 28, 22, 162, 0);
+                    draw::stencil::set(SKILL_PANTS);
+                    draw::swapcol(1, actor::hero::getSkills()&SKILL_PANTS ? col1 : col3);
+                    draw::draw(250,183, 18, 23, 167, 22);
+                    draw::stencil::set(SKILL_GLOVES);
+                    draw::swapcol(1, actor::hero::getSkills()&SKILL_GLOVES ? col1 : col3);
+                    draw::draw(222,200, 21, 22, 165, 45);
+                    draw::stencil::set(SKILL_BAG);
+                    draw::swapcol(1, actor::hero::getSkills()&SKILL_BAG ? col1 : col3);
+                    draw::draw(279,200, 20, 25, 145, 41);
+
+                    draw::stencil::disable();
+
+                    // Si estem en el editor, fent click en els skills del marcador els obtenim
+                    if (editor::isDevMode() && input::mouseClk(1))
                     {
-                        if (actor::hero::getSkills() & val)
-                            actor::hero::dropSkill(val);
-                        else
-                            actor::hero::giveSkill(val);
-                        
-                        room::cycleColor(1);
+                        const uint8_t val = draw::stencil::query(input::mouseX(), input::mouseY());
+                        if (val != 255)
+                        {
+                            if (actor::hero::getSkills() & val)
+                                actor::hero::dropSkill(val);
+                            else
+                                actor::hero::giveSkill(val);
+                            
+                            room::cycleColor(1);
+                        }
+                    }
+                } else if (actor::hero::isCarryingPrologoObject())
+                {
+                    draw::setSource(draw::getSurface("objectes.gif"));
+                    if (actor::hero::getPrologoObjectState(PROLOGO_SHOES)==PROLOGO_OBJECT_PICKED)
+                    {
+                        draw::draw(276,166, 28, 22, 162, 0);
+                    } else if (actor::hero::getPrologoObjectState(PROLOGO_PANTS)==PROLOGO_OBJECT_PICKED)
+                    {
+                        draw::draw(276,166, 18, 23, 167, 22);
+                    } else if (actor::hero::getPrologoObjectState(PROLOGO_GLOVES)==PROLOGO_OBJECT_PICKED)
+                    {
+                        draw::draw(276,166, 21, 22, 165, 45);
+                    } else if (actor::hero::getPrologoObjectState(PROLOGO_BAG)==PROLOGO_OBJECT_PICKED)
+                    {
+                        draw::draw(276,166, 20, 25, 145, 41);
                     }
                 }
             }
@@ -667,8 +719,7 @@ namespace modules
             }
 
             draw::setViewport(420, 15, 100, 225);
-            mx = draw::getLocalX(input::mouseX());
-            my = draw::getLocalY(input::mouseY());
+
 
             bool changed = false;
 
@@ -823,6 +874,9 @@ namespace modules
                             changed = true;
                         }
 */
+                        mx = draw::getLocalX(input::mouseX());
+                        my = draw::getLocalY(input::mouseY());
+
                         line+=10;
                         ui::label("POS", 2, line, 48, 11);
                         if (input::mouseClk(1) && mx>=2 && mx <=48 && my>=line && my<=line+10) return_value = GAME_EDITOR_BITMAP_POS;
@@ -897,8 +951,8 @@ namespace modules
 
                         draw::color(PAPER);
                         draw::rect(2, 0, 96, 204);
-
-                        if (ui::button("DUPLICATE", 2, line, 48, 11) || input::keyPressed(SDL_SCANCODE_D))
+                        
+                        if (ui::button("DUPLICATE", 2, line, 48, 11) || ( input::keyPressed(SDL_SCANCODE_D) && inside_room_zone))
                         {
                             actor::actor_t *new_act = actor::duplicate(act);
                             actor::setUniqueName(new_act);
@@ -908,7 +962,7 @@ namespace modules
                             actor::setFloatingEditing(true);
                             changed = true;
                         }
-                        if (ui::button("DELETE", 48, line, 48, 11) || input::keyPressed(SDL_SCANCODE_DELETE))
+                        if (ui::button("DELETE", 48, line, 48, 11) || ( input::keyPressed(SDL_SCANCODE_DELETE) && inside_room_zone))
                         {
                             actor::remove(act);
                             act = nullptr;
@@ -932,5 +986,11 @@ namespace modules
             return return_value;
 
         }
+
+        void setMissatge(const char *text)
+        {
+            strcpy(missatge, text);
+        }
+
     }
 }

source/m_game.h

@@ -16,6 +16,7 @@ namespace modules
         #define GAME_EDITOR_BITMAP_POS  6
         #define GAME_EDITOR_BITMAP_SIZE 7
         #define GAME_END                8
+        #define GAME_PROLOGO_END        9
 
         enum sections { SECTION_GENERAL, SECTION_ROOM, SECTION_ACTOR };
 
@@ -26,5 +27,7 @@ namespace modules
         const int getSection();
 
         std::vector<std::string> getGifs();
+
+        void setMissatge(const char *text);
     }
 }

source/m_gameover.cpp

@@ -19,7 +19,12 @@ namespace modules
         {
             if (audio::getCurrentMusic() != "mus_gameover.ogg") audio::playMusic("mus_gameover.ogg", 0);
 
-            if (heroi == nullptr) heroi = actor::create("HERO", {16,32,8}, {6,6,12}, "test.gif", {0,32,20,32}, {-6,38});
+            if (heroi) actor::remove(heroi);
+            if (actor::hero::isPrologo()) {
+                heroi = actor::create("HERO", {16, 32, 0}, {6, 6, 8}, "gat.gif", {0, 0, 24, 28}, {-4, 32});
+            } else {
+                heroi = actor::create("HERO", {16,32,8}, {6,6,12}, "test.gif", {0,32,20,32}, {-6,38});
+            }
             heroi->flags = FLAG_ANIMATED;
 
             int milliseconds = SDL_GetTicks()-actor::stats::getStartTime();
@@ -50,8 +55,16 @@ namespace modules
 
             draw::print2("GAME  OVER", 15, 7, YELLOW, FONT_ZOOM_VERTICAL);
 
-            draw::print2(actor::stats::getNumPartsCollected(), 2, 11, 12, TEAL, FONT_ZOOM_NONE);
-            draw::print2("PARTS TROBADES", 14, 12, GREEN, FONT_ZOOM_NONE);
+            if (actor::hero::isPrologo())
+            {
+                int num_objectes = 0;
+                for (int i=0;i<4;++i) if (actor::hero::getPrologoObjectState(i)==PROLOGO_OBJECT_LEFT) num_objectes++;
+                draw::print2(num_objectes, 2, 11, 12, TEAL, FONT_ZOOM_NONE);
+                draw::print2("OBJECTES DEJATS", 14, 12, GREEN, FONT_ZOOM_NONE);
+            } else {
+                draw::print2(actor::stats::getNumPartsCollected(), 2, 11, 12, TEAL, FONT_ZOOM_NONE);
+                draw::print2("PARTS TROBADES", 14, 12, GREEN, FONT_ZOOM_NONE);
+            }
 
             draw::print2(actor::stats::getRoomsVisited(), 2, 8, 14, TEAL, FONT_ZOOM_NONE);
             draw::print2("HABITACIONS VISITADES", 11, 14, GREEN, FONT_ZOOM_NONE);

source/m_menu.cpp

@@ -24,7 +24,7 @@ namespace modules
             if (audio::getCurrentMusic() != "mus_menu.ogg") audio::playMusic("mus_menu.ogg");
             selected_option = OPTION_JUGAR;
             ::game::setUpdateTicks(64);
-            draw::loadPalette("test.gif");
+            //draw::loadPalette("test.gif");
             surf = draw::getSurface("test.gif");
             draw::restorecol(2);
             if (config::isProgoloDesbloquejat()) min_option=0;

source/m_prologo_intro.cpp

@@ -0,0 +1,92 @@
+#include "m_prologo_intro.h"
+#include "jdraw.h"
+#include "jinput.h"
+#include "jaudio.h"
+#include "controller.h"
+#include "config.h"
+#include <SDL2/SDL.h>
+#include "actor.h"
+
+namespace modules
+{
+    namespace prologo_intro
+    {
+        int stage = 0;
+        uint32_t time = 0;
+
+        void init()
+        {
+            time = SDL_GetTicks();
+            draw::restorecol(2);
+            draw::cls(2);
+
+            draw::swapcol(1, 9);
+            draw::setSource(draw::getSurface("prologo1.gif"));
+            draw::draw(96, 28, 128, 96, 0, 0);
+            draw::print2("ME ANE A ESCABUSSARME", 10, 17, WHITE, FONT_ZOOM_NONE);
+            draw::print2("EN LA NOVA PISCINA!", 11, 19, WHITE, FONT_ZOOM_NONE);
+            draw::render();
+
+            if (audio::getCurrentMusic() != "mus_menu.ogg") audio::playMusic("mus_menu.ogg");
+        }
+
+        const bool shouldGoToNext()
+        {
+            return (SDL_GetTicks()-time > (stage==8?10000:5000)) ||
+                   (controller::pressed(KEY_JUMP)) || (controller::pressed(KEY_PICK)) ||
+                   (input::keyPressed(SDL_SCANCODE_SPACE)) || (input::keyPressed(SDL_SCANCODE_RETURN));
+        }
+
+        void drawActorAt(const char* name, const int x, const int y)
+        {
+            draw::swapcol(1,PURPLE);
+            actor::actor_t *act = actor::createFromTemplate(name); act->flags &= ~FLAG_SPECIAL;
+            actor::drawAt(act, x, y); actor::remove(act);
+        }
+
+        bool loop()
+        {
+            if (controller::pressed(KEY_MENU)) return false;
+
+            if (shouldGoToNext())
+            {
+                time = SDL_GetTicks();
+                stage++;
+                if (stage == 4) return false;
+
+                switch (stage)
+                {
+                    case 1:
+                        draw::cls(2);
+                        draw::swapcol(1, 9);
+                        draw::setSource(draw::getSurface("prologo2.gif"));
+                        draw::draw(96, 28, 128, 96, 0, 0);
+                        draw::print2("MIRA, ESTE SA DEJAT", 10, 17, WHITE, FONT_ZOOM_NONE);
+                        draw::print2("TOT TIRADO PER AI...", 10, 19, WHITE, FONT_ZOOM_NONE);
+                        //draw::render();
+                        break;
+                    case 2:
+                        draw::cls(2);
+                        draw::swapcol(1, 9);
+                        draw::setSource(draw::getSurface("prologo2.gif"));
+                        draw::draw(96, 28, 128, 96, 0, 0);
+                        draw::print2("BACH A DEJARO TOT", 12, 17, WHITE, FONT_ZOOM_NONE);
+                        draw::print2("EN SU PUESTO!", 14, 19, WHITE, FONT_ZOOM_NONE);
+                        //draw::render();
+                        break;
+                    case 3:
+                        draw::cls(2);
+                        draw::swapcol(1, 9);
+                        draw::setSource(draw::getSurface("prologo2.gif"));
+                        draw::draw(96, 28, 128, 96, 0, 0);
+                        draw::print2("BORAS QUE FELIS", 12, 17, WHITE, FONT_ZOOM_NONE);
+                        draw::print2("SE PONE!", 15, 19, WHITE, FONT_ZOOM_NONE);
+                        //draw::render();
+                        break;
+                }
+            }
+            draw::render();
+            return true;
+        }
+    }
+}

source/m_prologo_intro.h

@@ -0,0 +1,10 @@
+#pragma once
+
+namespace modules
+{
+    namespace prologo_intro
+    {
+        void init();
+        bool loop();
+    }
+}

source/main.cpp

@@ -28,7 +28,8 @@
 #include "m_editor_bitmap_file.h"
 #include "m_editor_bitmap.h"
 #include "m_end_sequence.h"
-
+#include "m_prologo_intro.h"
+#include "m_end_prologo_sequence.h"
 
 #define M_LOGO               0
 #define M_INTRO              1
@@ -46,6 +47,8 @@
 #define M_EDITOR_BITMAP_FILE 13
 #define M_EDITOR_BITMAP      14
 #define M_END                15
+#define M_PROLOGO_INTRO      16
+#define M_PROLOGO_END        17
 
 
 int current_module = M_LOGO;
@@ -73,6 +76,15 @@ void loadConfig()
     std::string txt_fullscreen = file::getConfigValue("fullscreen");
     if (txt_fullscreen=="yes") fullscreen = true;
 
+    int screen_mode = SCREEN_MODE_NORMAL;
+    std::string txt_fosforo = file::getConfigValue("fosforo");
+    if (txt_fosforo=="yes") screen_mode |= SCREEN_MODE_FOSFORO;
+
+    std::string txt_scanlines = file::getConfigValue("scanlines");
+    if (txt_scanlines=="yes") screen_mode |= SCREEN_MODE_SCANLINES;
+
+    draw::setScreenMode(screen_mode);
+
     static const char* nomtecles[6] = {"keyup", "keydown", "keyleft", "keyright", "keyjump", "keypick"};
     for (int i=0; i<6; ++i)
     {
@@ -109,7 +121,11 @@ void game::init()
         audio::loadSound("snd_boost.wav");
     }
 
-    draw::loadPalette("test.gif");
+    if (draw::getScreenMode()&SCREEN_MODE_FOSFORO) {
+        draw::loadPalette("fosforo.gif");
+    } else {
+        draw::loadPalette("test.gif");
+    }
 
     if (editor::isDevMode()) {
         current_module = M_GAME;
@@ -136,6 +152,19 @@ bool game::loop()
         fullscreen = draw::getFullscreen();
         file::setConfigValue("fullscreen", fullscreen?"yes":"no");
     }
+    if (input::keyPressed(SDL_SCANCODE_F4)) {
+        draw::toggleScreenMode();
+        const int mode = draw::getScreenMode();
+
+        if (mode&SCREEN_MODE_FOSFORO) {
+            draw::loadPalette("fosforo.gif");
+        } else {
+            draw::loadPalette("test.gif");
+        }
+
+        file::setConfigValue("fosforo", mode&SCREEN_MODE_FOSFORO?"yes":"no");
+        file::setConfigValue("scanlines", mode&SCREEN_MODE_SCANLINES?"yes":"no");
+    }
 
     if (input::keyPressed(SDL_SCANCODE_F12)) {
         draw::reloadAll();
@@ -150,14 +179,20 @@ bool game::loop()
         case M_INTRO:
             if (!modules::intro::loop()) { modules::menu::init(); current_module = M_MENU; }
             break;
+        case M_PROLOGO_INTRO:
+            if (!modules::prologo_intro::loop()) { modules::game::init(true); current_module = M_GAME; }
+            break;
         case M_END:
             if (!modules::end_sequence::loop()) { modules::menu::init(); current_module = M_MENU; }
             break;
+        case M_PROLOGO_END:
+            if (!modules::end_prologo_sequence::loop()) { modules::end_sequence::init(true); current_module = M_END; }
+            break;
         case M_MENU:
             option = modules::menu::loop();
             if (option != OPTION_NONE) {
                 if (option == OPTION_EIXIR) return false;
-                if (option == OPTION_PROLOGO)  { modules::game::init(true); current_module = M_GAME; }
+                if (option == OPTION_PROLOGO)  { modules::prologo_intro::init(); current_module = M_PROLOGO_INTRO; }
                 if (option == OPTION_JUGAR)  { modules::game::init(); current_module = M_GAME; }
                 if (option == OPTION_TECLES)  { modules::menu_tecles::init(); current_module = M_MENU_TECLES; }
                 if (option == OPTION_GAMEPAD)  { modules::menu_gamepad::init(); current_module = M_MENU_GAMEPAD; }
@@ -191,7 +226,11 @@ bool game::loop()
                     modules::editor_bitmap::init(EDITING_BITMAP_POS); current_module = M_EDITOR_BITMAP;
                 } else if (option==GAME_EDITOR_BITMAP_SIZE) {
                     modules::editor_bitmap::init(EDITING_BITMAP_SIZE); current_module = M_EDITOR_BITMAP;
-                } else if (option==GAME_END) { modules::end_sequence::init(); current_module = M_END; }
+                } else if (option==GAME_END) {
+                    modules::end_sequence::init(); current_module = M_END;
+                } else if (option==GAME_PROLOGO_END) {
+                    modules::end_prologo_sequence::init(); current_module = M_PROLOGO_END;
+                }
 
             }
             break;

source/room.cpp

@@ -283,6 +283,17 @@ namespace room
                                 actor::remove(act);
                                 act = nullptr;
                             }
+                        } else if (act->name[0]=='X') { // Es un objecte del prólogo sense arreplegar
+                            if (!::editor::isDevMode() && actor::hero::getPrologoObjectState(act->name[2]-48)!=PROLOGO_OBJECT_INITIAL)
+                            {
+                                actor::remove(act);
+                                act = nullptr;
+                            }
+                        } else if (act->name[0]=='Y') { // Es un hueco on deixar un objecte del prólogo
+                            if (!::editor::isDevMode() && actor::hero::getPrologoObjectState(act->name[2]-48)==PROLOGO_OBJECT_LEFT)
+                            {
+                                act->name[0] = 'Z';
+                            }
                         }
                     }
                     if (act) actor::setDirty(act, true);