zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed copy/paste error in secmovefac. (It returned friction instead of movefactor...)

This commit is contained in:
Christoph Oelckers 2016-01-16 09:05:46 +01:00
parent f9ae304596
commit 5a8062abba
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_map.cpp
View File

@ -545,7 +545,7 @@ inline fixed_t secfriction(const sector_t *sec, int plane = sector_t::floor)
inline fixed_t secmovefac(const sector_t *sec, int plane = sector_t::floor) inline fixed_t secmovefac(const sector_t *sec, int plane = sector_t::floor)
{ {
if (sec->Flags & SECF_FRICTION) return sec->friction; if (sec->Flags & SECF_FRICTION) return sec->movefactor;
fixed_t movefactor = Terrains[sec->GetTerrain(plane)].MoveFactor; fixed_t movefactor = Terrains[sec->GetTerrain(plane)].MoveFactor;
return movefactor != 0 ? movefactor : ORIG_FRICTION_FACTOR; return movefactor != 0 ? movefactor : ORIG_FRICTION_FACTOR;
} }