# HG changeset patch # User unc0rr # Date 1165774390 0 # Node ID 607912ccc5af44f919bb885bf8c849cebaef9635 # Parent 8834f3cb620ee64c5db878160d174dc75d3ec232 Implemented FPS limit and show/hide FPS value diff -r 8834f3cb620e -r 607912ccc5af QTfrontend/game.cpp --- a/QTfrontend/game.cpp Sun Dec 10 15:55:53 2006 +0000 +++ b/QTfrontend/game.cpp Sun Dec 10 18:13:10 2006 +0000 @@ -188,13 +188,15 @@ QStringList arguments; arguments << resolutions[0][config->vid_Resolution()]; arguments << resolutions[1][config->vid_Resolution()]; - arguments << "16"; + arguments << "16"; // bpp arguments << QString("%1").arg(ipc_port); arguments << (config->vid_Fullscreen() ? "1" : "0"); arguments << (config->isSoundEnabled() ? "1" : "0"); arguments << tr("en.txt"); - arguments << "128"; + arguments << "128"; // sound volume + arguments << "1024"; // max fps arguments << datadir->absolutePath(); + arguments << "1"; // show fps return arguments; } diff -r 8834f3cb620e -r 607912ccc5af hedgewars/hwengine.dpr --- a/hedgewars/hwengine.dpr Sun Dec 10 15:55:53 2006 +0000 +++ b/hedgewars/hwengine.dpr Sun Dec 10 18:13:10 2006 +0000 @@ -162,7 +162,7 @@ {$ENDIF} case ParamCount of - 9: begin +11: begin val(ParamStr(1), cScreenWidth, c); val(ParamStr(2), cScreenHeight, c); cBitsStr:= ParamStr(3); @@ -172,7 +172,10 @@ isSoundEnabled:= ParamStr(6) = '1'; cLocaleFName:= ParamStr(7); val(ParamStr(8), cInitVolume, c); - PathPrefix:= ParamStr(9); + val(ParamStr(9), cTimerInterval, c); + cTimerInterval:= 1024 div cTimerInterval; + PathPrefix:= ParamStr(10); + cShowFPS:= ParamStr(11) = '1'; for p:= Succ(Low(TPathType)) to High(TPathType) do if p <> ptMapCurrent then Pathz[p]:= PathPrefix + '/' + Pathz[p]; AddClouds diff -r 8834f3cb620e -r 607912ccc5af hedgewars/uMisc.pas --- a/hedgewars/uMisc.pas Sun Dec 10 15:55:53 2006 +0000 +++ b/hedgewars/uMisc.pas Sun Dec 10 18:13:10 2006 +0000 @@ -38,7 +38,6 @@ cCloudsNumber : integer = 9; cConsoleHeight : integer = 320; cConsoleYAdd : integer = 0; - cTimerInterval : Longword = 5; cScreenWidth : integer = 1024; cScreenHeight : integer = 768; cBits : integer = 16; @@ -71,6 +70,7 @@ cSeed : shortstring = ''; cInitVolume : integer = 128; cVolumeDelta : integer = 0; + cTimerInterval : Longword = 5; const cMaxPower = 1500;