From d9cff0190a3b35f579cfedec53f305db17bd3b7c Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 10 Feb 2024 18:43:54 +0100 Subject: [PATCH] moved headers to game engine specific import files --- src/engines.h | 89 ----------------------------------------- src/game_bd/game_bd.h | 1 + src/game_bd/import_bd.h | 25 ++++++++++++ src/game_bd/main_bd.h | 2 +- src/game_em/game_em.h | 1 + src/game_em/import_em.h | 42 +++++++++++++++++++ src/game_em/main_em.h | 2 +- src/game_mm/game_mm.h | 1 + src/game_mm/import_mm.h | 48 ++++++++++++++++++++++ src/game_mm/main_mm.h | 3 +- src/game_sp/game_sp.h | 1 + src/game_sp/import_sp.h | 32 +++++++++++++++ src/game_sp/main_sp.h | 3 +- src/main.h | 1 - 14 files changed, 155 insertions(+), 96 deletions(-) delete mode 100644 src/engines.h create mode 100644 src/game_bd/import_bd.h create mode 100644 src/game_em/import_em.h create mode 100644 src/game_mm/import_mm.h create mode 100644 src/game_sp/import_sp.h diff --git a/src/engines.h b/src/engines.h deleted file mode 100644 index 25c36d47..00000000 --- a/src/engines.h +++ /dev/null @@ -1,89 +0,0 @@ -// ============================================================================ -// Rocks'n'Diamonds - McDuffin Strikes Back! -// ---------------------------------------------------------------------------- -// (c) 1995-2014 by Artsoft Entertainment -// Holger Schemel -// info@artsoft.org -// https://www.artsoft.org/ -// ---------------------------------------------------------------------------- -// engines.h -// ============================================================================ - -#ifndef ENGINES_H -#define ENGINES_H - -#include "libgame/libgame.h" - -#include "game_bd/export_bd.h" -#include "game_em/export_em.h" -#include "game_sp/export_sp.h" -#include "game_mm/export_mm.h" - -#include "game.h" - - -// ============================================================================ -// functions and definitions exported from main program to game_bd -// ============================================================================ - - -// ============================================================================ -// functions and definitions exported from main program to game_em -// ============================================================================ - -void UpdateEngineValues(int, int, int, int); - -boolean swapTiles_EM(boolean); -boolean getTeamMode_EM(void); -boolean isActivePlayer_EM(int); - -int getScreenFieldSizeX(void); -int getScreenFieldSizeY(void); - -void PlayLevelSound_EM(int, int, int, int); -void InitGraphicInfo_EM(void); -boolean CheckSingleStepMode_EM(int, boolean, boolean, boolean); - -void SetGfxAnimation_EM(struct GraphicInfo_EM *, int, int, int, int); -void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *, int, int, int, int); -void getGraphicSourcePlayerExt_EM(struct GraphicInfo_EM *, int, int, int); - - -// ============================================================================ -// functions and definitions exported from main program to game_sp -// ============================================================================ - -void CheckSingleStepMode_SP(boolean, boolean); - -void getGraphicSource_SP(struct GraphicInfo_SP *, int, int); -int getGraphicInfo_Delay(int); -boolean isNextAnimationFrame_SP(int, int); - - -// ============================================================================ -// functions and definitions exported from main program to game_mm -// ============================================================================ - -void SetDrawtoField(int); -void BackToFront(void); - -int el2img_mm(int); -int el_act2img_mm(int, int); - -void CheckSingleStepMode_MM(boolean, boolean); -void ShowEnvelope(int); - -int getGraphicAnimationFrame(int, int); -int getGraphicAnimationFrameXY(int, int, int); - -void getGraphicSource(int, int, Bitmap **, int *, int *); -void getMiniGraphicSource(int, Bitmap **, int *, int *); -void getSizedGraphicSource(int, int, int, Bitmap **, int *, int *); -boolean getGraphicInfo_NewFrame(int, int, int); - -void AdvanceFrameCounter(void); -void AdvanceGfxFrame(void); - -int getAnimationFrame(int, int, int, int, int); - -#endif // ENGINES_H diff --git a/src/game_bd/game_bd.h b/src/game_bd/game_bd.h index 3243ac25..7528f075 100644 --- a/src/game_bd/game_bd.h +++ b/src/game_bd/game_bd.h @@ -14,6 +14,7 @@ #define GAME_BD_VERSION_1_0_0 +#include "import_bd.h" #include "export_bd.h" #endif // GAME_BD_H diff --git a/src/game_bd/import_bd.h b/src/game_bd/import_bd.h new file mode 100644 index 00000000..64b256c0 --- /dev/null +++ b/src/game_bd/import_bd.h @@ -0,0 +1,25 @@ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2024 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// https://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// import_bd.h +// ============================================================================ + +#ifndef IMPORT_BD_H +#define IMPORT_BD_H + +#include "../libgame/libgame.h" +#include "../game.h" + +#include "export_bd.h" + + +// ============================================================================ +// functions and definitions exported from main program to game_bd +// ============================================================================ + +#endif // IMPORT_BD_H diff --git a/src/game_bd/main_bd.h b/src/game_bd/main_bd.h index 65407b6a..2defce72 100644 --- a/src/game_bd/main_bd.h +++ b/src/game_bd/main_bd.h @@ -5,7 +5,7 @@ // external functions and definitions imported from main program to game_bd // ============================================================================ -#include "../engines.h" +#include "import_bd.h" // ============================================================================ diff --git a/src/game_em/game_em.h b/src/game_em/game_em.h index 90a7d4e6..6b25a1f0 100644 --- a/src/game_em/game_em.h +++ b/src/game_em/game_em.h @@ -14,6 +14,7 @@ #define GAME_EM_VERSION_1_0_0 +#include "import_em.h" #include "export_em.h" #endif /* GAME_EM_H */ diff --git a/src/game_em/import_em.h b/src/game_em/import_em.h new file mode 100644 index 00000000..21acc6bc --- /dev/null +++ b/src/game_em/import_em.h @@ -0,0 +1,42 @@ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2024 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// https://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// import_em.h +// ============================================================================ + +#ifndef IMPORT_EM_H +#define IMPORT_EM_H + +#include "../libgame/libgame.h" +#include "../game.h" + +#include "export_em.h" + + +// ============================================================================ +// functions and definitions exported from main program to game_em +// ============================================================================ + +void UpdateEngineValues(int, int, int, int); + +boolean swapTiles_EM(boolean); +boolean getTeamMode_EM(void); +boolean isActivePlayer_EM(int); + +int getScreenFieldSizeX(void); +int getScreenFieldSizeY(void); + +void PlayLevelSound_EM(int, int, int, int); +void InitGraphicInfo_EM(void); +boolean CheckSingleStepMode_EM(int, boolean, boolean, boolean); + +void SetGfxAnimation_EM(struct GraphicInfo_EM *, int, int, int, int); +void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *, int, int, int, int); +void getGraphicSourcePlayerExt_EM(struct GraphicInfo_EM *, int, int, int); + +#endif // IMPORT_EM_H diff --git a/src/game_em/main_em.h b/src/game_em/main_em.h index 3e815d5c..350bc38b 100644 --- a/src/game_em/main_em.h +++ b/src/game_em/main_em.h @@ -5,7 +5,7 @@ // external functions and definitions imported from main program to game_em // ============================================================================ -#include "../engines.h" +#include "import_em.h" // ============================================================================ diff --git a/src/game_mm/game_mm.h b/src/game_mm/game_mm.h index a5676cd8..ccdbdf0d 100644 --- a/src/game_mm/game_mm.h +++ b/src/game_mm/game_mm.h @@ -14,6 +14,7 @@ #define GAME_MM_VERSION_1_0_0 +#include "import_mm.h" #include "export_mm.h" #endif // GAME_MM_H diff --git a/src/game_mm/import_mm.h b/src/game_mm/import_mm.h new file mode 100644 index 00000000..5ad8ef6d --- /dev/null +++ b/src/game_mm/import_mm.h @@ -0,0 +1,48 @@ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2024 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// https://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// import_mm.h +// ============================================================================ + +#ifndef IMPORT_MM_H +#define IMPORT_MM_H + +#include "../libgame/libgame.h" +#include "../conf_gfx.h" +#include "../game.h" + +#include "export_mm.h" + + +// ============================================================================ +// functions and definitions exported from main program to game_mm +// ============================================================================ + +void SetDrawtoField(int); +void BackToFront(void); + +int el2img_mm(int); +int el_act2img_mm(int, int); + +void CheckSingleStepMode_MM(boolean, boolean); +void ShowEnvelope(int); + +int getGraphicAnimationFrame(int, int); +int getGraphicAnimationFrameXY(int, int, int); + +void getGraphicSource(int, int, Bitmap **, int *, int *); +void getMiniGraphicSource(int, Bitmap **, int *, int *); +void getSizedGraphicSource(int, int, int, Bitmap **, int *, int *); +boolean getGraphicInfo_NewFrame(int, int, int); + +void AdvanceFrameCounter(void); +void AdvanceGfxFrame(void); + +int getAnimationFrame(int, int, int, int, int); + +#endif // IMPORT_MM_H diff --git a/src/game_mm/main_mm.h b/src/game_mm/main_mm.h index 9d5c9023..08d4bf6c 100644 --- a/src/game_mm/main_mm.h +++ b/src/game_mm/main_mm.h @@ -5,8 +5,7 @@ // external functions and definitions imported from main program to game_mm // ============================================================================ -#include "../engines.h" -#include "../conf_gfx.h" +#include "import_mm.h" // ============================================================================ diff --git a/src/game_sp/game_sp.h b/src/game_sp/game_sp.h index 797ef7d3..523f6619 100644 --- a/src/game_sp/game_sp.h +++ b/src/game_sp/game_sp.h @@ -14,6 +14,7 @@ #define GAME_SP_VERSION_1_0_0 +#include "import_sp.h" #include "export_sp.h" #endif // GAME_SP_H diff --git a/src/game_sp/import_sp.h b/src/game_sp/import_sp.h new file mode 100644 index 00000000..4f8f3007 --- /dev/null +++ b/src/game_sp/import_sp.h @@ -0,0 +1,32 @@ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2024 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// https://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// import_sp.h +// ============================================================================ + +#ifndef IMPORT_SP_H +#define IMPORT_SP_H + +#include "../libgame/libgame.h" +#include "../conf_gfx.h" +#include "../game.h" + +#include "export_sp.h" + + +// ============================================================================ +// functions and definitions exported from main program to game_sp +// ============================================================================ + +void CheckSingleStepMode_SP(boolean, boolean); + +void getGraphicSource_SP(struct GraphicInfo_SP *, int, int); +int getGraphicInfo_Delay(int); +boolean isNextAnimationFrame_SP(int, int); + +#endif // IMPORT_SP_H diff --git a/src/game_sp/main_sp.h b/src/game_sp/main_sp.h index 8e31403a..11d973a4 100644 --- a/src/game_sp/main_sp.h +++ b/src/game_sp/main_sp.h @@ -5,8 +5,7 @@ // external functions and definitions imported from main program to game_sp // ============================================================================ -#include "../engines.h" -#include "../conf_gfx.h" +#include "import_sp.h" // ============================================================================ diff --git a/src/main.h b/src/main.h index 497a9a76..ce5fbf20 100644 --- a/src/main.h +++ b/src/main.h @@ -25,7 +25,6 @@ #include "game_em/game_em.h" #include "game_sp/game_sp.h" #include "game_mm/game_mm.h" -#include "engines.h" #include "conf_gfx.h" // include auto-generated data structure definitions #include "conf_snd.h" // include auto-generated data structure definitions -- 2.34.1