- [NEW] Gràfics nous

data/rooms/03.txt

@@ -10,28 +10,6 @@ under-door-texture: 0
 exit-xp: 2
 exit-yn: 1
 
-actor{
-    name: BOX
-    bmp: test.gif
-    bmp-rect: 32 0 32 32
-    bmp-offset: 0 32
-    pos: 32 32 0
-    size: 8 8 8
-    flags: PUSHABLE GRAVITY 
-    movement: CW
-}
-
-actor{
-    name: BOX01
-    bmp: test.gif
-    bmp-rect: 32 0 32 32
-    bmp-offset: 0 32
-    pos: 28 29 8
-    size: 8 8 8
-    flags: PUSHABLE GRAVITY 
-    movement: CW
-}
-
 actor{
     name: CONVEYOR
     bmp: caixes.gif
@@ -45,3 +23,45 @@ actor{
     react-push: XP 
     movement: CW
 }
+
+actor{
+    name: FINESTRA
+    bmp: altres.gif
+    bmp-rect: 0 75 20 33
+    bmp-offset: 0 39
+    pos: 15 23 4
+    size: 1 1 9
+    movement: CW
+}
+
+actor{
+    name: FINESTRA01
+    bmp: altres.gif
+    bmp-rect: 0 75 20 33
+    bmp-offset: 0 39
+    pos: 15 31 4
+    size: 1 1 9
+    movement: CW
+}
+
+actor{
+    name: BOX
+    bmp: test.gif
+    bmp-rect: 32 0 32 32
+    bmp-offset: 0 32
+    pos: 27 31 0
+    size: 8 8 8
+    flags: PUSHABLE GRAVITY 
+    movement: CW
+}
+
+actor{
+    name: BOX01
+    bmp: test.gif
+    bmp-rect: 32 0 32 32
+    bmp-offset: 0 32
+    pos: 27 29 8
+    size: 8 8 8
+    flags: PICKABLE PUSHABLE GRAVITY 
+    movement: CW
+}

data/rooms/07.txt

@@ -4,12 +4,22 @@ door-height-xp: 0
 door-height-xn: 0
 color: PURPLE
 floor-texture: 0
-wall-texture: 0
-door-texture: 0
+wall-texture: 1
+door-texture: 3
 under-door-texture: 0
 exit-xn: 8
 exit-zn: 6
 
+actor{
+    name: FINESTRA
+    bmp: altres.gif
+    bmp-rect: 48 76 18 32
+    bmp-offset: 0 39
+    pos: 0 9 6
+    size: 1 1 9
+    movement: CW
+}
+
 actor{
     name: LIFT
     bmp: caixes.gif

data/templates.txt

@@ -187,3 +187,13 @@ actor{
     size: 8 4 8
     movement: CW
 }
+
+actor{
+    name: FINESTRA
+    bmp: altres.gif
+    bmp-rect: 0 75 20 33
+    bmp-offset: 0 39
+    pos: 15 23 4
+    size: 1 1 9
+    movement: CW
+}

source/actor.cpp

@@ -540,7 +540,7 @@ namespace actor
                     act->push |= PUSH_YP;
             }
         }
-        if ((input::keyPressed(SDL_SCANCODE_RETURN) || input::keyDown(config::getKey(KEY_PICK)) ) && (hero::getSkills()&SKILL_PANTS))
+        if ((input::keyPressed(SDL_SCANCODE_RETURN) || input::keyPressed(config::getKey(KEY_PICK)) ) && (hero::getSkills()&SKILL_PANTS))
         {
             if (picked)
             {
@@ -592,7 +592,7 @@ namespace actor
         if (act->react_mask)
         {
             // Si topetem en una vora de l'habitació, s'acabat el bot
-            if ((act->pos.x+act->size.x)>max.x || act->pos.x<min.x || (act->pos.y+act->size.y)>max.y || act->pos.y<min.y) act->react_push=9;
+            if ((act->pos.x+act->size.x)>max.x || act->pos.x<min.x || (act->pos.y+act->size.y)>max.y || act->pos.y<min.y) act->react_push=0;
             
             // Si encara està botant (react_push > 0)...
             if (act->react_push>0)