OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: pr_bounce was declared statically in o_mobj.cpp and redeclared externally

Browse source 
in p_map.cpp resulting in a CRC conflict.


SVN r1832 (trunk)
This commit is contained in:
Christoph Oelckers 2009-09-15 06:35:46 +00:00
commit 4d18698f43
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_map.cpp
View file

@ -2674,7 +2674,7 @@ bool P_BounceWall (AActor *mo)
return slide.BounceWall(mo);
}
extern FRandom pr_bounce ("Bounce");
extern FRandom pr_bounce;
bool P_BounceActor (AActor *mo, AActor * BlockingMobj)
{
if (mo && BlockingMobj && ((mo->BounceFlags & BOUNCE_AllActors)