dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into sdl_extract

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2018-02-06 20:05:31 +03:00
parent 85748cf477 6721fb6d8d
commit 2b890c7efe
7 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/console.c
View File

@@ -3042,6 +3042,9 @@ void initConsole(Console* console, tic_mem* tic, FileSystem* fs, Config* config,
else if(strcmp(arg, "-skip") == 0)
console->skipStart = true;
else if(strcmp(arg, "-save") == 0)
saveCart(console);
else continue;
argp |= 0b1 << i;

12
src/main.c
View File

@@ -839,6 +839,7 @@ s32 main(s32 argc, char **argv)
#elif defined(__EMSCRIPTEN__)
SDL_RENDERER_ACCELERATED
#else
// TODO: uncomment this later
SDL_RENDERER_ACCELERATED// | (getConfig()->useVsync ? SDL_RENDERER_PRESENTVSYNC : 0)
#endif
);
@@ -850,7 +851,9 @@ s32 main(s32 argc, char **argv)
initTouchGamepad();
#if defined(__EMSCRIPTEN__)
emscripten_set_main_loop(emstick, TIC_FRAMERATE, 1);
// call this after FS is initialized
emscripten_set_main_loop(getConfig()->useVsync ? tick : emstick, TIC_FRAMERATE, 1);
#else
{
u64 nextTick = SDL_GetPerformanceCounter();
@@ -872,12 +875,7 @@ s32 main(s32 argc, char **argv)
nextTick -= delay;
platform.missedFrame = true;
}
else
{
u32 time = (u32)(delay * 1000 / SDL_GetPerformanceFrequency());
if(time >= 10)
SDL_Delay(time);
}
else SDL_Delay((u32)(delay * 1000 / SDL_GetPerformanceFrequency()));
}
}
}

2
src/studio.c
View File

@@ -2941,7 +2941,7 @@ Studio* studioInit(s32 argc, char **argv, s32 samplerate)
}
else createFileSystem(NULL, onFSInitialized);
emscripten_set_main_loop(emstick, TIC_FRAMERATE, 1);
// emscripten_set_main_loop(emstick, TIC_FRAMERATE, 1);
#else