From 276b1871813d8ad77a876d05f7ff332ff12aaa14 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Sat, 19 Oct 2019 19:52:24 +0000 Subject: [PATCH 1/2] Make frameskip an integer. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4273 --- include/render.h | 4 ++-- src/gui/render.cpp | 12 ++++++------ src/gui/sdlmain.cpp | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/render.h b/include/render.h index 6c8df98a..291ef418 100644 --- a/include/render.h +++ b/include/render.h @@ -58,8 +58,8 @@ typedef struct { float fps; } src; struct { - Bitu count; - Bitu max; + int count; + int max; Bitu index; Bit8u hadSkip[RENDER_SKIP_CACHE]; } frameskip; diff --git a/src/gui/render.cpp b/src/gui/render.cpp index 941fe76f..6db94cfe 100644 --- a/src/gui/render.cpp +++ b/src/gui/render.cpp @@ -376,11 +376,11 @@ forcenormal: } switch (render.src.bpp) { case 8: - render.src.start = ( render.src.width * 1) / sizeof(Bitu); - if (gfx_flags & GFX_CAN_8) - gfx_flags |= GFX_LOVE_8; - else - gfx_flags |= GFX_LOVE_32; + render.src.start = ( render.src.width * 1) / sizeof(Bitu); + if (gfx_flags & GFX_CAN_8) + gfx_flags |= GFX_LOVE_8; + else + gfx_flags |= GFX_LOVE_32; break; case 15: render.src.start = ( render.src.width * 2) / sizeof(Bitu); @@ -534,7 +534,7 @@ void RENDER_SetSize(Bitu width,Bitu height,Bitu bpp,float fps,double ratio,bool RENDER_Reset( ); } -extern void GFX_SetTitle(Bit32s cycles, Bits frameskip,bool paused); +extern void GFX_SetTitle(Bit32s cycles, int frameskip,bool paused); static void IncreaseFrameSkip(bool pressed) { if (!pressed) return; diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index 6a1fdc00..87a45ebf 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -286,19 +286,19 @@ extern bool CPU_CycleAutoAdjust; bool startup_state_numlock=false; bool startup_state_capslock=false; -void GFX_SetTitle(Bit32s cycles,Bits frameskip,bool paused){ - char title[200]={0}; - static Bit32s internal_cycles=0; - static Bit32s internal_frameskip=0; - if(cycles != -1) internal_cycles = cycles; - if(frameskip != -1) internal_frameskip = frameskip; +void GFX_SetTitle(Bit32s cycles,int frameskip,bool paused){ + char title[200] = { 0 }; + static Bit32s internal_cycles = 0; + static int internal_frameskip = 0; + if (cycles != -1) internal_cycles = cycles; + if (frameskip != -1) internal_frameskip = frameskip; if(CPU_CycleAutoAdjust) { sprintf(title,"DOSBox %s, CPU speed: max %3d%% cycles, Frameskip %2d, Program: %8s",VERSION,internal_cycles,internal_frameskip,RunningProgram); } else { sprintf(title,"DOSBox %s, CPU speed: %8d cycles, Frameskip %2d, Program: %8s",VERSION,internal_cycles,internal_frameskip,RunningProgram); } - if(paused) strcat(title," PAUSED"); + if (paused) strcat(title," PAUSED"); SDL_WM_SetCaption(title,VERSION); } From 5b690f936aa79e956453eff5a6249e5eb98737a7 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Sat, 19 Oct 2019 20:08:46 +0000 Subject: [PATCH 2/2] fix externals. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4274 --- src/cpu/cpu.cpp | 2 +- src/dos/dos_execute.cpp | 2 +- src/gui/sdl_gui.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index bc1c576e..37916028 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -32,7 +32,7 @@ #include "support.h" Bitu DEBUG_EnableDebugger(void); -extern void GFX_SetTitle(Bit32s cycles ,Bits frameskip,bool paused); +extern void GFX_SetTitle(Bit32s cycles ,int frameskip,bool paused); #if 1 #undef LOG diff --git a/src/dos/dos_execute.cpp b/src/dos/dos_execute.cpp index 543ce108..b2a99869 100644 --- a/src/dos/dos_execute.cpp +++ b/src/dos/dos_execute.cpp @@ -88,7 +88,7 @@ static void RestoreRegisters(void) { reg_sp+=18; } -extern void GFX_SetTitle(Bit32s cycles,Bits frameskip,bool paused); +extern void GFX_SetTitle(Bit32s cycles,int frameskip,bool paused); void DOS_UpdatePSPName(void) { DOS_MCB mcb(dos.psp()-1); static char name[9]; diff --git a/src/gui/sdl_gui.cpp b/src/gui/sdl_gui.cpp index 9640b065..f516e6de 100644 --- a/src/gui/sdl_gui.cpp +++ b/src/gui/sdl_gui.cpp @@ -39,7 +39,7 @@ extern Bit8u int10_font_14[256 * 14]; extern bool MSG_Write(const char *); -extern void GFX_SetTitle(Bit32s cycles, Bits frameskip, bool paused); +extern void GFX_SetTitle(Bit32s cycles, int frameskip, bool paused); static int cursor, saved_bpp; static int old_unicode;