merge

.gitignore

@@ -1,5 +1,6 @@
 *.exe
 *.dll
 .vscode/*
+*.dSYM/*
 thepool
 thepool_debug

Makefile

@@ -14,7 +14,7 @@ macos:
 	clang++ $(source) -Wall -Os -std=c++11 -ffunction-sections -fdata-sections -lSDL2 -lSDL2_mixer -o "$(executable)"
 
 macos_debug:
-	clang++ $(source) -D DEBUG -g -Wall -Os -std=c++11 -ffunction-sections -fdata-sections -lSDL2 -lSDL2_mixer -o "$(executable)_debug"
+	clang++ $(source) -D DEBUG -g -Wall -std=c++11 -lSDL2 -lSDL2_mixer -o "$(executable)_debug"
 
 macos_bundle:
 	clang++ $(source) -D MACOS_BUNDLE -Wall -Os -std=c++11 -framework SDL2 -framework SDL2_mixer -F /Library/Frameworks -ffunction-sections -fdata-sections -o mini_bundle -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12

data/rooms/05.txt

@@ -8,6 +8,39 @@ door-texture: 0
 under-door-texture: 0
 exit-xp: 4
 
+actor{
+    name: KALLAX-A
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: 0 31
+    pos: 8 8 0
+    size: 4 8 8
+    movement: CW
+}
+
+actor{
+    name: KALLAX-A01
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: 0 31
+    pos: 8 8 8
+    size: 4 8 8
+    movement: CW
+}
+
+actor{
+    name: P-PUMP
+    bmp: objectes.gif
+    bmp-rect: 70 64 22 32
+    bmp-offset: -5 41
+    pos: 8 10 16
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: SPECIAL 
+    movement: CW
+}
+
 actor{
     name: FINESTRA
     bmp: altres.gif
@@ -29,12 +62,15 @@ actor{
 }
 
 actor{
-    name: KALLAX-A
+    name: S-GLOVES
-    bmp: altres.gif
+    bmp: objectes.gif
-    bmp-rect: 0 48 24 27
+    bmp-rect: 165 45 21 22
-    bmp-offset: 0 31
+    bmp-offset: -2 26
-    pos: 8 8 0
+    pos: 8 22 0
-    size: 4 8 8
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: SPECIAL 
     movement: CW
 }
 
@@ -60,6 +96,29 @@ actor{
     movement: CCW
 }
 
+actor{
+    name: KALLAX-A03
+    bmp: altres.gif
+    bmp-rect: 0 48 24 27
+    bmp-offset: 0 31
+    pos: 8 36 8
+    size: 4 8 8
+    movement: CW
+}
+
+actor{
+    name: ROOMBA
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 16 48 0
+    size: 8 8 2
+    orient: XP 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: CCW
+}
+
 actor{
     name: NEVERA104
     bmp: caixes.gif
@@ -93,52 +152,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: KALLAX-A01
-    bmp: altres.gif
-    bmp-rect: 0 48 24 27
-    bmp-offset: 0 31
-    pos: 8 8 8
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: P-PUMP
-    bmp: objectes.gif
-    bmp-rect: 70 64 22 32
-    bmp-offset: -5 41
-    pos: 8 10 16
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: SPECIAL 
-    movement: CW
-}
-
-actor{
-    name: KALLAX-A03
-    bmp: altres.gif
-    bmp-rect: 0 48 24 27
-    bmp-offset: 0 31
-    pos: 8 36 8
-    size: 4 8 8
-    movement: CW
-}
-
-actor{
-    name: ROOMBA
-    bmp: caixes.gif
-    bmp-rect: 160 0 32 32
-    bmp-offset: 0 34
-    pos: 16 48 0
-    size: 8 8 2
-    orient: XP 
-    flags: REACTIVE MOVING DEADLY 
-    react-mask: XP XN YP YN ZP ZN 
-    movement: CCW
-}
-
 actor{
     name: NEVERA107
     bmp: caixes.gif
@@ -164,7 +177,7 @@ actor{
 }
 
 actor{
-    name: GAT-NEGRE
+    name: GAT-BATMAN
     bmp: gat.gif
     bmp-rect: 0 0 24 28
     bmp-offset: -4 32
@@ -178,7 +191,7 @@ actor{
 }
 
 actor{
-    name: GAT-NEGRE01
+    name: GAT-ROBIN
     bmp: gat2.gif
     bmp-rect: 0 0 24 28
     bmp-offset: -4 32

data/rooms/07.txt

@@ -31,12 +31,37 @@ actor{
 }
 
 actor{
-    name: BOX02
+    name: MESITA
     bmp: caixes.gif
-    bmp-rect: 96 128 32 32
+    bmp-rect: 0 64 32 32
     bmp-offset: 0 32
-    pos: 8 8 16
+    pos: 28 28 0
     size: 8 8 4
+    flags: PUSHABLE 
+    movement: CW
+}
+
+actor{
+    name: GAT-BATMAN
+    bmp: gat.gif
+    bmp-rect: 0 0 24 28
+    bmp-offset: -4 32
+    pos: 40 16 0
+    size: 8 8 8
+    orient: XP 
+    anim-wait: 2
+    flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: HUNT
+}
+
+actor{
+    name: BOX03
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 48 8 0
+    size: 8 8 8
     movement: CW
 }
 
@@ -51,31 +76,11 @@ actor{
 }
 
 actor{
-    name: BOX08
+    name: BOX04
     bmp: caixes.gif
     bmp-rect: 64 64 32 32
     bmp-offset: 0 32
-    pos: 8 48 8
+    pos: 48 48 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX10
-    bmp: caixes.gif
-    bmp-rect: 96 128 32 32
-    bmp-offset: 0 32
-    pos: 8 48 16
-    size: 8 8 4
-    movement: CW
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 48 8 0
     size: 8 8 8
     movement: CW
 }
@@ -91,46 +96,11 @@ actor{
 }
 
 actor{
-    name: BOX09
+    name: BOX08
-    bmp: caixes.gif
-    bmp-rect: 96 128 32 32
-    bmp-offset: 0 32
-    pos: 48 8 16
-    size: 8 8 4
-    movement: CW
-}
-
-actor{
-    name: GAT-NEGRE
-    bmp: gat.gif
-    bmp-rect: 0 0 24 28
-    bmp-offset: -4 32
-    pos: 40 16 0
-    size: 8 8 8
-    orient: XP 
-    anim-wait: 2
-    flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY 
-    react-mask: XP XN YP YN ZP ZN 
-    movement: HUNT
-}
-
-actor{
-    name: MESITA
-    bmp: caixes.gif
-    bmp-rect: 0 64 32 32
-    bmp-offset: 0 32
-    pos: 28 28 0
-    size: 8 8 4
-    flags: PUSHABLE 
-    movement: CW
-}
-
-actor{
-    name: BOX04
     bmp: caixes.gif
     bmp-rect: 64 64 32 32
     bmp-offset: 0 32
-    pos: 48 48 0
+    pos: 8 48 8
     size: 8 8 8
     movement: CW
 }
@@ -144,3 +114,33 @@ actor{
     size: 8 8 8
     movement: CW
 }
+
+actor{
+    name: BOX02
+    bmp: caixes.gif
+    bmp-rect: 96 128 32 32
+    bmp-offset: 0 32
+    pos: 8 8 16
+    size: 8 8 4
+    movement: CW
+}
+
+actor{
+    name: BOX09
+    bmp: caixes.gif
+    bmp-rect: 96 128 32 32
+    bmp-offset: 0 32
+    pos: 48 8 16
+    size: 8 8 4
+    movement: CW
+}
+
+actor{
+    name: BOX10
+    bmp: caixes.gif
+    bmp-rect: 96 128 32 32
+    bmp-offset: 0 32
+    pos: 8 48 16
+    size: 8 8 4
+    movement: CW
+}

data/rooms/08.txt

@@ -3,7 +3,7 @@ height: 3
 door-height-yp: 0
 door-height-yn: 5
 color: CYAN
-floor-texture: 6
+floor-texture: 1
 wall-texture: 0
 door-texture: 0
 under-door-texture: 0