- [NEW] Afegit icono al executable de Windows

- Afegits iconos

Makefile

@@ -3,7 +3,7 @@ source = source/*.cpp
 
 windows:
 	@echo off
-	g++ $(source) icon.res -lmingw32 -lSDL2main -lSDL2 -mwindows -o "$(executable).exe"
+	g++ $(source) bin/icon.res -lmingw32 -lSDL2main -lSDL2 -mwindows -o "$(executable).exe"
 	strip -s -R .comment -R .gnu.version --strip-unneeded "$(executable).exe"
 
 windows_debug:

bin/icon.rc

@@ -0,0 +1 @@
+id ICON "icon.ico"

data/old_rooms/00.txt

@@ -1,57 +0,0 @@
-width: 2
-height: 1
-door-height-xp: 1
-door-height-xn: 1
-color: CYAN
-floor-texture: 0
-wall-texture: 2
-door-texture: 0
-under-door-texture: 0
-exit-xp: 5
-exit-xn: 1
-exit-zn: 2
-
-actor{
-    name: PLATFORM02
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 16 20 0
-    size: 8 8 4
-}
-
-actor{
-    name: PLATFORM00
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 8 28 0
-    size: 8 8 4
-}
-
-actor{
-    name: PLATFORM01
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 16 28 0
-    size: 8 8 4
-}
-
-actor{
-    name: PLATFORM04
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 40 28 0
-    size: 8 8 4
-}
-
-actor{
-    name: PLATFORM03
-    bmp: test.gif
-    bmp-rect: 64 0 32 24
-    bmp-offset: 0 24
-    pos: 48 28 0
-    size: 8 8 4
-}

data/old_rooms/01.txt

@@ -1,112 +0,0 @@
-width: 2
-height: 2
-door-height-xp: 0
-door-height-yp: 0
-color: CYAN
-floor-texture: 9
-wall-texture: 3
-door-texture: 1
-under-door-texture: 0
-exit-xp: 0
-exit-yp: 3
-
-actor{
-    name: ARMARI01
-    bmp: caixes.gif
-    bmp-rect: 64 32 24 32
-    bmp-offset: -8 36
-    pos: 8 8 0
-    size: 8 4 5
-    movement: CW
-}
-
-actor{
-    name: TAULETA
-    bmp: caixes.gif
-    bmp-rect: 0 64 32 32
-    bmp-offset: 0 32
-    pos: 24 8 0
-    size: 8 8 5
-    movement: CW
-}
-
-actor{
-    name: S-SHOES
-    bmp: objectes.gif
-    bmp-rect: 162 0 28 22
-    bmp-offset: -3 24
-    pos: 48 8 0
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: TAULA01
-    bmp: caixes.gif
-    bmp-rect: 128 32 32 32
-    bmp-offset: 0 32
-    pos: 8 24 0
-    size: 8 8 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
-actor{
-    name: TAULA02
-    bmp: caixes.gif
-    bmp-rect: 160 32 32 32
-    bmp-offset: 0 32
-    pos: 8 32 0
-    size: 8 8 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
-actor{
-    name: ARMARI02
-    bmp: caixes.gif
-    bmp-rect: 96 32 24 32
-    bmp-offset: -8 36
-    pos: 8 8 8
-    size: 8 4 8
-    movement: CW
-}
-
-actor{
-    name: TV
-    bmp: caixes.gif
-    bmp-rect: 32 64 32 32
-    bmp-offset: 0 32
-    pos: 24 7 5
-    size: 8 5 8
-    orient: XP 
-    movement: CW
-}
-
-actor{
-    name: NES
-    bmp: caixes.gif
-    bmp-rect: 96 0 32 32
-    bmp-offset: 0 32
-    pos: 24 16 0
-    size: 8 8 6
-    flags: PICKABLE PUSHABLE GRAVITY 
-    movement: CW
-}
-
-actor{
-    name: ROOMBA
-    bmp: caixes.gif
-    bmp-rect: 160 0 32 32
-    bmp-offset: 0 34
-    pos: 40 32 0
-    size: 8 8 4
-    orient: YP 
-    flags: MOVING DEADLY 
-    movement: Y
-}

data/old_rooms/02.txt

@@ -1,24 +0,0 @@
-width: 2
-height: 1
-door-height-xn: 4
-door-height-yp: 0
-color: PURPLE
-floor-texture: 1
-wall-texture: 2
-door-texture: 0
-under-door-texture: 2
-exit-xn: 3
-exit-yp: 4
-exit-zp: 0
-
-actor{
-    name: G-FILTER
-    bmp: objectes.gif
-    bmp-rect: 0 0 24 32
-    bmp-offset: 0 32
-    pos: 8 16 0
-    size: 8 8 8
-    anim-wait: 4
-    flags: PUSHABLE ANIMATED GRAVITY SPECIAL 
-    movement: CW
-}

data/old_rooms/03.txt

@@ -1,67 +0,0 @@
-width: 1
-height: 2
-door-height-xp: 0
-door-height-yn: 4
-color: PURPLE
-floor-texture: 0
-wall-texture: 0
-door-texture: 0
-under-door-texture: 0
-exit-xp: 2
-exit-yn: 1
-
-actor{
-    name: CONVEYOR
-    bmp: caixes.gif
-    bmp-rect: 0 144 32 32
-    bmp-offset: 0 32
-    pos: 16 48 0
-    size: 8 8 4
-    anim-cycle: MIN
-    flags: REACTIVE ANIMATED 
-    react-mask: ZN 
-    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/old_rooms/04.txt

@@ -1,250 +0,0 @@
-width: 2
-height: 3
-door-height-yp: 2
-door-height-yn: 2
-color: GREEN
-floor-texture: 1
-wall-texture: 5
-door-texture: 4
-under-door-texture: 0
-exit-yn: 2
-
-actor{
-    name: BOX
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 8 0 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX02
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 16 0 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 0 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX20
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 8 8 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX01
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 8 16 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX11
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 8 24 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX12
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 8 32 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX13
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 8 40 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX14
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 8 48 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX21
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 8 56 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX15
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 16 56 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX16
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 56 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX04
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 0 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX17
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 56 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX05
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 40 0 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX22
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 48 0 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX06
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 48 8 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX07
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 48 16 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX08
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 48 24 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX09
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 48 32 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX10
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 48 40 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX19
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 48 48 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX18
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 40 56 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX23
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 48 56 0
-    size: 8 8 8
-    movement: CW
-}

data/old_rooms/05.txt

@@ -1,11 +0,0 @@
-width: 2
-height: 2
-door-height-xp: 0
-door-height-xn: 0
-color: YELLOW
-floor-texture: 8
-wall-texture: 8
-door-texture: 5
-under-door-texture: 0
-exit-xp: 6
-exit-xn: 0

data/old_rooms/06.txt

@@ -1,114 +0,0 @@
-width: 3
-height: 3
-door-height-xn: 0
-color: CYAN
-floor-texture: 0
-wall-texture: 0
-door-texture: 0
-under-door-texture: 0
-exit-xn: 5
-exit-zp: 7
-
-actor{
-    name: SOFA
-    bmp: altres.gif
-    bmp-rect: 0 0 48 40
-    bmp-offset: 0 32
-    pos: 0 0 0
-    size: 16 8 6
-    movement: CW
-}
-
-actor{
-    name: LLIT
-    bmp: altres.gif
-    bmp-rect: 48 0 57 47
-    bmp-offset: 12 33
-    pos: 16 0 0
-    size: 16 16 6
-    movement: CW
-}
-
-actor{
-    name: LIFT
-    bmp: caixes.gif
-    bmp-rect: 32 32 32 24
-    bmp-offset: 0 24
-    pos: 56 0 0
-    size: 8 8 4
-    orient: ZP 
-    flags: MOVING 
-    movement: Z
-}
-
-actor{
-    name: B4-02
-    bmp: objectes.gif
-    bmp-rect: 114 78 15 18
-    bmp-offset: -8 22
-    pos: 0 40 0
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: B8-00
-    bmp: objectes.gif
-    bmp-rect: 114 78 15 18
-    bmp-offset: -8 22
-    pos: 0 48 0
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: YONKI
-    bmp: caixes.gif
-    bmp-rect: 168 64 19 32
-    bmp-offset: -7 37
-    pos: 18 56 0
-    size: 6 6 12
-    anim-cycle: SEQ
-    anim-wait: 1
-    flags: PUSHABLE GRAVITY 
-    movement: CW
-}
-
-actor{
-    name: BARREL
-    bmp: caixes.gif
-    bmp-rect: 96 64 18 32
-    bmp-offset: -7 37
-    pos: 25 57 0
-    size: 6 6 12
-    anim-cycle: SEQ
-    anim-wait: 1
-    flags: PUSHABLE ANIMATED GRAVITY 
-    movement: CW
-}
-
-actor{
-    name: NEVERA1
-    bmp: caixes.gif
-    bmp-rect: 0 96 32 32
-    bmp-offset: 0 32
-    pos: 32 32 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: NEVERA2
-    bmp: caixes.gif
-    bmp-rect: 32 96 32 32
-    bmp-offset: 0 32
-    pos: 32 32 8
-    size: 8 8 8
-    movement: CW
-}

data/old_rooms/07.txt

@@ -1,33 +0,0 @@
-width: 3
-height: 3
-door-height-xp: 0
-door-height-xn: 0
-color: PURPLE
-floor-texture: 0
-wall-texture: 14
-door-texture: 2
-under-door-texture: 0
-exit-xn: 8
-exit-zn: 6
-
-actor{
-    name: LIFT
-    bmp: caixes.gif
-    bmp-rect: 32 32 32 24
-    bmp-offset: 0 24
-    pos: 56 0 0
-    size: 8 8 4
-    orient: ZP 
-    flags: MOVING 
-    movement: Z
-}
-
-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
-}

data/old_rooms/08.txt

@@ -1,105 +0,0 @@
-width: 2
-height: 2
-door-height-xp: 0
-color: CYAN
-floor-texture: 0
-wall-texture: 11
-door-texture: 0
-under-door-texture: 0
-exit-xp: 7
-
-actor{
-    name: P-ELBOW
-    bmp: objectes.gif
-    bmp-rect: 0 32 22 32
-    bmp-offset: -2 35
-    pos: 8 16 0
-    size: 4 4 4
-    anim-wait: 6
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: P-PIPE
-    bmp: objectes.gif
-    bmp-rect: 0 64 16 32
-    bmp-offset: -8 36
-    pos: 8 24 0
-    size: 4 4 4
-    anim-wait: 6
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: P-SALT
-    bmp: objectes.gif
-    bmp-rect: 66 32 20 32
-    bmp-offset: -7 35
-    pos: 8 32 0
-    size: 4 4 4
-    anim-wait: 6
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: EXPLOSION
-    bmp: caixes.gif
-    bmp-rect: 0 160 18 22
-    bmp-offset: -7 38
-    pos: 32 32 0
-    size: 8 8 4
-    anim-cycle: SEQ
-    flags: ANIMATED 
-    movement: CW
-}
-
-actor{
-    name: P-FILTER
-    bmp: objectes.gif
-    bmp-rect: 0 0 24 32
-    bmp-offset: -4 34
-    pos: 8 24 8
-    size: 4 4 4
-    anim-wait: 6
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: P-PUMP
-    bmp: objectes.gif
-    bmp-rect: 48 64 22 32
-    bmp-offset: -5 35
-    pos: 8 32 11
-    size: 4 4 4
-    anim-wait: 6
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: BOX01
-    bmp: caixes.gif
-    bmp-rect: 0 160 18 22
-    bmp-offset: -7 38
-    pos: 32 32 5
-    size: 8 8 4
-    anim-cycle: SEQ
-    flags: ANIMATED 
-    movement: CW
-}
-
-actor{
-    name: P-TIMER
-    bmp: objectes.gif
-    bmp-rect: 72 0 24 32
-    bmp-offset: -4 34
-    pos: 8 40 8
-    size: 4 4 4
-    anim-wait: 6
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}

data/old_rooms/09.txt

@@ -1,210 +0,0 @@
-width: 3
-height: 3
-door-height-yp: 0
-color: CYAN
-floor-texture: 0
-wall-texture: 0
-door-texture: 0
-under-door-texture: 0
-exit-yp: 10
-
-actor{
-    name: KALLAX-A03
-    bmp: altres.gif
-    bmp-rect: 72 48 24 27
-    bmp-offset: 0 31
-    pos: 0 16 0
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A
-    bmp: altres.gif
-    bmp-rect: 0 48 24 27
-    bmp-offset: 0 31
-    pos: 0 32 0
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A02
-    bmp: altres.gif
-    bmp-rect: 48 48 24 27
-    bmp-offset: 0 31
-    pos: 0 16 8
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A01
-    bmp: altres.gif
-    bmp-rect: 24 48 24 27
-    bmp-offset: 0 31
-    pos: 0 32 8
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A04
-    bmp: altres.gif
-    bmp-rect: 72 48 24 27
-    bmp-offset: -8 31
-    pos: 8 0 0
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A05
-    bmp: altres.gif
-    bmp-rect: 96 48 24 27
-    bmp-offset: -8 31
-    pos: 8 0 8
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
-actor{
-    name: ARCADE
-    bmp: altres.gif
-    bmp-rect: 160 0 30 48
-    bmp-offset: 0 48
-    pos: 16 0 0
-    size: 8 8 16
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A07
-    bmp: altres.gif
-    bmp-rect: 96 48 24 27
-    bmp-offset: -8 31
-    pos: 24 0 0
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A08
-    bmp: altres.gif
-    bmp-rect: 24 48 24 27
-    bmp-offset: -8 31
-    pos: 32 0 0
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A06
-    bmp: altres.gif
-    bmp-rect: 72 48 24 27
-    bmp-offset: -8 31
-    pos: 24 0 8
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A09
-    bmp: altres.gif
-    bmp-rect: 0 48 24 27
-    bmp-offset: -8 31
-    pos: 32 0 8
-    size: 8 4 8
-    orient: YP 
-    flags: ORIENTABLE 
-    movement: CW
-}
-
-actor{
-    name: TAULETA
-    bmp: caixes.gif
-    bmp-rect: 0 64 32 32
-    bmp-offset: 0 32
-    pos: 40 0 0
-    size: 8 8 4
-    movement: CW
-}
-
-actor{
-    name: BOX05
-    bmp: altres.gif
-    bmp-rect: 128 0 20 42
-    bmp-offset: -5 46
-    pos: 40 0 4
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX01
-    bmp: caixes.gif
-    bmp-rect: 128 32 32 32
-    bmp-offset: 0 32
-    pos: 16 24 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX02
-    bmp: caixes.gif
-    bmp-rect: 160 32 32 32
-    bmp-offset: 0 32
-    pos: 24 24 0
-    size: 8 8 8
-    react-push: XP 
-    movement: CW
-}
-
-actor{
-    name: GAT
-    bmp: gat2.gif
-    bmp-rect: 0 0 24 28
-    bmp-offset: -5 30
-    pos: 40 32 0
-    size: 8 8 8
-    orient: XP 
-    anim-wait: 1
-    flags: PUSHABLE MOVING ANIMATED ORIENTABLE INERTIA 
-    movement: X
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 128 0 32 32
-    bmp-offset: 0 32
-    pos: 16 24 8
-    size: 8 8 2
-    flags: PUSHABLE 
-    react-push: XP 
-    movement: CW
-}
-
-actor{
-    name: BOX04
-    bmp: caixes.gif
-    bmp-rect: 32 64 32 32
-    bmp-offset: 0 32
-    pos: 24 24 8
-    size: 8 8 8
-    orient: YP 
-    flags: ORIENTABLE 
-    react-push: XP 
-    movement: CW
-}

data/old_rooms/10.txt

@@ -1,110 +0,0 @@
-width: 0
-height: 3
-door-height-yp: 0
-door-height-yn: 5
-color: WHITE
-floor-texture: 6
-wall-texture: 0
-door-texture: 0
-under-door-texture: 0
-exit-yn: 9
-
-actor{
-    name: BOX01
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 0 12
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 0 12
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX08
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 8 8
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX01
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 8 8
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX07
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 16 4
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX02
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 16 4
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX06
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 24 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 32 24 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX05
-    bmp: caixes.gif
-    bmp-rect: 32 32 32 24
-    bmp-offset: 0 24
-    pos: 24 32 0
-    size: 8 10 4
-    movement: CW
-}
-
-actor{
-    name: BOX04
-    bmp: caixes.gif
-    bmp-rect: 32 32 32 24
-    bmp-offset: 0 24
-    pos: 32 32 0
-    size: 8 10 4
-    movement: CW
-}

data/rooms/02.txt

@@ -52,7 +52,7 @@ actor{
 }
 
 actor{
-    name: B-00-LIVE
+    name: B-00-JUMP
     bmp: objectes.gif
     bmp-rect: 114 78 15 18
     bmp-offset: -8 22

data/rooms/16.txt

@@ -9,6 +9,19 @@ under-door-texture: 0
 exit-yp: 15
 editor-done: 1
 
+actor{
+    name: B-05-GOD
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 40 40 0
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
 actor{
     name: BOX-A-01
     bmp: caixes.gif

data/rooms/23.txt

@@ -24,7 +24,7 @@ actor{
 }
 
 actor{
-    name: B-01-JUMP
+    name: B-01-RUN
     bmp: objectes.gif
     bmp-rect: 114 78 15 18
     bmp-offset: -8 22

data/rooms/27.txt

@@ -12,11 +12,11 @@ exit-xn: 28
 editor-done: 1
 
 actor{
-    name: B-03-GOD
+    name: B-03-LIVE
     bmp: objectes.gif
     bmp-rect: 114 78 15 18
-    bmp-offset: -8 22
-    pos: 48 -3 16
+    bmp-offset: -8 24
+    pos: 48 56 16
     size: 4 4 4
     anim-cycle: SEQ
     anim-wait: 2
@@ -25,18 +25,7 @@ actor{
 }
 
 actor{
-    name: BOX-B
-    bmp: caixes.gif
-    bmp-rect: 32 0 32 32
-    bmp-offset: 0 32
-    pos: 48 8 0
-    size: 8 8 8
-    flags: PUSHABLE 
-    movement: CW
-}
-
-actor{
-    name: CADIRA
+    name: CADIRA-00
     bmp: caixes.gif
     bmp-rect: 64 96 20 32
     bmp-offset: -7 38
@@ -47,12 +36,24 @@ actor{
     movement: CW
 }
 
+actor{
+    name: CADIRA-01
+    bmp: caixes.gif
+    bmp-rect: 64 96 20 32
+    bmp-offset: -7 38
+    pos: 8 7 0
+    size: 6 5 8
+    orient: YP 
+    flags: PUSHABLE 
+    movement: CW
+}
+
 actor{
     name: CUADRO-00
     bmp: altres.gif
     bmp-rect: 66 75 18 32
     bmp-offset: 0 39
-    pos: 7 8 6
+    pos: 7 13 6
     size: 1 1 9
     orient: YP 
     movement: CW
@@ -63,7 +64,7 @@ actor{
     bmp: altres.gif
     bmp-rect: 102 75 18 32
     bmp-offset: 0 39
-    pos: 7 48 6
+    pos: 7 43 6
     size: 1 1 9
     orient: YP 
     movement: CW
@@ -165,6 +166,26 @@ actor{
     movement: CW
 }
 
+actor{
+    name: LAMPARA-00
+    bmp: altres.gif
+    bmp-rect: 128 0 20 41
+    bmp-offset: -6 45
+    pos: 48 56 0
+    size: 6 6 16
+    movement: CW
+}
+
+actor{
+    name: LAMPARA-01
+    bmp: altres.gif
+    bmp-rect: 128 0 20 41
+    bmp-offset: -6 45
+    pos: 8 56 0
+    size: 6 6 16
+    movement: CW
+}
+
 actor{
     name: MESITA
     bmp: caixes.gif
@@ -182,7 +203,7 @@ actor{
     bmp-offset: -2 33
     pos: 32 0 0
     size: 8 7 6
-    flags: PUSHABLE 
+    flags: PICKABLE PUSHABLE GRAVITY 
     movement: CW
 }
 
@@ -191,7 +212,7 @@ actor{
     bmp: caixes.gif
     bmp-rect: 160 0 32 32
     bmp-offset: 0 34
-    pos: 8 56 0
+    pos: 16 56 0
     size: 8 8 2
     orient: XN 
     flags: REACTIVE MOVING DEADLY 
@@ -230,6 +251,6 @@ actor{
     bmp-offset: -4 34
     pos: 24 0 4
     size: 8 6 8
-    flags: PUSHABLE 
+    flags: PUSHABLE GRAVITY 
     movement: CW
 }

data/rooms/35.txt

@@ -11,6 +11,19 @@ exit-xn: 33
 exit-yn: 28
 editor-done: 1
 
+actor{
+    name: B-06-LIVE
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 24 32 12
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
 actor{
     name: PLATH-00
     bmp: caixes.gif
@@ -227,3 +240,15 @@ actor{
     orient: ZP 
     movement: Z
 }
+
+actor{
+    name: PLATH-18
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 24 32 8
+    size: 8 8 4
+    orient: ZP 
+    flags: DISAPPEAR 
+    movement: Z
+}

data/rooms/56.txt

@@ -27,19 +27,6 @@ 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/59.txt

@@ -256,9 +256,9 @@ actor{
     bmp: gat.gif
     bmp-rect: 0 0 24 28
     bmp-offset: -4 32
-    pos: 16 16 0
+    pos: 16 24 0
     size: 8 8 8
-    orient: XP 
+    orient: YN 
     anim-wait: 1
     flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY 
     react-mask: XP XN YP YN ZP ZN 
@@ -270,9 +270,9 @@ actor{
     bmp: gat2.gif
     bmp-rect: 0 0 24 28
     bmp-offset: -4 32
-    pos: 40 40 0
+    pos: 40 32 0
     size: 8 8 8
-    orient: XN 
+    orient: YP 
     anim-wait: 1
     flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY 
     react-mask: XP XN YP YN ZP ZN 

data/rooms/60.txt

@@ -183,9 +183,9 @@ actor{
     bmp: obrer.gif
     bmp-rect: 0 0 24 32
     bmp-offset: -4 37
-    pos: 8 24 0
+    pos: 24 24 0
     size: 8 8 8
-    orient: XN 
+    orient: XP 
     anim-wait: 1
     flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY 
     react-mask: XP XN YP YN ZP ZN 
@@ -197,9 +197,9 @@ actor{
     bmp: obrer.gif
     bmp-rect: 0 0 24 32
     bmp-offset: -4 37
-    pos: 48 48 0
+    pos: 40 48 0
     size: 8 8 8
-    orient: XN 
+    orient: XP 
     anim-wait: 1
     flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY 
     react-mask: XP XN YP YN ZP ZN 

data/rooms/61.txt

@@ -20,6 +20,19 @@ actor{
     movement: CW
 }
 
+actor{
+    name: B-04-LIVE
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 48 0 0
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
 actor{
     name: BLOCMATA-00
     bmp: altres.gif
@@ -61,6 +74,7 @@ actor{
     bmp-offset: 0 32
     pos: 0 49 6
     size: 8 8 8
+    flags: PUSHABLE GRAVITY 
     movement: CW
 }
 
@@ -72,7 +86,7 @@ actor{
     pos: 8 40 0
     size: 8 8 8
     orient: YP 
-    flags: ORIENTABLE 
+    flags: PUSHABLE ORIENTABLE GRAVITY 
     movement: CW
 }
 
@@ -83,6 +97,7 @@ actor{
     bmp-offset: 0 32
     pos: 8 32 8
     size: 8 8 8
+    flags: PUSHABLE GRAVITY 
     movement: CW
 }
 
@@ -117,6 +132,7 @@ actor{
     bmp-offset: 0 32
     pos: 31 2 0
     size: 8 8 8
+    flags: PUSHABLE GRAVITY 
     movement: CW
 }
 
@@ -128,7 +144,7 @@ actor{
     pos: 54 0 8
     size: 8 8 8
     orient: YP 
-    flags: ORIENTABLE 
+    flags: PUSHABLE ORIENTABLE GRAVITY 
     movement: CW
 }
 
@@ -149,6 +165,7 @@ actor{
     bmp-offset: 0 32
     pos: 10 32 0
     size: 8 8 8
+    flags: PUSHABLE GRAVITY 
     movement: CW
 }
 
@@ -167,8 +184,9 @@ actor{
     bmp: caixes.gif
     bmp-rect: 32 0 32 32
     bmp-offset: 0 32
-    pos: 40 0 0
+    pos: 40 1 0
     size: 8 8 8
+    flags: PUSHABLE GRAVITY 
     movement: CW
 }
 
@@ -180,7 +198,7 @@ actor{
     pos: 46 3 10
     size: 8 8 8
     orient: YP 
-    flags: ORIENTABLE 
+    flags: PUSHABLE ORIENTABLE GRAVITY 
     movement: CW
 }
 
@@ -256,3 +274,42 @@ actor{
     flags: MOVING ANIMATED 
     movement: RANDV
 }
+
+actor{
+    name: EXPLOSION-03
+    bmp: caixes.gif
+    bmp-rect: 0 160 18 22
+    bmp-offset: -7 24
+    pos: 48 48 0
+    size: 8 8 4
+    orient: YN 
+    anim-cycle: SEQ
+    flags: MOVING ANIMATED 
+    movement: RANDV
+}
+
+actor{
+    name: EXPLOSION-04
+    bmp: caixes.gif
+    bmp-rect: 0 160 18 22
+    bmp-offset: -7 24
+    pos: 0 0 0
+    size: 8 8 4
+    orient: XP 
+    anim-cycle: SEQ
+    flags: MOVING ANIMATED 
+    movement: RANDV
+}
+
+actor{
+    name: EXPLOSION-05
+    bmp: caixes.gif
+    bmp-rect: 0 160 18 22
+    bmp-offset: -7 24
+    pos: 16 24 0
+    size: 8 8 4
+    orient: XN 
+    anim-cycle: SEQ
+    flags: MOVING ANIMATED 
+    movement: RANDV
+}

data/rooms/63.txt

@@ -9,6 +9,19 @@ under-door-texture: 2
 exit-xp: 62
 editor-done: 1
 
+actor{
+    name: B-02-GOD
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 56 16 20
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
 actor{
     name: P-ELBOW
     bmp: objectes.gif
@@ -45,6 +58,29 @@ actor{
     movement: Y
 }
 
+actor{
+    name: PLATH-02
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 56 16 16
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-04
+    bmp: altres.gif
+    bmp-rect: 160 48 32 32
+    bmp-offset: 0 32
+    pos: 32 8 16
+    size: 8 8 4
+    orient: XN 
+    flags: MOVING 
+    movement: X
+}
+
 actor{
     name: TRANSPA-00
     bmp: altres.gif

source/actor.cpp

@@ -2164,7 +2164,7 @@ namespace actor
             switch (getBoosterFromString(booster))
             {
             case BOOST_GOD:
-                boost_god = 99 * 2;
+                boost_god = 99 * 4;
                 break;
             case BOOST_RUN:
                 boost_steps = 99 * 2;

source/m_game.cpp

@@ -437,7 +437,7 @@ namespace modules
                     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::getBoostGod()/4, 2, 11, 27, col1, FONT_ZOOM_NONE);
                     draw::print2(actor::hero::getBoostRun()/2, 2, 14, 27, col2, FONT_ZOOM_NONE);
 
                     draw::stencil::enable();