From 4d18698f4395378fce866efe6109973ca98c791f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 15 Sep 2009 06:35:46 +0000
Subject: [PATCH] - 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 | 2 ++
 src/p_map.cpp   | 2 +-
 src/p_mobj.cpp  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index ca6d0f3cd..9e90b6be8 100644
--- a/docs/rh-log.txt
+++ b/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
diff --git a/src/p_map.cpp b/src/p_map.cpp
index a937db4d3..40d40461a 100644
--- a/src/p_map.cpp
+++ b/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)
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index b416829f8..06c150f95 100644
--- a/src/p_mobj.cpp
+++ b/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");