Cambiada la carpeta common a jail_engine

2023-05-06 18:06:29 +02:00
parent adab0b420c
commit 284f7d5bad
58 changed files with 132 additions and 132 deletions
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 executable = jaildoctors_dilemma
-source = source/*.cpp source/common/*.cpp
+source = source/*.cpp source/jail_engine/*.cpp
 appName = JailDoctor's Dilemma
 releaseFolder = jdd_release
 version = v1.08
--- a/source/cheevos.h
+++ b/source/cheevos.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/screen.h"
-#include "common/utils.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/utils.h"
 #include <string>
 #include <vector>

--- a/source/const.h
+++ b/source/const.h
@@ -2,7 +2,7 @@

 #include <SDL2/SDL.h>
 #include <string>
-#include "common/utils.h"
+#include "jail_engine/utils.h"

 #ifndef CONST_H
 #define CONST_H
--- a/source/credits.h
+++ b/source/credits.h
@@ -1,16 +1,16 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>

--- a/source/demo.h
+++ b/source/demo.h
@@ -1,16 +1,16 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/debug.h"
-#include "common/input.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/input.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "item_tracker.h"
 #include "room_tracker.h"
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -1,5 +1,5 @@
-#include "common/jscore.h"
-#include "common/utils.h"
+#include "jail_engine/jscore.h"
+#include "jail_engine/utils.h"
 #include "director.h"
 #include <errno.h>
 #include <iostream>
--- a/source/director.h
+++ b/source/director.h
@@ -1,14 +1,14 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/debug.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/movingsprite.h"
-#include "common/resource.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/movingsprite.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "credits.h"
 #include "demo.h"
--- a/source/ending.h
+++ b/source/ending.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <string>
 #include <vector>
--- a/source/ending2.h
+++ b/source/ending2.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>
 #include <string>
--- a/source/enemy.h
+++ b/source/enemy.h
@@ -1,9 +1,9 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/utils.h"
 #include <string>

 #ifndef ENEMY_H
--- a/source/enter_id.cpp
+++ b/source/enter_id.cpp
@@ -1,5 +1,5 @@
-#include "common/jail_audio.h"
-#include "common/jscore.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/jscore.h"
 #include "const.h"
 #include "enter_id.h"
 #include <iostream>
--- a/source/enter_id.h
+++ b/source/enter_id.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/screen.h"
-#include "common/utils.h"
-#include "common/text.h"
-#include "common/texture.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/utils.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
 #include <string>
 #include <vector>

--- a/source/game.h
+++ b/source/game.h
@@ -2,16 +2,16 @@

 #include <SDL2/SDL.h>
 #include "cheevos.h"
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/debug.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "item_tracker.h"
 #include "player.h"
--- a/source/game_over.h
+++ b/source/game_over.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>

--- a/source/intro.h
+++ b/source/intro.h
@@ -1,18 +1,18 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>

 #include <string>
-#include "common/text.h"
+#include "jail_engine/text.h"

 #ifndef INTRO_H
 #define INTRO_H
--- a/source/item.h
+++ b/source/item.h
@@ -1,9 +1,9 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/utils.h"
 #include <string>

 #ifndef ITEM_H
--- a/source/item_tracker.h
+++ b/source/item_tracker.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "jail_engine/utils.h"
 #include <string>
 #include <vector>

--- a/source/jail_engine/animatedsprite.cpp
+++ b/source/jail_engine/animatedsprite.cpp
--- a/source/jail_engine/animatedsprite.h
+++ b/source/jail_engine/animatedsprite.h
--- a/source/jail_engine/asset.cpp
+++ b/source/jail_engine/asset.cpp
--- a/source/jail_engine/asset.h
+++ b/source/jail_engine/asset.h
--- a/source/jail_engine/debug.cpp
+++ b/source/jail_engine/debug.cpp
--- a/source/jail_engine/debug.h
+++ b/source/jail_engine/debug.h
--- a/source/jail_engine/input.cpp
+++ b/source/jail_engine/input.cpp
--- a/source/jail_engine/input.h
+++ b/source/jail_engine/input.h
--- a/source/jail_engine/jail_audio.cpp
+++ b/source/jail_engine/jail_audio.cpp
--- a/source/jail_engine/jail_audio.h
+++ b/source/jail_engine/jail_audio.h
--- a/source/jail_engine/jail_audio_sdlmixer.cpp
+++ b/source/jail_engine/jail_audio_sdlmixer.cpp
--- a/source/jail_engine/jscore.cpp
+++ b/source/jail_engine/jscore.cpp
--- a/source/jail_engine/jscore.h
+++ b/source/jail_engine/jscore.h
--- a/source/jail_engine/menu.cpp
+++ b/source/jail_engine/menu.cpp
--- a/source/jail_engine/menu.h
+++ b/source/jail_engine/menu.h
--- a/source/jail_engine/movingsprite.cpp
+++ b/source/jail_engine/movingsprite.cpp
--- a/source/jail_engine/movingsprite.h
+++ b/source/jail_engine/movingsprite.h
--- a/source/jail_engine/notify.cpp
+++ b/source/jail_engine/notify.cpp
--- a/source/jail_engine/notify.h
+++ b/source/jail_engine/notify.h
--- a/source/jail_engine/resource.cpp
+++ b/source/jail_engine/resource.cpp
--- a/source/jail_engine/resource.h
+++ b/source/jail_engine/resource.h
--- a/source/jail_engine/screen.cpp
+++ b/source/jail_engine/screen.cpp
--- a/source/jail_engine/screen.h
+++ b/source/jail_engine/screen.h
--- a/source/jail_engine/sprite.cpp
+++ b/source/jail_engine/sprite.cpp
--- a/source/jail_engine/sprite.h
+++ b/source/jail_engine/sprite.h
--- a/source/jail_engine/stb_image.h
+++ b/source/jail_engine/stb_image.h
--- a/source/jail_engine/stb_vorbis.c
+++ b/source/jail_engine/stb_vorbis.c
--- a/source/jail_engine/text.cpp
+++ b/source/jail_engine/text.cpp
--- a/source/jail_engine/text.h
+++ b/source/jail_engine/text.h
--- a/source/jail_engine/texture.cpp
+++ b/source/jail_engine/texture.cpp
--- a/source/jail_engine/texture.h
+++ b/source/jail_engine/texture.h
--- a/source/jail_engine/utils.cpp
+++ b/source/jail_engine/utils.cpp
--- a/source/jail_engine/utils.h
+++ b/source/jail_engine/utils.h
--- a/source/logo.h
+++ b/source/logo.h
@@ -1,13 +1,13 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>

--- a/source/player.h
+++ b/source/player.h
@@ -1,12 +1,12 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/debug.h"
-#include "common/input.h"
-#include "common/resource.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/input.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "room.h"
 #include <string>
--- a/source/room.h
+++ b/source/room.h
@@ -1,12 +1,12 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/debug.h"
-#include "common/jail_audio.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "enemy.h"
 #include "item_tracker.h"
--- a/source/room_tracker.h
+++ b/source/room_tracker.h
@@ -1,7 +1,7 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "jail_engine/utils.h"
 #include <string>
 #include <vector>

--- a/source/scoreboard.h
+++ b/source/scoreboard.h
@@ -1,11 +1,11 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/resource.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <string>

--- a/source/stats.cpp
+++ b/source/stats.cpp
@@ -1,4 +1,4 @@
-#include "common/jscore.h"
+#include "jail_engine/jscore.h"
 #include "stats.h"
 #include <algorithm>
 #include <fstream>
--- a/source/stats.h
+++ b/source/stats.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "jail_engine/utils.h"
 #include <string>
 #include <vector>

--- a/source/title.h
+++ b/source/title.h
@@ -1,14 +1,14 @@
 #pragma once

 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>