diff --git a/recipes/gigalomania/02_stdafx.patch b/recipes/gigalomania/02_stdafx.patch index fd73ee2642aef0bcac98587f568020c25f49b897..b7d21cf497da06f70fd4c63399cb573e9be59386 100644 --- a/recipes/gigalomania/02_stdafx.patch +++ b/recipes/gigalomania/02_stdafx.patch @@ -1,5 +1,5 @@ ---- source/stdafx.h 2018-05-28 11:51:01.961563258 +0200 -+++ build/stdafx.h 2018-05-28 11:55:02.478236113 +0200 +--- source/stdafx.h 2018-06-17 18:09:41.729534046 +0200 ++++ build/stdafx.h 2018-06-17 18:18:54.353160159 +0200 @@ -20,5 +20,5 @@ #elif defined(__MORPHOS__) #include <SDL/SDL.h> diff --git a/recipes/gigalomania/03_image.patch b/recipes/gigalomania/03_image.patch index 0aa53056907336c493eb9f94c5b09ebe5bcc2f13..7bf5a1d02b6607bb0d5a131aa7072576114b508e 100644 --- a/recipes/gigalomania/03_image.patch +++ b/recipes/gigalomania/03_image.patch @@ -1,5 +1,5 @@ ---- source/image.h 2018-05-28 10:13:03.769049093 +0200 -+++ build/image.h 2018-05-28 11:11:33.754769751 +0200 +--- source/image.h 2018-06-17 18:09:41.601543849 +0200 ++++ build/image.h 2018-06-17 18:23:39.379455831 +0200 @@ -14,7 +14,7 @@ #elif defined(__MORPHOS__) #include <SDL/SDL_image.h> diff --git a/recipes/gigalomania/04_sound.patch b/recipes/gigalomania/04_sound.patch index ae20c6879e8aafee682cde12c6eb69dd1d4d0623..44f4aa6a57c0c4dd561b4e10f11587f77c057efa 100644 --- a/recipes/gigalomania/04_sound.patch +++ b/recipes/gigalomania/04_sound.patch @@ -1,5 +1,5 @@ ---- source/sound.h 2018-05-28 10:13:03.857049133 +0200 -+++ build/sound.h 2018-05-28 11:11:47.002814093 +0200 +--- source/sound.h 2018-06-17 18:09:41.681537723 +0200 ++++ build/sound.h 2018-06-17 18:34:51.659424313 +0200 @@ -13,7 +13,7 @@ #elif defined(__linux) #include <SDL2/SDL_mixer.h> diff --git a/recipes/gigalomania/05_game.patch b/recipes/gigalomania/05_game.patch index 7999b01f5ac1d46867780992dcdfd9534bbb5a9d..12c7b8459f976470de840152046e594e39c0f01c 100644 --- a/recipes/gigalomania/05_game.patch +++ b/recipes/gigalomania/05_game.patch @@ -1,11 +1,11 @@ ---- source/game.h 2018-05-28 11:51:01.785562766 +0200 -+++ build/game.h 2018-05-28 11:53:10.909923925 +0200 +--- source/game.h 2018-06-17 18:09:41.545548138 +0200 ++++ build/game.h 2018-06-17 18:26:27.573161256 +0200 @@ -530,7 +530,7 @@ void startNewGame_g(); // DATADIR is place to look if data not present in application's folder -//#define DATADIR "C:/temp/glmdata" // test on Windows -+#define DATADIR "/games/gigalomania" // redox games dir? ++#define DATADIR "/games/gigalomania" // test on Windows extern string maps_dirname; #ifdef DATADIR diff --git a/recipes/gigalomania/06_game_cpp.patch b/recipes/gigalomania/06_game_cpp.patch index 13e727cea9d83fb5403e9862ebcb9d859cfe2277..714b784607139f8bb9474a8abf51282392deb3bc 100644 --- a/recipes/gigalomania/06_game_cpp.patch +++ b/recipes/gigalomania/06_game_cpp.patch @@ -1,5 +1,16 @@ ---- source/game.cpp 2018-05-28 14:37:45.401234128 +0200 -+++ build/game.cpp 2018-05-28 14:47:42.698867243 +0200 +--- source/game.cpp 2018-06-17 18:09:41.545548000 +0200 ++++ build/game.cpp 2018-06-17 20:06:47.516838000 +0200 +@@ -2900,8 +2900,8 @@ + + #if SDL_MAJOR_VERSION == 1 + const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo(); +- *user_width = videoInfo->current_w; +- *user_height = videoInfo->current_h; ++ *user_width = 640;//videoInfo->current_w; ++ *user_height = 480;//videoInfo->current_h; + LOG("desktop is %d x %d\n", *user_width, *user_height); + #else + SDL_DisplayMode displayMode; @@ -2942,11 +2942,11 @@ //user_width = 1184; //user_height = 720; @@ -46,8 +57,8 @@ } //bool quit = false; --bool debugwindow = true; -+bool debugwindow = false; +-bool debugwindow = false; ++bool debugwindow = true; void Game::requestQuit(bool force_quit) { if( !state_changed ) { @@ -55,8 +66,8 @@ debugwindow = true; #endif -- bool fullscreen = false; -+ bool fullscreen = true; +- bool fullscreen = true; ++ bool fullscreen = false; #if defined(__amigaos4__) || defined(AROS) || defined(__MORPHOS__) fullscreen = false; // run in windowed mode due to reported performance problems in fullscreen mode on AmigaOS 4; also randomly hangs on AROS in fullscreen mode; also included MorphOS just to be safe #endif diff --git a/recipes/gigalomania/07_gamestate_cpp.patch b/recipes/gigalomania/07_gamestate_cpp.patch index 777027985e3c9fe89be3e56ddf7a6ff888594f46..858d76ccb3a865a078785a28006834b12644fed1 100644 --- a/recipes/gigalomania/07_gamestate_cpp.patch +++ b/recipes/gigalomania/07_gamestate_cpp.patch @@ -1,24 +1,20 @@ ---- source/gamestate.cpp 2018-05-28 11:51:01.789562777 +0200 -+++ build/gamestate.cpp 2018-05-28 14:24:06.690031507 +0200 -@@ -1428,8 +1428,9 @@ - }; +--- source/gamestate.cpp 2018-06-17 18:09:41.549547831 +0200 ++++ build/gamestate.cpp 2018-06-17 18:31:22.793844378 +0200 +@@ -1429,7 +1429,7 @@ void GameState::fadeScreen(bool out, int delay, void (*func_finish)()) { -- if( fade != NULL ) -+ if( fade != NULL ) { - delete fade; -+ } + if( fade != NULL ) +- delete fade; ++ { delete fade; } if( game_g->isTesting() ) { if( func_finish != NULL ) { func_finish(); -@@ -1442,8 +1443,9 @@ - +@@ -1443,7 +1443,7 @@ void GameState::whiteFlash() { //ASSERT( whitefade == NULL ); -- if( whitefade != NULL ) -+ if( whitefade != NULL ) { - delete whitefade; -+ } + if( whitefade != NULL ) +- delete whitefade; ++ { delete whitefade; } if( !game_g->isTesting() ) { whitefade = new FadeEffect(true, false, 0, NULL); }