diff --git a/src/c_dispatch.cpp b/src/c_dispatch.cpp
index 88dbc5d64..105d8c0d3 100644
--- a/src/c_dispatch.cpp
+++ b/src/c_dispatch.cpp
@@ -627,7 +627,14 @@ void C_DoCommand (const char *cmd, int keynum)
 		}
 		else
 		{
-			new DStoredCommand (com, beg);
+			if (len == 4 && strnicmp(beg, "warp", 4) == 0)
+			{
+				StoredWarp = beg;
+			}
+			else
+			{
+				new DStoredCommand (com, beg);
+			}
 		}
 	}
 	else
diff --git a/src/d_main.cpp b/src/d_main.cpp
index ca2c3b38f..1d2141d14 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -218,6 +218,7 @@ int NoWipe;				// [RH] Allow wipe? (Needs to be set each time)
 bool singletics = false;	// debug flag to cancel adaptiveness
 FString startmap;
 bool autostart;
+FString StoredWarp;
 bool advancedemo;
 FILE *debugfile;
 event_t events[MAXEVENTS];
@@ -2081,7 +2082,7 @@ static void CheckCmdLine()
 	{
 		startmap = "&wt@01";
 	}
-	autostart = false;
+	autostart = StoredWarp.IsNotEmpty();
 				
 	const char *val = Args->CheckValue ("-skill");
 	if (val)
@@ -2518,6 +2519,11 @@ void D_DoomMain (void)
 					if (demorecording)
 						G_BeginRecording (startmap);
 					G_InitNew (startmap, false);
+					if (StoredWarp.IsNotEmpty())
+					{
+						AddCommandString(StoredWarp.LockBuffer());
+						StoredWarp = NULL;
+					}
 				}
 				else
 				{
diff --git a/src/doomstat.h b/src/doomstat.h
index 2819f1bf0..92ab5b8f8 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -59,6 +59,8 @@ extern	FString			startmap;			// [RH] Actual map name now
 
 extern	bool 			autostart;
 
+extern	FString			StoredWarp;			// [RH] +warp at the command line
+
 // Selected by user. 
 EXTERN_CVAR (Int, gameskill);
 extern	int				NextSkill;			// [RH] Skill to use at next level load
diff --git a/src/g_hexen/a_fighterquietus.cpp b/src/g_hexen/a_fighterquietus.cpp
index 0ba8abd6f..846b30281 100644
--- a/src/g_hexen/a_fighterquietus.cpp
+++ b/src/g_hexen/a_fighterquietus.cpp
@@ -58,12 +58,12 @@ class AFSwordMissile : public AActor
 {
 	DECLARE_CLASS (AFSwordMissile, AActor)
 public:
-	int DoSpecialDamage(AActor *victim, AActor *source, int damage, FName damagetype);
+	int DoSpecialDamage(AActor *victim, int damage, FName damagetype);
 };
 
 IMPLEMENT_CLASS (AFSwordMissile)
 
-int AFSwordMissile::DoSpecialDamage(AActor *victim, AActor *source, int damage, FName damagetype)
+int AFSwordMissile::DoSpecialDamage(AActor *victim, int damage, FName damagetype)
 {
 	if (victim->player)
 	{
diff --git a/src/textures/animations.cpp b/src/textures/animations.cpp
index aaf6d03d6..5a6f0729a 100644
--- a/src/textures/animations.cpp
+++ b/src/textures/animations.cpp
@@ -659,6 +659,17 @@ void FTextureManager::ParseCameraTexture(FScanner &sc)
 			sc.UnGet ();
 		}
 	}
+	if (sc.GetString())
+	{
+		if (sc.Compare("WorldPanning"))
+		{
+			viewer->bWorldPanning = true;
+		}
+		else
+		{
+			sc.UnGet();
+		}
+	}
 	viewer->SetScaledSize(fitwidth, fitheight);
 }