From 1df19e63755311497bd2f2b74359262cdf7ce5ed Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Fri, 12 Feb 2010 23:18:41 +0000
Subject: [PATCH] - last fix was incomplete.

SVN r2156 (trunk)
---
 src/gameconfigfile.cpp | 13 +++++++++++--
 src/version.h          |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
index 97bdfece98..e9f90a23d5 100644
--- a/src/gameconfigfile.cpp
+++ b/src/gameconfigfile.cpp
@@ -271,8 +271,8 @@ void FGameConfigFile::DoGlobalSetup ()
 					SetValueForKey ("9", "use ArtiBlastRadius");
 					SetValueForKey ("8", "use ArtiTeleport");
 					SetValueForKey ("7", "use ArtiTeleportOther");
-					SetValueForKey ("6", "use ArtiEgg");
-					SetValueForKey ("5", "use ArtiInvulnerability");
+					SetValueForKey ("6", "use ArtiPork");
+					SetValueForKey ("5", "use ArtiInvulnerability2");
 				}
 			}
 			if (last < 204)
@@ -330,6 +330,15 @@ void FGameConfigFile::DoGlobalSetup ()
 					dim->ResetToDefault ();
 				}
 			}
+			if (last < 210)
+			{
+				if (SetSection ("Hexen.Bindings"))
+				{
+					// These 2 were misnamed in earlier versions
+					SetValueForKey ("6", "use ArtiPork");
+					SetValueForKey ("5", "use ArtiInvulnerability2");
+				}
+			}
 		}
 	}
 }
diff --git a/src/version.h b/src/version.h
index 769e8005cc..de017995c9 100644
--- a/src/version.h
+++ b/src/version.h
@@ -59,7 +59,7 @@
 // Version stored in the ini's [LastRun] section.
 // Bump it if you made some configuration change that you want to
 // be able to migrate in FGameConfigFile::DoGlobalSetup().
-#define LASTRUNVERSION "209"
+#define LASTRUNVERSION "210"
 
 // Protocol version used in demos.
 // Bump it if you change existing DEM_ commands or add new ones.