Pasaeta de include-what-you-use

Arreglades les herencies de les classes Sprite

.gitignore

@@ -14,3 +14,5 @@ thumbs.db
 *config.bin
 *score.bin
 coffee_crisis*
+debug.txt
+cppcheck-result*

Makefile

@@ -24,18 +24,30 @@ INCLUDES:= -I$(DIR_SOURCES)
 # Variables según el sistema operativo
 ifeq ($(OS),Windows_NT)
     FixPath = $(subst /,\,$1)
-	SOURCES := source/*.cpp source/common/*.cpp
-	CXXFLAGS:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows
-	LDFLAGS := -lmingw32 -lws2_32 -lSDL2main -lSDL2
+	SOURCES := source/*.cpp
+	CXXFLAGS:= -std=c++20 -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows
+	CXXFLAGS_DEBUG:= -std=c++20 -Wall -g
+	LDFLAGS := -lmingw32 -lws2_32 -lSDL2main -lSDL2 -lopengl32
 	RM = del /Q
 	MKD:= mkdir
 else
     FixPath = $1
 	SOURCES := $(shell find $(DIR_SOURCES) -name '*.cpp')
-	CXXFLAGS:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections -framework OpenGL -Wno-deprecated
+	SOURCES := source/*.cpp
+	CXXFLAGS:= -std=c++20 -Wall -Os -ffunction-sections -fdata-sections
+	CXXFLAGS_DEBUG:= -std=c++20 -Wall -g
 	LDFLAGS := -lSDL2
 	RM = rm -f
-	MKD:= mkdir -p 
+	MKD:= mkdir -p
+	UNAME_S := $(shell uname -s)
+    ifeq ($(UNAME_S),Linux)
+        LDFLAGS += -lGL
+    endif
+    ifeq ($(UNAME_S),Darwin)
+		CXXFLAGS += -Wno-deprecated
+		CXXFLAGS_DEBUG += -Wno-deprecated
+        LDFLAGS += -framework OpenGL
+    endif
 endif
 
 OBJECTS     := $(subst $(DIR_SOURCES), $(DIR_BUILD), $(SOURCES))
@@ -109,23 +121,25 @@ print-variables:
 
 	@echo RM: $(RM)
 
-.PHONY: peiv
+raspi:
+	$(CXX) $(SOURCES) -D ARCADE -D VERBOSE $(CXXFLAGS) $(LDFLAGS) -o $(TARGET_FILE)
+	strip -s -R .comment -R .gnu.version $(TARGET_FILE) --strip-unneeded
 
-peiv:
-	if not exist peiv mkdir $(subst /,\,peiv)
-	if exist peiv rmdir /Q /S peiv
+raspi_debug:
+	$(CXX) $(SOURCES) -D ARCADE -D VERBOSE -D DEBUG $(CXXFLAGS_DEBUG) $(LDFLAGS) -o "$(TARGET_FILE)_debug"
 
 windows:
 	@echo off
 	$(CXX) $(SOURCES) $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE).exe"
 	strip -s -R .comment -R .gnu.version "$(TARGET_FILE).exe" --strip-unneeded
 
+windows_rec:
+	@echo off
+	$(CXX) $(SOURCES) -D RECORDING $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)_rec.exe"
 
 windows_debug:
 	@echo off
-	$(CXX) $(SOURCES) -D DEBUG $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)_debug.exe"
-	strip -s -R .comment -R .gnu.version "$(TARGET_FILE)_debug.exe" --strip-unneeded
-
+	$(CXX) $(SOURCES) -D DEBUG -D VERBOSE $(CXXFLAGS_DEBUG) $(LDFLAGS) -o "$(TARGET_FILE)_debug.exe"
 
 windows_release:
 	@echo off
@@ -153,14 +167,11 @@ windows_release:
 # Elimina la carpeta temporal 'RELEASE_FOLDER'
 	powershell if (Test-Path "$(RELEASE_FOLDER)") {Remove-Item "$(RELEASE_FOLDER)" -Recurse -Force}
 
-
 macos:
 	$(CXX) $(SOURCES) $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)"
 
-
 macos_debug:
-	$(CXX) $(SOURCES) -D DEBUG $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)_debug"
-
+	$(CXX) $(SOURCES) -D DEBUG -D VERBOSE $(CXXFLAGS_DEBUG) $(LDFLAGS) -o "$(TARGET_FILE)_debug"
 
 macos_release:
 # Elimina datos de compilaciones anteriores
@@ -208,16 +219,12 @@ macos_release:
 	$(RM) Frameworks
 	$(RM) "$(RELEASE_FOLDER)"
 
-
 linux:
 	$(CXX) $(SOURCES) $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)"
 	strip -s -R .comment -R .gnu.version "$(TARGET_FILE)" --strip-unneeded
 
-
 linux_debug:
-	$(CXX) $(SOURCES) -D DEBUG $(CXXFLAGS) $(LDFLAGS) -o "$(TARGET_FILE)_debug"
-	strip -s -R .comment -R .gnu.version "$(TARGET_FILE)_debug" --strip-unneeded
-
+	$(CXX) $(SOURCES) -D DEBUG -D VERBOSE $(CXXFLAGS_DEBUG) $(LDFLAGS) -o "$(TARGET_FILE)_debug"
 
 linux_release:
 # Elimina carpetas previas
@@ -240,4 +247,18 @@ linux_release:
 	cd "$(RELEASE_FOLDER)" && tar -czvf "../$(LINUX_RELEASE)" *
 
 # Elimina la carpeta temporal
-	$(RM) "$(RELEASE_FOLDER)"
+	$(RM) "$(RELEASE_FOLDER)"
+
+anbernic:
+# Elimina carpetas previas
+	$(RM) "$(RELEASE_FOLDER)"_anbernic
+
+# Crea la carpeta temporal para realizar el lanzamiento
+	mkdir -p "$(RELEASE_FOLDER)"_anbernic
+
+# Copia ficheros
+	cp -R data "$(RELEASE_FOLDER)"_anbernic
+
+# Complia
+	$(CXX) $(SOURCES) -D ANBERNIC -D NO_SHADERS -D ARCADE -D VERBOSE $(CXXFLAGS) $(LDFLAGS) -o $(RELEASE_FOLDER)_anbernic/$(TARGET_NAME)
+	$(CXX) $(SOURCES) -D ANBERNIC -D ARCADE -D VERBOSE $(CXXFLAGS) $(LDFLAGS) -o $(RELEASE_FOLDER)_anbernic/$(TARGET_NAME).shaders

data/config/param.txt

@@ -1,20 +0,0 @@
-#GAME
-gameWidth 320
-gameHeight 240
-
-#FADE
-numSquaresWidth 160
-numSquaresHeight 120
-fadeRandomSquaresDelay 1
-fadeRandomSquaresMult 500
-fadePostDuration 50
-
-#SCOREBOARD
-scoreboard.x 10
-scoreboard.y 208
-scoreboard.w 300
-scoreboard.h 32
-
-#TITLE
-pressStart 160
-titleCounter 800

data/config/param_320x240.txt

@@ -0,0 +1,52 @@
+## GAME
+game.item_size           20
+game.width              320
+game.height             240
+game.play_area.rect.x     0
+game.play_area.rect.y     0
+game.play_area.rect.w   320
+game.play_area.rect.h   200
+
+## FADE
+fade.num_squares_width    160
+fade.num_squares_height   120
+fade.random_squares_delay   1
+fade.random_squares_mult  500
+fade.post_duration         80
+fade.venetian_size         16
+
+## SCOREBOARD
+scoreboard.x   0
+scoreboard.y 200
+scoreboard.w 320
+scoreboard.h  40
+
+## TITLE
+title.press_start_position     170
+title.title_duration           800
+title.arcade_edition_position  123
+title.title_c_c_position        80
+
+## BACKGROUND
+background.attenuate_color.r 255
+background.attenuate_color.g 255
+background.attenuate_color.b 255
+background.attenuate_alpha     0
+
+## BALLOONS
+balloon_1.vel  2.75f
+balloon_1.grav 0.09f
+balloon_2.vel  3.70f
+balloon_2.grav 0.10f
+balloon_3.vel  4.70f
+balloon_3.grav 0.10f
+balloon_4.vel  5.45f
+balloon_4.grav 0.10f
+
+## NOTIFICATION
+notification.pos_v     TOP
+notification.pos_h    LEFT
+notification.sound   false
+notification.color.r    48
+notification.color.g    48
+notification.color.b    48

data/config/param_320x256.txt

@@ -0,0 +1,52 @@
+## GAME
+game.item_size          20
+game.width             320
+game.height            256
+game.play_area.rect.x    0
+game.play_area.rect.y    0
+game.play_area.rect.w  320
+game.play_area.rect.h  216
+
+## FADE
+fade.num_squares_width    160
+fade.num_squares_height   128
+fade.random_squares_delay   1
+fade.random_squares_mult  500
+fade.post_duration         80
+fade.venetian_size         16
+
+## SCOREBOARD
+scoreboard.x   0
+scoreboard.y 216
+scoreboard.w 320
+scoreboard.h  40
+
+## TITLE
+title.press_start_position     180
+title.title_duration           800
+title.arcade_edition_position  123
+title.title_c_c_position        80
+
+## BACKGROUND
+background.attenuate_color.r 255
+background.attenuate_color.g 255
+background.attenuate_color.b 255
+background.attenuate_alpha     0
+
+## BALLOONS
+balloon_1.vel  2.75f
+balloon_1.grav 0.09f
+balloon_2.vel  3.70f
+balloon_2.grav 0.10f
+balloon_3.vel  4.70f
+balloon_3.grav 0.10f
+balloon_4.vel  5.45f
+balloon_4.grav 0.10f
+
+## NOTIFICATION
+notification.pos_v     TOP
+notification.pos_h    LEFT
+notification.sound   false
+notification.color.r    48
+notification.color.g    48
+notification.color.b    48

data/gfx/balloon/balloon1.ani

@@ -1,5 +1,5 @@
-frameWidth=8
-frameHeight=8
+frame_width=10
+frame_height=10
 
 [animation]
 name=orange
@@ -12,26 +12,19 @@ frames=0,1,2,3,4,5,6,7,8,9
 name=blue
 speed=20
 loop=0
-frames=12,13,14,15,16,17,18,19,20,21
+frames=10,11,12,13,14,15,16,17,18,19
 [/animation]
 
 [animation]
 name=green
 speed=10
 loop=0
-frames=24,25,26,27,28,29,30,31,32,33
+frames=20,21,22,23,24,25,26,27,28,29
 [/animation]
 
 [animation]
 name=red
 speed=20
 loop=0
-frames=36,37,38,39,40,41,42,43,44,45
-[/animation]
-
-[animation]
-name=pop
-speed=5
-loop=-1
-frames=48,49,50,51,52,53,54,55,56,57,58,59
+frames=30,31,32,33,34,35,36,37,38,39
 [/animation]

data/gfx/balloon/balloon2.ani

@@ -1,5 +1,5 @@
-frameWidth=13
-frameHeight=13
+frame_width=16
+frame_height=16
 
 [animation]
 name=orange
@@ -12,26 +12,19 @@ frames=0,1,2,3,4,5,6,7,8,9
 name=blue
 speed=20
 loop=0
-frames=12,13,14,15,16,17,18,19,20,21
+frames=10,11,12,13,14,15,16,17,18,19
 [/animation]
 
 [animation]
 name=green
 speed=10
 loop=0
-frames=24,25,26,27,28,29,30,31,32,33
+frames=20,21,22,23,24,25,26,27,28,29
 [/animation]
 
 [animation]
 name=red
 speed=20
 loop=0
-frames=36,37,38,39,40,41,42,43,44,45
-[/animation]
-
-[animation]
-name=pop
-speed=5
-loop=-1
-frames=48,49,50,51,52,53,54,55,56,57,58,59
+frames=30,31,32,33,34,35,36,37,38,39
 [/animation]

data/gfx/balloon/balloon3.ani

@@ -1,5 +1,5 @@
-frameWidth=21
-frameHeight=21
+frame_width=26
+frame_height=26
 
 [animation]
 name=orange
@@ -12,26 +12,19 @@ frames=0,1,2,3,4,5,6,7,8,9
 name=blue
 speed=20
 loop=0
-frames=12,13,14,15,16,17,18,19,20,21
+frames=10,11,12,13,14,15,16,17,18,19
 [/animation]
 
 [animation]
 name=green
 speed=10
 loop=0
-frames=24,25,26,27,28,29,30,31,32,33
+frames=20,21,22,23,24,25,26,27,28,29
 [/animation]
 
 [animation]
 name=red
 speed=20
 loop=0
-frames=36,37,38,39,40,41,42,43,44,45
-[/animation]
-
-[animation]
-name=pop
-speed=5
-loop=-1
-frames=48,49,50,51,52,53,54,55,56,57,58,59
+frames=30,31,32,33,34,35,36,37,38,39
 [/animation]

data/gfx/balloon/balloon4.ani

@@ -0,0 +1,30 @@
+frame_width=48
+frame_height=48
+
+[animation]
+name=orange
+speed=10
+loop=0
+frames=0,1,2,3,4,5,6,7,8,9
+[/animation]
+
+[animation]
+name=blue
+speed=20
+loop=0
+frames=10,11,12,13,14,15,16,17,18,19
+[/animation]
+
+[animation]
+name=green
+speed=10
+loop=0
+frames=20,21,22,23,24,25,26,27,28,29
+[/animation]
+
+[animation]
+name=red
+speed=20
+loop=0
+frames=30,31,32,33,34,35,36,37,38,39
+[/animation]

data/gfx/balloon/explosion1.ani

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

data/gfx/balloon/explosion2.ani

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

data/gfx/balloon/explosion3.ani

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

data/gfx/balloon/explosion4.ani

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

data/gfx/balloon/powerball.ani

@@ -0,0 +1,9 @@
+frame_width=46
+frame_height=46
+
+[animation]
+name=powerball
+speed=10
+loop=-1
+frames=0
+[/animation]

data/gfx/balloon4.ani

@@ -1,44 +0,0 @@
-frameWidth=37
-frameHeight=37
-
-[animation]
-name=orange
-speed=10
-loop=0
-frames=0,1,2,3,4,5,6,7,8,9
-[/animation]
-
-[animation]
-name=blue
-speed=20
-loop=0
-frames=12,13,14,15,16,17,18,19,20,21
-[/animation]
-
-[animation]
-name=green
-speed=10
-loop=0
-frames=24,25,26,27,28,29,30,31,32,33
-[/animation]
-
-[animation]
-name=red
-speed=20
-loop=0
-frames=36,37,38,39,40,41,42,43,44,45
-[/animation]
-
-[animation]
-name=powerball
-speed=10
-loop=0
-frames=10
-[/animation]
-
-[animation]
-name=pop
-speed=5
-loop=-1
-frames=48,49,50,51,52,53,54,55,56,57,58,59
-[/animation]

data/gfx/item/item_clock.ani

@@ -1,5 +1,5 @@
-frameWidth=16
-frameHeight=16
+frame_width=20
+frame_height=20
 
 [animation]
 name=default

data/gfx/item/item_coffee.ani

@@ -1,5 +1,5 @@
-frameWidth=16
-frameHeight=16
+frame_width=20
+frame_height=20
 
 [animation]
 name=default

data/gfx/item/item_coffee_machine.ani

@@ -1,5 +1,5 @@
-frameWidth=23
-frameHeight=29
+frame_width=28
+frame_height=37
 
 [animation]
 name=default

data/gfx/item/item_points1_disk.ani

@@ -1,5 +1,5 @@
-frameWidth=16
-frameHeight=16
+frame_width=20
+frame_height=20
 
 [animation]
 name=default

data/gfx/item/item_points2_gavina.ani

@@ -1,5 +1,5 @@
-frameWidth=16
-frameHeight=16
+frame_width=20
+frame_height=20
 
 [animation]
 name=default

data/gfx/item/item_points3_pacmar.ani

@@ -1,5 +1,5 @@
-frameWidth=16
-frameHeight=16
+frame_width=20
+frame_height=20
 
 [animation]
 name=default

data/gfx/player/player.ani

@@ -0,0 +1,51 @@
+frame_width=30
+frame_height=30
+
+[animation]
+name=walk
+speed=5
+loop=0
+frames=0,1,2,3
+[/animation]
+
+[animation]
+name=stand
+speed=10
+loop=0
+frames=4,5,6,7
+[/animation]
+
+[animation]
+name=walk-sideshoot
+speed=5
+loop=0
+frames=8,9,10,11
+[/animation]
+
+[animation]
+name=stand-sideshoot
+speed=5
+loop=0
+frames=12,13,14,15
+[/animation]
+
+[animation]
+name=walk-centershoot
+speed=5
+loop=0
+frames=16,17,18,19
+[/animation]
+
+[animation]
+name=stand-centershoot
+speed=5
+loop=0
+frames=20,21,22,23
+[/animation]
+
+[animation]
+name=death
+speed=15
+loop=0
+frames=24,25,26,27
+[/animation]

data/gfx/player/player_power.ani

@@ -1,5 +1,5 @@
-frameWidth=24
-frameHeight=24
+frame_width=39
+frame_height=44
 
 [animation]
 name=default

data/gfx/player_body.ani

@@ -1,176 +0,0 @@
-frameWidth=24
-frameHeight=24
-
-[animation]
-name=walk
-speed=5
-loop=0
-frames=0,1,2,3
-[/animation]
-
-[animation]
-name=stand
-speed=10
-loop=0
-frames=4,5,6,7
-[/animation]
-
-[animation]
-name=walk_1C
-speed=5
-loop=0
-frames=8,9,10,11
-[/animation]
-
-[animation]
-name=stand_1C
-speed=10
-loop=0
-frames=12,13,14,15
-[/animation]
-
-[animation]
-name=walk_2C
-speed=5
-loop=0
-frames=16,17,18,19
-[/animation]
-
-[animation]
-name=stand_2C
-speed=10
-loop=0
-frames=20,21,22,23
-[/animation]
-
-
-
-[animation]
-name=sideshoot
-speed=5
-loop=0
-frames=24,25,26,27
-[/animation]
-
-[animation]
-name=centershoot
-speed=5
-loop=0
-frames=28,29,30,31
-[/animation]
-
-[animation]
-name=sideshoot_1C
-speed=5
-loop=0
-frames=32,33,34,35
-[/animation]
-
-[animation]
-name=centershoot_1C
-speed=5
-loop=0
-frames=36,37,38,39
-[/animation]
-
-[animation]
-name=sideshoot_2C
-speed=5
-loop=0
-frames=40,41,42,43
-[/animation]
-
-[animation]
-name=centershoot_2C
-speed=5
-loop=0
-frames=44,45,46,47
-[/animation]
-
-
-
-[animation]
-name=walk_pwr
-speed=3
-loop=0
-frames=0,1,2,3
-[/animation]
-
-[animation]
-name=stand_pwr
-speed=5
-loop=0
-frames=4,5,6,7
-[/animation]
-
-[animation]
-name=walk_1C_pwr
-speed=3
-loop=0
-frames=8,9,10,11
-[/animation]
-
-[animation]
-name=stand_1C_pwr
-speed=5
-loop=0
-frames=12,13,14,15
-[/animation]
-
-[animation]
-name=walk_2C_pwr
-speed=3
-loop=0
-frames=16,17,18,19
-[/animation]
-
-[animation]
-name=stand_2C_pwr
-speed=5
-loop=0
-frames=20,21,22,23
-[/animation]
-
-
-
-[animation]
-name=sideshoot_pwr
-speed=2
-loop=0
-frames=24,25,26,27
-[/animation]
-
-[animation]
-name=centershoot_pwr
-speed=2
-loop=0
-frames=28,29,30,31
-[/animation]
-
-[animation]
-name=sideshoot_1C_pwr
-speed=2
-loop=0
-frames=32,33,34,35
-[/animation]
-
-[animation]
-name=centershoot_1C_pwr
-speed=2
-loop=0
-frames=36,37,38,39
-[/animation]
-
-[animation]
-name=sideshoot_2C_pwr
-speed=2
-loop=0
-frames=40,41,42,43
-[/animation]
-
-[animation]
-name=centershoot_2C_pwr
-speed=2
-loop=0
-frames=44,45,46,47
-[/animation]