Bugfixes / Improvements (macros) of Assignments (by Franimus)

- Fixed warning for INT8 overflow on scroll region priority, seemingly had no effect though
- Use new assignment macros
- Bugfix - POWs' activity level being overwritten
- Feature - automatically bandage bleeding mercs on a PATIENT assignment
- Bugfix - mercs treated at facilities should not use mercs' medkits
- Added 3 new enums for facility doctor, patient, and repair
- Bugfix for facility patients not detected as being in a facility
- Bugfix - iBurstAPCost was ignoring half of its calculation due to extraneous semicolon


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2015-09-12 11:27:28 +00:00
parent 3ab623e452
commit a2589f7034
21 changed files with 242 additions and 150 deletions
+9
View File
@@ -1866,6 +1866,9 @@ STR16 pAssignmentStrings[] =
L"Command", // militia movement orders
L"Diagnose", // disease diagnosis //TODO.Translate
L"Treat D.", // treat disease among the population
L"医生",// administering medical aid
L"病人", // getting medical aid
L"修理", // repairing
};
@@ -1964,6 +1967,9 @@ STR16 pPersonnelAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"医生",
L"病人",
L"修理",
};
@@ -2021,6 +2027,9 @@ STR16 pLongAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"医生",
L"病人",
L"修理",
};
+9
View File
@@ -1863,6 +1863,9 @@ STR16 pAssignmentStrings[] =
L"Command", // militia movement orders
L"Diagnose", // disease diagnosis //TODO.Translate
L"Treat D.", // treat disease among the population
L"Dokter", // administering medical aid
L"Patiënt", // getting medical aid
L"Repareer", // repairing
};
@@ -1961,6 +1964,9 @@ STR16 pPersonnelAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Dokter", // administering medical aid
L"Patiënt", // getting medical aid
L"Repareer", // repairing
};
@@ -2018,6 +2024,9 @@ STR16 pLongAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Dokter", // administering medical aid
L"Patiënt", // getting medical aid
L"Repareer", // repairing
};
+9
View File
@@ -1867,6 +1867,9 @@ STR16 pAssignmentStrings[] =
L"Command", // militia movement orders
L"Diagnose", // disease diagnosis
L"Treat D.", // treat disease among the population
L"Doctor", // administering medical aid
L"Patient", // getting medical aid
L"Repair", // repairing
};
@@ -1965,6 +1968,9 @@ STR16 pPersonnelAssignmentStrings[] =
L"Commanding Militia", // militia movement orders
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Doctor",
L"Patient",
L"Repair",
};
@@ -2022,6 +2028,9 @@ STR16 pLongAssignmentStrings[] =
L"Commanding Militia", // militia movement orders
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Doctor",
L"Patient",
L"Repair",
};
+9
View File
@@ -1873,6 +1873,9 @@ STR16 pAssignmentStrings[] =
L"Command.", // militia movement orders
L"Diagnose", // disease diagnosis //TODO.Translate
L"Treat D.", // treat disease among the population
L"Docteur", // administering medical aid
L"Patient(e)", // getting medical aid
L"Réparat.", // repairing
};
@@ -1971,6 +1974,9 @@ STR16 pPersonnelAssignmentStrings[] =
L"Commande", // militia movement orders
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Docteur",
L"Patient",
L"Réparation",
};
@@ -2028,6 +2034,9 @@ STR16 pLongAssignmentStrings[] =
L"Commander", // militia movement orders
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Docteur",
L"Patient",
L"Réparation",
};
+9
View File
@@ -1878,6 +1878,9 @@ STR16 pAssignmentStrings[] =
L"Command", // militia movement orders
L"Diagnose", // disease diagnosis //TODO.Translate
L"Treat D.", // treat disease among the population
L"Doktor", // administering medical aid
L"Patient", // getting medical aid
L"Repar.", // repairing
};
STR16 pMilitiaString[] =
@@ -1972,6 +1975,9 @@ STR16 pPersonnelAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Doktor",
L"Patient",
L"Reparieren",
};
// refer to above for comments
@@ -2027,6 +2033,9 @@ STR16 pLongAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Doktor",
L"Patient",
L"Reparieren",
};
// the contract options
+9
View File
@@ -1859,6 +1859,9 @@ STR16 pAssignmentStrings[] =
L"Command", // militia movement orders
L"Diagnose", // disease diagnosis //TODO.Translate
L"Treat D.", // treat disease among the population
L"Dottore", // administering medical aid
L"Paziente", // getting medical aid
L"Riparare", // repairing
};
@@ -1957,6 +1960,9 @@ STR16 pPersonnelAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Dottore",
L"Paziente",
L"Riparare",
};
@@ -2014,6 +2020,9 @@ STR16 pLongAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Dottore",
L"Paziente",
L"Ripara",
};
+9
View File
@@ -1875,6 +1875,9 @@ STR16 pAssignmentStrings[] =
L"Command", // militia movement orders
L"Diagnose", // disease diagnosis //TODO.Translate
L"Treat D.", // treat disease among the population
L"Lekarz", // administering medical aid
L"Pacjent", // getting medical aid
L"Naprawa", // repairing
};
@@ -1973,6 +1976,9 @@ STR16 pPersonnelAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Lekarz",
L"Pacjent",
L"Naprawa",
};
@@ -2030,6 +2036,9 @@ STR16 pLongAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Lekarz",
L"Pacjent",
L"Naprawa",
};
+9
View File
@@ -1867,6 +1867,9 @@ STR16 pAssignmentStrings[] =
L"Command", // militia movement orders //TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat D.", // treat disease among the population
L"Медик", // administering medical aid
L"Пациент", // getting medical aid
L"Ремонт", // repairing
};
@@ -1965,6 +1968,9 @@ STR16 pPersonnelAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Медик",
L"Пациент",
L"Ремонт",
};
@@ -2022,6 +2028,9 @@ STR16 pLongAssignmentStrings[] =
L"Commanding Militia", // militia movement orders // TODO.Translate
L"Diagnose", // disease diagnosis
L"Treat Population disease", // treat disease among the population
L"Медик",
L"Пациент",
L"Ремонтирует",
};