diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 54c6b2abd..0f0a8c798 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,10 @@
+January 4, 2008 (Changes by Graf Zahl)
+- Removed the patches for the Doom/Heretic E1 intermission screens from
+ R_InitPatches. This isn't needed anymore because all these are loaded through
+ an intermission script.
+- Fixed: A_SpawnDebris read the third and fourth arguments from the first one's
+ address.
+
January 3, 2008
- Moved the pixel shaders' color information out of the constant registers
and into the vertex data.
diff --git a/src/r_data.cpp b/src/r_data.cpp
index f189c525d..b6c15754e 100644
--- a/src/r_data.cpp
+++ b/src/r_data.cpp
@@ -1106,15 +1106,6 @@ static void R_InitPatches ()
"M_EPI2",
"M_EPI3",
"M_EPI4",
- "MAPE1",
- "MAPE2",
- "MAPE3",
- "WIMAP0",
- "WIURH0",
- "WIURH1",
- "WISPLAT",
- "WIMAP1",
- "WIMAP2",
"INTERPIC",
"WIOSTK",
"WIOSTI",
@@ -1234,34 +1225,6 @@ static void R_InitPatches ()
}
}
- // Animating overlays for the Doom E1 map
- for (i = 9; i >= 0; --i)
- {
- for (j = (i == 6) ? 3 : 2; j >= 0; --j)
- {
- sprintf (name, "WIA0%.2d%.2d", i, j);
- TexMan.AddPatch (name);
- }
- }
- // Animating overlays for the Doom E2 map
- for (i = 7; i >= 0; --i)
- {
- for (j = (i == 7) ? 2 : 0; j >= 0; --j)
- {
- sprintf (name, "WIA1%.2d%.2d", i, j);
- TexMan.AddPatch (name);
- }
- }
- // Animating overlays for the Doom E3 map
- for (i = 5; i >= 0; --i)
- {
- for (j = 2; j >= 0; --j)
- {
- sprintf (name, "WIA2%.2d%.2d", i, j);
- TexMan.AddPatch (name);
- }
- }
-
// Player class animations for the Hexen new game menu
for (i = 2; i >= 0; --i)
{
diff --git a/src/thingdef_codeptr.cpp b/src/thingdef_codeptr.cpp
index 005a5dfe1..4b362d807 100644
--- a/src/thingdef_codeptr.cpp
+++ b/src/thingdef_codeptr.cpp
@@ -1769,8 +1769,8 @@ void A_SpawnDebris(AActor * self)
if (debris == NULL) return;
INTBOOL transfer_translation = EvalExpressionI (StateParameters[index+1], self);
- fixed_t mult_h = fixed_t(EvalExpressionF (StateParameters[index], self) * FRACUNIT);
- fixed_t mult_v = fixed_t(EvalExpressionF (StateParameters[index], self) * FRACUNIT);
+ fixed_t mult_h = fixed_t(EvalExpressionF (StateParameters[index+2], self) * FRACUNIT);
+ fixed_t mult_v = fixed_t(EvalExpressionF (StateParameters[index+3], self) * FRACUNIT);
// only positive values make sense here
if (mult_v<=0) mult_v=FRACUNIT;
diff --git a/tools/updaterevision/updaterevision.vcproj b/tools/updaterevision/updaterevision.vcproj
index 202c9d042..f39914dca 100644
--- a/tools/updaterevision/updaterevision.vcproj
+++ b/tools/updaterevision/updaterevision.vcproj
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+