Actualizado todo.txt

.gitignore

@@ -1,7 +1,6 @@
 .vscode
 bin
-data/config.bin
-data/score.bin
+*config.txt
 dll
 docs
 icon

Makefile

@@ -1,9 +1,18 @@
 executable = jaildoctors_dilemma
+source = source/*.cpp source/common/*.cpp
 
+windows:
+	@echo off
+	if not exist bin\ (mkdir bin)
+	if not exist data\config (mkdir data\config)
+	g++ $(source) -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o bin/$(executable).exe
+	strip -s -R .comment -R .gnu.version bin/$(executable).exe --strip-unneeded
 macos:
 	mkdir -p bin
-	g++ -std=c++11 -Wall -O2 source/*.cpp -o bin/$(executable)_macos -lSDL2
+	mkdir -p data/config
+	g++ $(source) -std=c++11 -Wall -O2 -lSDL2 -ffunction-sections -fdata-sections -o bin/$(executable)_macos
 linux:
 	mkdir -p bin
-	g++ source/*.cpp -std=c++11 -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux
+	mkdir -p data/config
+	g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux
 	strip -s -R .comment -R .gnu.version bin/$(executable)_linux --strip-unneeded

data/enemies/01.enemy

@@ -1,10 +0,0 @@
-tileset=enemy01.png
-x=8
-y=8
-vx=0.1
-vy=0
-x1=8
-x2=200
-y1=8
-y2=8
-color=red

data/enemies/abad.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2
+[/animation]

data/enemies/amstrad_character_set.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=8
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+[/animation]

data/enemies/arounder_fly.ani

@@ -0,0 +1,9 @@
+frameWidth=7
+frameHeight=7
+
+[animation]
+name=default
+speed=10
+loop=0
+frames=0
+[/animation]

data/enemies/arounder_stop.ani

@@ -0,0 +1,9 @@
+frameWidth=7
+frameHeight=8
+
+[animation]
+name=default
+speed=10
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/arounder_walk.ani

@@ -0,0 +1,9 @@
+frameWidth=5
+frameHeight=8
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1
+[/animation]

data/enemies/arounders_door.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3,3,3,3,3,3,3,3,3,3,3,3,2,1,0,0,0
+[/animation]

data/enemies/arounders_machine.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/bat.ani

@@ -0,0 +1,9 @@
+frameWidth=9
+frameHeight=7
+
+[animation]
+name=default
+speed=3
+loop=0
+frames=0,1
+[/animation]

data/enemies/batman.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/bin.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=8
+
+[animation]
+name=default
+speed=10
+loop=0
+frames=0,1,2,3,4
+[/animation]

data/enemies/bird.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/breakout.ani

@@ -0,0 +1,9 @@
+frameWidth=24
+frameHeight=32
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5,6,7,6,5,4,3,2,1
+[/animation]

data/enemies/bry.ani

@@ -0,0 +1,9 @@
+frameWidth=10
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5,4,5
+[/animation]

data/enemies/chip.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/code.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/demon.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/dimallas.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/dimallas_v.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/diskette.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/heavy.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/jailbattle_alien.ani

@@ -0,0 +1,9 @@
+frameWidth=13
+frameHeight=15
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1
+[/animation]

data/enemies/jailbattle_human.ani

@@ -0,0 +1,9 @@
+frameWidth=11
+frameHeight=13
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1
+[/animation]

data/enemies/jailer.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/jailer2.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3,4,5,0,1,2,3,4,5,0,1,2,3,4,5,0,1,2,3,4,5,0,1,2,3,4,5,1,3,5,1,3,5,1,3,5
+[/animation]

data/enemies/jailer3.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/lamp.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1
+[/animation]

data/enemies/macaronni_ted.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=32
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/matatunos.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3,4,5
+[/animation]

data/enemies/mummy.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=12
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/paco.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/printer.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5
+[/animation]

data/enemies/qvoid.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3,4,5,6,7
+[/animation]

data/enemies/sam.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=5
+loop=0
+frames=0,1
+[/animation]

data/enemies/sigmasua.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/spider.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=8
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/tuno.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3,3,2,1,0
+[/animation]

data/enemies/tv.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/tv_panel.ani

@@ -0,0 +1,9 @@
+frameWidth=24
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/wave.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=8
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/wave_v.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=8
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5,4,3,2,1
+[/animation]

data/font/debug.txt

@@ -1,194 +1,194 @@
 # box width
-8
-# box height
-8
-# 32 espacio ( )
-2
-# 33 !
-2
-# 34 "
 5
+# box height
+5
+# 32 espacio ( )
+3
+# 33 !
+1
+# 34 "
+3
 # 35 #
-6
+3
 # 36 $
-6
+3
 # 37 %
-6
+3
 # 38 &
-6
+3
 # 39 '
-2
+1
 # 40 (
-3
+2
 # 41 )
-3
+2
 # 42 *
-4
+3
 # 43 +
 3
 # 44 ,
-2
+1
 # 45 -
 3
 # 46 .
-2
+1
 # 47 /
-4
+3
 # 48 0
-6
+3
 # 49 1
-6
+3
 # 50 2
-6
+3
 # 51 3
-6
+3
 # 52 4
-6
+3
 # 53 5
-6
+3
 # 54 6
-6
+3
 # 55 7
-6
+3
 # 56 8
-6
+3
 # 57 9
-6
+3
 # 58 :
-2
+1
 # 59 ;
-2
+1
 # 60 <
-4
+3
 # 61 =
 3
 # 62 >
-4
+3
 # 63 ?
-6
+3
 # 64 @
-8
+3
 # 65 A
-6
+3
 # 66 B
-6
+3
 # 67 C
-6
+3
 # 68 D
-6
+3
 # 69 E
-6
+3
 # 70 F
-6
+3
 # 71 G
-6
+3
 # 72 H
-6
+3
 # 73 I
-6
+3
 # 74 J
-6
+3
 # 75 K
-6
+3
 # 76 L
-6
+3
 # 77 M
-6
+3
 # 78 N
-6
+3
 # 79 O
-6
+3
 # 80 P
-6
+3
 # 81 Q
-6
+3
 # 82 R
-6
+3
 # 83 S
-6
+3
 # 84 T
-6
+3
 # 85 U
-6
+3
 # 86 V
-5
+3
 # 87 W
-6
+3
 # 88 X
-6
+3
 # 89 Y
-6
+3
 # 90 Z
-6
+3
 # 91 [
-3
+2
 # 92 \
-5
-# 93 ]
 3
+# 93 ]
+2
 # 94 ^
-4
+3
 # 95 _
-6
+3
 # 96 `
 2
 # 97 a
-5
+3
 # 98 b
-5
+3
 # 99 c
-5
+3
 # 100 d
-5
+3
 # 101 e
-5
+3
 # 102 f
-5
+3
 # 103 g
-5
+3
 # 104 h
-5
+3
 # 105 i
-4
+3
 # 106 j
-5
+3
 # 107 k
-5
+3
 # 108 l
-5
+3
 # 109 m
-6
+3
 # 110 n
-5
+3
 # 111 o
-5
+3
 # 112 p
-5
+3
 # 113 q
-5
+3
 # 114 r
-5
+3
 # 115 s
-5
+3
 # 116 t
-4
+3
 # 117 u
-5
+3
 # 118 v
-5
+3
 # 119 w
-6
+3
 # 120 x
-4
+3
 # 121 y
-4
+3
 # 122 z
-5
+3
 # 123 {
 3
 # 124 |
-2
+3
 # 125 }
 3
 # 126 ~
-3
+5

data/player/player.ani

@@ -0,0 +1,23 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=stand
+speed=8
+loop=0
+frames=0
+[/animation]
+
+[animation]
+name=walk
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]
+
+[animation]
+name=walk_menu
+speed=0
+loop=0
+frames=0,1,2,3
+[/animation]

data/player/player2.ani

@@ -0,0 +1,23 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=stand
+speed=8
+loop=0
+frames=0
+[/animation]
+
+[animation]
+name=walk
+speed=8
+loop=0
+frames=0,1,2,3,4,5,6,7
+[/animation]
+
+[animation]
+name=walk_menu
+speed=0
+loop=0
+frames=0,1,2,3,4,5,6,7
+[/animation]