amendments for: global variable 'fullscreenCLI'/move on top timer/Qt fullscreen code

This commit is contained in:
beaumanvienna 2014-09-24 23:23:25 +02:00
parent e11f403a8e
commit 48856951a7
2 changed files with 3 additions and 6 deletions

View File

@ -33,7 +33,7 @@ bool NativeIsAtTopLevel();
// The very first function to be called after NativeGetAppInfo. Even NativeMix is not called
// before this, although it may be called at any point in time afterwards (on any thread!)
// This functions must NOT call OpenGL. Main thread.
void NativeInit(int argc, const char *argv[], const char *savegame_directory, const char *external_directory, const char *installID);
void NativeInit(int argc, const char *argv[], const char *savegame_directory, const char *external_directory, const char *installID, bool fs);
// Runs after NativeInit() at some point. May (and probably should) call OpenGL.
// Should not initialize anything screen-size-dependent - do that in NativeResized.

View File

@ -36,9 +36,6 @@
InputState* input_state;
// "--fullscreen" from command line interface
bool fullscreenCLI;
#ifdef QT_HAS_SDL
extern void mixaudio(void *userdata, Uint8 *stream, int len) {
NativeMix((short *)stream, len / 4);
@ -208,13 +205,13 @@ int main(int argc, char *argv[])
savegame_dir += "/";
assets_dir += "/";
fullscreenCLI=false;
bool fullscreenCLI=false;
for (int i = 1; i < argc; i++)
{
if (!strcmp(argv[i],"--fullscreen"))
fullscreenCLI=true;
}
NativeInit(argc, (const char **)argv, savegame_dir.c_str(), assets_dir.c_str(), "BADCOFFEE");
NativeInit(argc, (const char **)argv, savegame_dir.c_str(), assets_dir.c_str(), "BADCOFFEE",fullscreenCLI);
int ret = mainInternal(a);