MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-22 04:44:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

video resolution set to 640x480 cause SDL_GetVideoInfo() returns res 0x0

Browse Source
This commit is contained in:
fabiao 2018-06-17 22:28:00 +02:00
parent 79e8d44a2e
commit 9509e370f2
6 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/gigalomania/02_stdafx.patch
View File

@ -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>

4
recipes/gigalomania/03_image.patch
View File

@ -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>

4
recipes/gigalomania/04_sound.patch
View File

@ -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>

6
recipes/gigalomania/05_game.patch
View File

@ -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

23
recipes/gigalomania/06_game_cpp.patch
View File

@ -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

24
recipes/gigalomania/07_gamestate_cpp.patch
View File

@ -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);
}