Merge from 1.2 branch.

2009-03-06 14:44:25 -05:00 · 2009-03-06 14:44:25 -05:00 · d4bcbc3771
commit d4bcbc3771
parent d8264fada7 2c7555366f
2 changed files with 1 additions and 6 deletions
--- a/gamedata/core.games/common.games.txt
+++ b/gamedata/core.games/common.games.txt
@ -36,11 +36,6 @@
 			"engine"			"original"
 		}
 		
-		"Keys"
-		{
-			"m_iHealth"			"m_fHealth"
-		}
-		
 		"Offsets"
 		{
 			"GetDataDescMap"
--- a/plugins/include/entity_prop_stocks.inc
+++ b/plugins/include/entity_prop_stocks.inc
@ -491,7 +491,7 @@ stock SetEntityHealth(entity, amount)
 		
 		if (!exists)
 		{
-			strcopy(prop, sizeof(prop), "m_iHeath");
+			strcopy(prop, sizeof(prop), "m_iHealth");
 		}
 		
 		gotconfig = true;