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

in p_map.cpp resulting in a CRC conflict.


SVN r1832 (trunk)

docs/rh-log.txt

@@ -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

src/p_map.cpp

@@ -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)

src/p_mobj.cpp

@@ -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");