valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Merge branch 'svn/trunk'

Browse source
This commit is contained in:
Patryk Obara 2019-10-20 07:08:44 +02:00
commit 9099f0620e
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/render.h
View file

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

2
scripts/count-bugs.py
View file

@ -23,7 +23,7 @@ from bs4 import BeautifulSoup
# then script will return with status 1. Simply change this line if you
# want to set a different limit.
#
MAX_ISSUES = 100
MAX_ISSUES = 99
def summary_values(summary_table):

2
scripts/count-warnings.py
View file

@ -23,7 +23,7 @@ import sys
# then script will return with status 1. Simply change this line if you
# want to set a different limit.
#
MAX_ISSUES = 380
MAX_ISSUES = 375
# For recognizing warnings in GCC format in stderr:
#

2
src/cpu/cpu.cpp
View file

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

2
src/dos/dos_execute.cpp
View file

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

12
src/gui/render.cpp
View file

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

2
src/gui/sdl_gui.cpp
View file

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

14
src/gui/sdlmain.cpp
View file

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