- new feature: we can now equip militia with gear from sectors, see http://www.bears-pit.com/board/ubbthreads.php/topics/315664.html#Post315664 for more information

- increased the object flag size to UINT64, this breaks savegame compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5869 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-02-23 18:32:55 +00:00
parent 01e2d1b29c
commit 59b2549bd6
38 changed files with 1425 additions and 49 deletions
+2
View File
@@ -946,6 +946,8 @@ enum
PRISONER_DEMAND_SURRENDER_STR,
PRISONER_OFFER_SURRENDER_STR,
PRISONER_TALK_STR,
MILITIA_DROP_EQ_STR,
UNUSED_STR,
TEXT_NUM_TACTICAL_STR
};
+2
View File
@@ -2931,6 +2931,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"劝说敌人投降",
L"Offer surrender",//TODO.Translate
L"交谈",
L"Militia inspection",//TODO.Translate
L"unused",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
+2
View File
@@ -2928,6 +2928,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Demand surrender",
L"Offer surrender",
L"Talk",
L"Militia inspection",//TODO.Translate
L"unused",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
+2
View File
@@ -2930,6 +2930,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Demand surrender",
L"Offer surrender",
L"Talk",
L"Militia inspection",
L"unused",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
+2
View File
@@ -2935,6 +2935,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Demand surrender",
L"Offer surrender",
L"Talk",
L"Militia inspection",//TODO.Translate
L"unused",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
+2
View File
@@ -2933,6 +2933,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Aufgabe einfordern",
L"Aufgabe anbieten",
L"Sprechen",
L"Militia inspection",//TODO.Translate
L"unused",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
+2
View File
@@ -2923,6 +2923,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Demand surrender",
L"Offer surrender",
L"Talk",
L"Militia inspection",//TODO.Translate
L"unused",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
+2
View File
@@ -2938,6 +2938,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Demand surrender",
L"Offer surrender",
L"Talk",
L"Militia inspection",//TODO.Translate
L"unused",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
+2
View File
@@ -2930,6 +2930,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Требовать сдаться",
L"Предлоить сдаться",
L"Переговоры",
L"Militia inspection",//TODO.Translate
L"unused",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
+2
View File
@@ -2932,6 +2932,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Demand surrender",
L"Offer surrender",
L"Talk",
L"Militia inspection",//TODO.Translate
L"unused",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.