- Fixed: The speed definition of PowerSpeed used PROP_SpeedFixed instead of

PROP_SpeedLong.
- Fixed: The Chainsaw's kickback was initialized to the default - not 0.


SVN r535 (trunk)

docs/rh-log.txt

@@ -1,3 +1,8 @@
+May 27, 2007 (Changes by Graf Zahl)
+- Fixed: The speed definition of PowerSpeed used PROP_SpeedFixed instead of
+  PROP_SpeedLong.
+- Fixed: The Chainsaw's kickback was initialized to the default - not 0.
+
 May 26, 2007 (Changes by Graf Zahl)
 - Fixed: Resurrecting a player must set mo->special1 to 0 because it is used 
   as a counter by the Hexen fighter's fist weapon.

src/g_shared/a_artifacts.cpp

@@ -1163,7 +1163,7 @@ void APlayerSpeedTrail::Tick ()
 // Speed Powerup -------------------------------------------------------------
 
 IMPLEMENT_STATELESS_ACTOR (APowerSpeed, Any, -1, 0)
-	PROP_SpeedFixed(3*FRACUNIT/2)
+	PROP_SpeedLong(3*FRACUNIT/2)
 	PROP_Powerup_EffectTics (SPEEDTICS)
 	PROP_Inventory_Icon ("SPBOOT0")
 END_DEFAULTS

src/sc_man.cpp

@@ -428,6 +428,22 @@ void SC_MustGetAnyToken (void)
 	}
 }
 
+//==========================================================================
+//
+// SC_TokenMustBe
+//
+//==========================================================================
+
+void SC_TokenMustBe (int token)
+{
+	if (sc_TokenType != token)
+	{
+		FString tok1 = SC_TokenName(token);
+		FString tok2 = SC_TokenName(sc_TokenType, sc_String);
+		SC_ScriptError ("Expected %s but got %s instead.", tok1.GetChars(), tok2.GetChars());
+	}
+}
+
 //==========================================================================
 //
 // SC_MustGetToken
@@ -437,12 +453,7 @@ void SC_MustGetAnyToken (void)
 void SC_MustGetToken (int token)
 {
 	SC_MustGetAnyToken ();
-	if (sc_TokenType != token)
+	SC_TokenMustBe(token);
-	{
-		FString tok1 = SC_TokenName(token);
-		FString tok2 = SC_TokenName(sc_TokenType, sc_String);
-		SC_ScriptError ("Expected %s but got %s instead.", tok1.GetChars(), tok2.GetChars());
-	}
 }
 
 //==========================================================================

src/sc_man.h

@@ -17,6 +17,7 @@ void SC_MustGetStringName (const char *name);
 bool SC_CheckString (const char *name);
 bool SC_GetToken (void);
 void SC_MustGetAnyToken (void);
+void SC_TokenMustBe (int token);
 void SC_MustGetToken (int token);
 bool SC_CheckToken (int token);
 bool SC_CheckTokenId (ENamedName id);
@@ -44,6 +45,7 @@ enum
 	TK_FloatConst,
 	TK_Ellipsis,		// ...
 	TK_RShiftEq,		// >>=
+	TK_URShiftEq,		// >>>=
 	TK_LShiftEq,		// <<=
 	TK_AddEq,			// +=
 	TK_SubEq,			// -=
@@ -54,6 +56,7 @@ enum
 	TK_XorEq,			// ^=
 	TK_OrEq,			// |=
 	TK_RShift,			// >>
+	TK_URShift,			// >>>
 	TK_LShift,			// <<
 	TK_Incr,			// ++
 	TK_Decr,			// --

src/sc_man_scanner.re

@@ -158,6 +158,7 @@ std2:
 									{ RET(TK_NameConst); }
 
 		"..."						{ RET(TK_Ellipsis); }
+		">>>="						{ RET(TK_URShiftEq); }
 		">>="						{ RET(TK_RShiftEq); }
 		"<<="						{ RET(TK_LShiftEq); }
 		"+="						{ RET(TK_AddEq); }
@@ -168,6 +169,7 @@ std2:
 		"&="						{ RET(TK_AndEq); }
 		"^="						{ RET(TK_XorEq); }
 		"|="						{ RET(TK_OrEq); }
+		">>>"						{ RET(TK_URShift); }
 		">>"						{ RET(TK_RShift); }
 		"<<"						{ RET(TK_LShift); }
 		"++"						{ RET(TK_Incr); }

wadsrc/decorate/doom/doomweapons.txt

@@ -99,6 +99,7 @@ ACTOR Chainsaw : Weapon 2005
 {
 	Game Doom
 	SpawnID 32
+	Weapon.Kickback 0
 	Weapon.SelectionOrder 2200
 	Weapon.UpSound "weapons/sawup"
 	Weapon.ReadySound "weapons/sawidle"