From dd49574325b8949594a24be148fba3acd82d631e Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 27 Sep 2008 07:11:38 +0000
Subject: [PATCH] SVN r1248 (trunk)

---
 docs/rh-log.txt                        | 3 +++
 src/r_translate.cpp                    | 2 +-
 wadsrc/static/actors/shared/debris.txt | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 318be118d..c7f309396 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,6 @@
+September 27, 2008  (Changes by Graf Zahl)
+- Fixed: The translation string parser printed a broken error message.
+
 September 24, 2008  (Changes by Graf Zahl)
 - Fixed: player.colorrange didn't read the parameters correctly.
 - Reverted an 'optimization' in d_dehacked.cpp that didn't work.
diff --git a/src/r_translate.cpp b/src/r_translate.cpp
index 4a0481283..43bd7bd0b 100644
--- a/src/r_translate.cpp
+++ b/src/r_translate.cpp
@@ -459,7 +459,7 @@ void FRemapTable::AddToTranslation(const char * range)
 	}
 	catch (CRecoverableError &err)
 	{
-		Printf("Error in translation '%s':\n%s\n", err.GetMessage());
+		Printf("Error in translation '%s':\n%s\n", range, err.GetMessage());
 	}
 }
 
diff --git a/wadsrc/static/actors/shared/debris.txt b/wadsrc/static/actors/shared/debris.txt
index ec7b094a0..a74fd5916 100644
--- a/wadsrc/static/actors/shared/debris.txt
+++ b/wadsrc/static/actors/shared/debris.txt
@@ -174,7 +174,7 @@ ACTOR GlassShard native
 	Radius 5
 	Mass 5
 	Projectile
-	-ACTIVATEMCROSS
+	-ACTIVATEPCROSS
 	-ACTIVATEIMPACT
 	+HEXENBOUNCE
 	BounceFactor 0.3