zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki 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
parent 3a6d66e230
commit 4d18698f43
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/rh-log.txt
View file

@ -1,4 +1,6 @@
September 15, 2009 (Changes by Graf Zahl)
- fixed: pr_bounce was declared statically in o_mobj.cpp and redeclared externally
in p_map.cpp resulting in a CRC conflict.
- fixed: The Dehacked flags parser fix from May 31 (r1624) was undone by
yesterday's additions. Changed it so that the parser first checks for
the presence of a '-' sign before deciding whether to use strtol or

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)

2
src/p_mobj.cpp
View file

@ -87,7 +87,7 @@ EXTERN_CVAR (Int, cl_rockettrails)
static bool SpawningMapThing;
static FRandom pr_explodemissile ("ExplodeMissile");
static FRandom pr_bounce ("Bounce");
FRandom pr_bounce ("Bounce");
static FRandom pr_reflect ("Reflect");
static FRandom pr_nightmarerespawn ("NightmareRespawn");
static FRandom pr_botspawnmobj ("BotSpawnActor");