backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

disable waitable timers for now, they're too OP - plz nerf

Browse Source
This commit is contained in:
FunkyFr3sh 2018-11-30 02:55:51 +01:00
parent b366b77ee0
commit c47a186102
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/render.c
View File

@ -155,7 +155,7 @@ static void SetMaxFPS()
{ {
float len = 1000.0f / maxFPS; float len = 1000.0f / maxFPS;
ddraw->fpsLimiter.tickLengthNs = len * 10000; ddraw->fpsLimiter.tickLengthNs = len * 10000;
ddraw->fpsLimiter.ticklength = len + 0.5f; ddraw->fpsLimiter.ticklength = len;// + 0.5f;
} }
} }

2
src/render_d3d9.c
View File

@ -288,7 +288,7 @@ static void SetMaxFPS()
{ {
float len = 1000.0f / maxFPS; float len = 1000.0f / maxFPS;
ddraw->fpsLimiter.tickLengthNs = len * 10000; ddraw->fpsLimiter.tickLengthNs = len * 10000;
ddraw->fpsLimiter.ticklength = len + 0.5f; ddraw->fpsLimiter.ticklength = len;// + 0.5f;
} }
} }

2
src/render_soft.c
View File

@ -55,7 +55,7 @@ DWORD WINAPI render_soft_main(void)
{ {
float len = 1000.0f / maxFPS; float len = 1000.0f / maxFPS;
ddraw->fpsLimiter.tickLengthNs = len * 10000; ddraw->fpsLimiter.tickLengthNs = len * 10000;
ddraw->fpsLimiter.ticklength = len + 0.5f; ddraw->fpsLimiter.ticklength = len;// + 0.5f;
} }
while (ddraw->render.run && WaitForSingleObject(ddraw->render.sem, INFINITE) != WAIT_FAILED) while (ddraw->render.run && WaitForSingleObject(ddraw->render.sem, INFINITE) != WAIT_FAILED)

14
src/settings.c
View File

@ -49,21 +49,21 @@ void Settings_Load()
ddraw->render.maxfps = GetInt("maxfps", 125); ddraw->render.maxfps = GetInt("maxfps", 125);
if (ddraw->render.maxfps) if (ddraw->render.maxfps)
{ {
ddraw->fpsLimiter.hTimer = CreateWaitableTimer(NULL, TRUE, NULL); //ddraw->fpsLimiter.hTimer = CreateWaitableTimer(NULL, TRUE, NULL);
//can't fully set it up here due to missing ddraw->mode.dmDisplayFrequency //can't fully set it up here due to missing ddraw->mode.dmDisplayFrequency
} }
int maxTicks = GetInt("maxgameticks", 0); int maxTicks = GetInt("maxgameticks", 0);
if (maxTicks > 0 && maxTicks <= 1000) if (maxTicks > 0 && maxTicks <= 1000)
{ {
ddraw->ticksLimiter.hTimer = CreateWaitableTimer(NULL, TRUE, NULL); //ddraw->ticksLimiter.hTimer = CreateWaitableTimer(NULL, TRUE, NULL);
float len = 1000.0f / maxTicks; float len = 1000.0f / maxTicks;
ddraw->ticksLimiter.tickLengthNs = len * 10000; ddraw->ticksLimiter.tickLengthNs = len * 10000;
ddraw->ticksLimiter.ticklength = len + 0.5f; ddraw->ticksLimiter.ticklength = len + 0.5f;
} }
//always using 60 fps for flip... //always using 60 fps for flip...
ddraw->flipLimiter.hTimer = CreateWaitableTimer(NULL, TRUE, NULL); //ddraw->flipLimiter.hTimer = CreateWaitableTimer(NULL, TRUE, NULL);
float flipLen = 1000.0f / 60; float flipLen = 1000.0f / 60;
ddraw->flipLimiter.tickLengthNs = flipLen * 10000; ddraw->flipLimiter.tickLengthNs = flipLen * 10000;
ddraw->flipLimiter.ticklength = flipLen + 0.5f; ddraw->flipLimiter.ticklength = flipLen + 0.5f;
@ -311,25 +311,25 @@ static void CreateSettingsIni()
"[game]\n" "[game]\n"
"noactivateapp=true\n" "noactivateapp=true\n"
"handlemouse=false\n" "handlemouse=false\n"
"maxfps=62\n" "maxfps=60\n"
"\n" "\n"
"; Command & Conquer: Tiberian Sun Online\n" "; Command & Conquer: Tiberian Sun Online\n"
"[ts-spawn]\n" "[ts-spawn]\n"
"noactivateapp=true\n" "noactivateapp=true\n"
"handlemouse=false\n" "handlemouse=false\n"
"maxfps=62\n" "maxfps=60\n"
"\n" "\n"
"; Command & Conquer: Red Alert 2: Yuri's Revenge\n" "; Command & Conquer: Red Alert 2: Yuri's Revenge\n"
"[gamemd]\n" "[gamemd]\n"
"noactivateapp=true\n" "noactivateapp=true\n"
"handlemouse=false\n" "handlemouse=false\n"
"maxfps=62\n" "maxfps=60\n"
"\n" "\n"
"; Command & Conquer: Red Alert 2: Yuri's Revenge Online\n" "; Command & Conquer: Red Alert 2: Yuri's Revenge Online\n"
"[gamemd-spawn]\n" "[gamemd-spawn]\n"
"noactivateapp=true\n" "noactivateapp=true\n"
"handlemouse=false\n" "handlemouse=false\n"
"maxfps=62\n" "maxfps=60\n"
"\n" "\n"
, fh); , fh);