- a few dialogue box button texts can now be easily changed

- Fix: improved bomb defusal

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

Utils/Text.h

@@ -930,11 +930,22 @@ enum
 	MERC_VITAL_STATS_WITH_POISON_AND_FOOD_POPUPTEXT,
 
 	FUNCTION_SELECTION_STR,
+	FILL_CANTEEN_STR,
+	CLEAN_ONE_GUN_STR,
+	CLEAN_ALL_GUNS_STR,
+	TAKE_OFF_CLOTHES_STR,
 	CORPSE_SELECTION_STR,
+	DECAPITATE_STR,
+	GUT_STR,
+	TAKE_CLOTHES_STR,
+	TAKE_BODY_STR,
 	WEAPON_CLEANING_STR,
 	PRISONER_NO_PRISONS_STR,
 	PRISONER_DECIDE_STR,
 	PRISONER_OFFER_SURRENDER,
+	PRISONER_DEMAND_SURRENDER_STR,
+	PRISONER_OFFER_SURRENDER_STR,
+	PRISONER_TALK_STR,
 	
 	TEXT_NUM_TACTICAL_STR
 };

Utils/_ChineseText.cpp

@@ -2907,20 +2907,30 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"生命: %d/%d\n精力: %d/%d\n士气: %s\n口渴: %d%s\n饥饿: %d%s",
 	L"生命: %d/%d\n毒性: %d/%d\n精力: %d/%d\n士气: %s\n口渴: %d%s\n饥饿: %d%s",
 
-	// added by Flugente: selection of a function to call in tactical
-	L"1 - 装满水壶 2 - 清理枪支污垢 3 - 清理所有枪支污垢 4 - 脱掉衣服", //L"1 - Fill Canteens 2 - Clean one gun 3 - Clean all guns 4 - Take off clothes",
+	// added by Flugente: selection of a function to call in tactical	// TODO.Translate
+	L"What do you want to do?",
+	L"Fill canteens",
+	L"Clean gun",
+	L"Clean all guns",
+	L"Take off clothes",
 
 	// added by Flugente: decide what to do with the corpses
-	L"1 - 砍掉头颅 2 - 取出内脏 3 - 脱掉衣服 4 - 拿起尸体", //L"1 - Decapitate 2 - Gut 3 - Take Clothes 4 - Take Body",
+	L"What do you want to do with the body?",
+	L"Decapitate",
+	L"Gut",
+	L"Take Clothes",
+	L"Take Body",
 
 	// Flugente: weapon cleaning
-	L"%s 清理了 %s", //L"%s cleaned %s",
+	L"%s cleaned %s",
 
 	// added by Flugente: decide what to do with prisoners
-	L"你现在没有可用的监狱关押这些俘虏，你不得不放他们走。", //L"You have no prison for these prisoners, you have to let them go",
-	L"Yes - 将俘虏送入监狱      No - 放俘虏离开这里", //L"Yes - Send prisoners to jail      No - Let them go",
-	L"劝说敌人投降？", //L"Ask enemy for surrender?",
-	L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",	// TODO.Translate
+	L"You have no prison for these prisoners, you have to let them go",
+	L"Yes - Send prisoners to jail      No - Let them go",
+	L"What do you want to do?",
+	L"Demand surrender",
+	L"Offer surrender",
+	L"Talk",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_DutchText.cpp

@@ -2904,20 +2904,30 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Health: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 	L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 
-	// added by Flugente: selection of a function to call in tactical
-	L"1 - Fill Canteens 2 - Clean one gun 3 - Clean all guns 4 - Take off clothes",	// TODO.Translate
+	// added by Flugente: selection of a function to call in tactical	// TODO.Translate
+	L"What do you want to do?",
+	L"Fill canteens",
+	L"Clean gun",
+	L"Clean all guns",
+	L"Take off clothes",
 
 	// added by Flugente: decide what to do with the corpses
-	L"1 - Decapitate 2 - Gut 3 - Take Clothes 4 - Take Body",	// TODO.Translate
+	L"What do you want to do with the body?",
+	L"Decapitate",
+	L"Gut",
+	L"Take Clothes",
+	L"Take Body",
 
-	// Flugente: weapon cleaning	// TODO.Translate
+	// Flugente: weapon cleaning
 	L"%s cleaned %s",
 
-	// added by Flugente: decide what to do with prisoners	// TODO.Translate
+	// added by Flugente: decide what to do with prisoners
 	L"You have no prison for these prisoners, you have to let them go",
 	L"Yes - Send prisoners to jail      No - Let them go",
-	L"Ask enemy for surrender?",
-	L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",
+	L"What do you want to do?",
+	L"Demand surrender",
+	L"Offer surrender",
+	L"Talk",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_EnglishText.cpp

@@ -2907,10 +2907,18 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 
 	// added by Flugente: selection of a function to call in tactical
-	L"1 - Fill Canteens 2 - Clean one gun 3 - Clean all guns 4 - Take off clothes",
+	L"What do you want to do?",
+	L"Fill canteens",
+	L"Clean gun",
+	L"Clean all guns",
+	L"Take off clothes",
 
 	// added by Flugente: decide what to do with the corpses
-	L"1 - Decapitate 2 - Gut 3 - Take Clothes 4 - Take Body",
+	L"What do you want to do with the body?",
+	L"Decapitate",
+	L"Gut",
+	L"Take Clothes",
+	L"Take Body",
 
 	// Flugente: weapon cleaning
 	L"%s cleaned %s",
@@ -2918,7 +2926,10 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	// added by Flugente: decide what to do with prisoners
 	L"You have no prison for these prisoners, you have to let them go",
 	L"Yes - Send prisoners to jail      No - Let them go",
-	L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",
+	L"What do you want to do?",
+	L"Demand surrender",
+	L"Offer surrender",
+	L"Talk",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_FrenchText.cpp

@@ -2911,20 +2911,30 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Health: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 	L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 
-	// added by Flugente: selection of a function to call in tactical
-	L"1 - Fill Canteens 2 - Clean one gun 3 - Clean all guns 4 - Take off clothes",	// TODO.Translate
+	// added by Flugente: selection of a function to call in tactical	// TODO.Translate
+	L"What do you want to do?",
+	L"Fill canteens",
+	L"Clean gun",
+	L"Clean all guns",
+	L"Take off clothes",
 
 	// added by Flugente: decide what to do with the corpses
-	L"1 - Decapitate 2 - Gut 3 - Take Clothes 4 - Take Body",	// TODO.Translate
+	L"What do you want to do with the body?",
+	L"Decapitate",
+	L"Gut",
+	L"Take Clothes",
+	L"Take Body",
 
-	// Flugente: weapon cleaning	// TODO.Translate
+	// Flugente: weapon cleaning
 	L"%s cleaned %s",
 
-	// added by Flugente: decide what to do with prisoners	// TODO.Translate
+	// added by Flugente: decide what to do with prisoners
 	L"You have no prison for these prisoners, you have to let them go",
 	L"Yes - Send prisoners to jail      No - Let them go",
-	L"Ask enemy for surrender?",
-	L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",	// TODO.Translate
+	L"What do you want to do?",
+	L"Demand surrender",
+	L"Offer surrender",
+	L"Talk",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_GermanText.cpp

@@ -2909,20 +2909,30 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Gesundheit: %d/%d\nAusdauer: %d/%d\nMoral: %s\nWasser: %d%s\nEssen: %d%s",
 	L"Ges.: %d/%d\nGift: %d/%d\nAusd.: %d/%d\nMoral: %s\nWasser: %d%s\nEssen: %d%s",
 
-	// added by Flugente: selection of a function to call in tactical
-	L"1 - Fill Canteens 2 - Clean one gun 3 - Clean all guns 4 - Take off clothes",	// TODO.Translate
+	// added by Flugente: selection of a function to call in tactical	// TODO.Translate
+	L"What do you want to do?",
+	L"Fill canteens",
+	L"Clean gun",
+	L"Clean all guns",
+	L"Take off clothes",
 
 	// added by Flugente: decide what to do with the corpses
-	L"1 - Decapitate 2 - Gut 3 - Take Clothes 4 - Take Body",	// TODO.Translate
+	L"What do you want to do with the body?",
+	L"Decapitate",
+	L"Gut",
+	L"Take Clothes",
+	L"Take Body",
 
-	// Flugente: weapon cleaning	// TODO.Translate
+	// Flugente: weapon cleaning
 	L"%s cleaned %s",
 
-	// added by Flugente: decide what to do with prisoners	// TODO.Translate
+	// added by Flugente: decide what to do with prisoners
 	L"You have no prison for these prisoners, you have to let them go",
 	L"Yes - Send prisoners to jail      No - Let them go",
-	L"Ask enemy for surrender?",
-	L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",	// TODO.Translate
+	L"What do you want to do?",
+	L"Demand surrender",
+	L"Offer surrender",
+	L"Talk",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_ItalianText.cpp

@@ -2899,20 +2899,30 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Health: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 	L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 
-	// added by Flugente: selection of a function to call in tactical
-	L"1 - Fill Canteens 2 - Clean one gun 3 - Clean all guns 4 - Take off clothes",	// TODO.Translate
+	// added by Flugente: selection of a function to call in tactical	// TODO.Translate
+	L"What do you want to do?",
+	L"Fill canteens",
+	L"Clean gun",
+	L"Clean all guns",
+	L"Take off clothes",
 
 	// added by Flugente: decide what to do with the corpses
-	L"1 - Decapitate 2 - Gut 3 - Take Clothes 4 - Take Body",	// TODO.Translate
+	L"What do you want to do with the body?",
+	L"Decapitate",
+	L"Gut",
+	L"Take Clothes",
+	L"Take Body",
 
-	// Flugente: weapon cleaning	// TODO.Translate
+	// Flugente: weapon cleaning
 	L"%s cleaned %s",
 
-	// added by Flugente: decide what to do with prisoners	// TODO.Translate
+	// added by Flugente: decide what to do with prisoners
 	L"You have no prison for these prisoners, you have to let them go",
 	L"Yes - Send prisoners to jail      No - Let them go",
-	L"Ask enemy for surrender?",
-	L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",	// TODO.Translate
+	L"What do you want to do?",
+	L"Demand surrender",
+	L"Offer surrender",
+	L"Talk",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_PolishText.cpp

@@ -2914,20 +2914,30 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Health: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 	L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 
-	// added by Flugente: selection of a function to call in tactical
-	L"1 - Fill Canteens 2 - Clean one gun 3 - Clean all guns 4 - Take off clothes",	// TODO.Translate
+	// added by Flugente: selection of a function to call in tactical	// TODO.Translate
+	L"What do you want to do?",
+	L"Fill canteens",
+	L"Clean gun",
+	L"Clean all guns",
+	L"Take off clothes",
 
 	// added by Flugente: decide what to do with the corpses
-	L"1 - Decapitate 2 - Gut 3 - Take Clothes 4 - Take Body",	// TODO.Translate
+	L"What do you want to do with the body?",
+	L"Decapitate",
+	L"Gut",
+	L"Take Clothes",
+	L"Take Body",
 
-	// Flugente: weapon cleaning	// TODO.Translate
+	// Flugente: weapon cleaning
 	L"%s cleaned %s",
 
-	// added by Flugente: decide what to do with prisoners	// TODO.Translate
+	// added by Flugente: decide what to do with prisoners
 	L"You have no prison for these prisoners, you have to let them go",
 	L"Yes - Send prisoners to jail      No - Let them go",
-	L"Ask enemy for surrender?",
-	L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",	// TODO.Translate
+	L"What do you want to do?",
+	L"Demand surrender",
+	L"Offer surrender",
+	L"Talk",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_RussianText.cpp

@@ -2907,20 +2907,30 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Health: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 	L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 
-	// added by Flugente: selection of a function to call in tactical
-	L"1 - Fill Canteens 2 - Clean one gun 3 - Clean all guns 4 - Take off clothes",	// TODO.Translate
+	// added by Flugente: selection of a function to call in tactical	// TODO.Translate
+	L"What do you want to do?",
+	L"Fill canteens",
+	L"Clean gun",
+	L"Clean all guns",
+	L"Take off clothes",
 
 	// added by Flugente: decide what to do with the corpses
-	L"1 - Decapitate 2 - Gut 3 - Take Clothes 4 - Take Body",	// TODO.Translate
+	L"What do you want to do with the body?",
+	L"Decapitate",
+	L"Gut",
+	L"Take Clothes",
+	L"Take Body",
 
-	// Flugente: weapon cleaning	// TODO.Translate
+	// Flugente: weapon cleaning
 	L"%s cleaned %s",
 
-	// added by Flugente: decide what to do with prisoners	// TODO.Translate
+	// added by Flugente: decide what to do with prisoners
 	L"You have no prison for these prisoners, you have to let them go",
 	L"Yes - Send prisoners to jail      No - Let them go",
-	L"Ask enemy for surrender?",
-	L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",	// TODO.Translate
+	L"What do you want to do?",
+	L"Demand surrender",
+	L"Offer surrender",
+	L"Talk",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_TaiwaneseText.cpp

@@ -2908,20 +2908,30 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Health: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 	L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
 
-	// added by Flugente: selection of a function to call in tactical
-	L"1 - Fill Canteens 2 - Clean one gun 3 - Clean all guns 4 - Take off clothes",	// TODO.Translate
+	// added by Flugente: selection of a function to call in tactical	// TODO.Translate
+	L"What do you want to do?",
+	L"Fill canteens",
+	L"Clean gun",
+	L"Clean all guns",
+	L"Take off clothes",
 
 	// added by Flugente: decide what to do with the corpses
-	L"1 - Decapitate 2 - Gut 3 - Take Clothes 4 - Take Body",	// TODO.Translate
+	L"What do you want to do with the body?",
+	L"Decapitate",
+	L"Gut",
+	L"Take Clothes",
+	L"Take Body",
 
-	// Flugente: weapon cleaning	// TODO.Translate
+	// Flugente: weapon cleaning
 	L"%s cleaned %s",
 
-	// added by Flugente: decide what to do with prisoners	// TODO.Translate
+	// added by Flugente: decide what to do with prisoners
 	L"You have no prison for these prisoners, you have to let them go",
 	L"Yes - Send prisoners to jail      No - Let them go",
-	L"Ask enemy for surrender?",
-	L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",	// TODO.Translate
+	L"What do you want to do?",
+	L"Demand surrender",
+	L"Offer surrender",
+	L"Talk",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.