- new ini option ZOMBIE_ONLY_HEADSHOTS_PERMANENTLY_KILL: if a zombie is killed via headshot/melee combat, he can't rise again

- new ini option FOOD_MAX_POISONING: determines the maximum amount of food poisoning eating a singel food item can give
- fixed a bug that caused tooltips to display the wrong traits
- fixed a few zombie-related bugs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5669 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Tactical/Overhead.cpp

@@ -9767,3 +9767,18 @@ void HandleDisplayingOfPlayerLostDialogue( void )
 	}
 }
 #endif
+
+// Flugente: the entire new trait to string thingy is a fucked up mess. I've had it. Heres a function that simply handles that crap.
+STR16 GetNewTraitStr(UINT8 aTrait)
+{
+	if ( aTrait <= DOCTOR_NT )
+		;
+	else if ( aTrait <= SCOUTING_NT )
+		++aTrait;
+	else if ( aTrait == COVERT_NT )
+		aTrait = 10;
+	else if ( aTrait >= SCOUTING_NT + NUM_MINOR_TRAITS  )
+		aTrait -= NUM_MINOR_TRAITS;
+
+	return gzMercSkillTextNew[ aTrait ];
+}