zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The friction calculations for terrain based friction had some fixed/float mixups.

Browse source
This commit is contained in:
Christoph Oelckers 2016-05-22 12:11:39 +02:00
parent 36dfa97802
commit eed32ee285
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_terrain.cpp
View file

@ -497,7 +497,7 @@ static void ParseFriction (FScanner &sc, int keyword, void *fields)
friction = (0x1EB8*(sc.Float*100))/0x80 + 0xD001; friction = (0x1EB8*(sc.Float*100))/0x80 + 0xD001;
friction = clamp<double> (friction, 0, 65536.); friction = clamp<double> (friction, 0, 65536.);
if (friction > ORIG_FRICTION) // ice if (friction > ORIG_FRICTION * 65536.) // ice
movefactor = ((0x10092 - friction) * 1024) / 4352 + 568; movefactor = ((0x10092 - friction) * 1024) / 4352 + 568;
else else
movefactor = ((friction - 0xDB34)*(0xA))/0x80; movefactor = ((friction - 0xDB34)*(0xA))/0x80;