Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust fps counter position, and save/load showFPS to/from the config file. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3082 4a71c877-e1ca-e34f-864e-861f7616d084
master
Christian Ohm 2007-12-16 18:40:25 +00:00
parent e9ae19df7b
commit 0c975d9c66
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/configuration.c
View File

@ -125,6 +125,11 @@ BOOL loadConfig(void)
setWarzoneKeyNumeric("framerate", 60); setWarzoneKeyNumeric("framerate", 60);
} }
if (getWarzoneKeyNumeric("showFPS", &val))
{
showFPS = val;
}
// ////////////////////////// // //////////////////////////
// gamma // gamma
if (getWarzoneKeyNumeric("gamma", &val)) if (getWarzoneKeyNumeric("gamma", &val))
@ -591,6 +596,7 @@ BOOL saveConfig(void)
setWarzoneKeyNumeric("allowSubtitles", war_GetAllowSubtitles()); setWarzoneKeyNumeric("allowSubtitles", war_GetAllowSubtitles());
setWarzoneKeyNumeric("debugmode", bAllowDebugMode); setWarzoneKeyNumeric("debugmode", bAllowDebugMode);
setWarzoneKeyNumeric("framerate", (SDWORD)getFramerateLimit()); setWarzoneKeyNumeric("framerate", (SDWORD)getFramerateLimit());
setWarzoneKeyNumeric("showFPS", (SDWORD)showFPS);
setWarzoneKeyNumeric("gamma", (SDWORD)gammaValue); setWarzoneKeyNumeric("gamma", (SDWORD)gammaValue);
setWarzoneKeyNumeric("scroll",(SDWORD)scroll_speed_accel); // scroll setWarzoneKeyNumeric("scroll",(SDWORD)scroll_speed_accel); // scroll
setWarzoneKeyNumeric("difficulty", getDifficultyLevel()); // level setWarzoneKeyNumeric("difficulty", getDifficultyLevel()); // level

2
src/display3d.c
View File

@ -358,7 +358,7 @@ void draw3DScene( void )
} }
if (showFPS) if (showFPS)
{ {
iV_DrawTextF(RET_X, 478 + E_H, "FPS: %02u", frameGetAverageRate()); iV_DrawTextF(8, 472 + E_H, "FPS: %02u", frameGetAverageRate());
} }
if(getDebugMappingStatus() && !demoGetStatus() && !gamePaused()) if(getDebugMappingStatus() && !demoGetStatus() && !gamePaused())
{ {