From 484b353b1c228b5f8c03953de7c79aed0222dbf3 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 18 Oct 2013 07:03:41 +0000 Subject: [PATCH] - Fixed compilation error git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6506 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 2 +- Utils/_DutchText.cpp | 2 +- Utils/_EnglishText.cpp | 2 +- Utils/_FrenchText.cpp | 2 +- Utils/_GermanText.cpp | 2 +- Utils/_ItalianText.cpp | 2 +- Utils/_PolishText.cpp | 2 +- Utils/_RussianText.cpp | 2 +- Utils/_TaiwaneseText.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 62b7a8a7..54c50d4b 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -2368,7 +2368,7 @@ void LoadModSettings(){ gModSettings.ubOmertaDropOffY = iniReader.ReadInteger("Gear Dropoff", "OMERTA_DROPOFF_Y", 1); gModSettings.ubOmertaDropOffZ = iniReader.ReadInteger("Gear Dropoff", "OMERTA_DROPOFF_Z", 0); gModSettings.iOmertaDropOff = iniReader.ReadInteger("Gear Dropoff", "OMERTA_DROPOFF_GRIDNO", 4868); - gModSettings.iBobbyRDropOff = iniReader.ReadInteger("Gear Dropoff", "BOBBYR_DROPOFF_GRIDNO", 10433); + gModSettings.iAirportDropOff = iniReader.ReadInteger("Gear Dropoff", "AIRPORT_DROPOFF_GRIDNO", 10433); gModSettings.ubBobbyRShipDestSectorX = iniReader.ReadInteger("Bobby Ray", "BOBBYR_SHIPPING_DEST_SECTOR_X", 13); gModSettings.ubBobbyRShipDestSectorY = iniReader.ReadInteger("Bobby Ray", "BOBBYR_SHIPPING_DEST_SECTOR_Y", 2); diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index e49d4986..bdf06f33 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -1735,7 +1735,7 @@ STR16 pPersonnelAssignmentStrings[] = L"Training Mobile Militia", // TODO.Translate L"Trainer", // training a teammate L"Student", // being trained by someone else - L"MoveItem", // move items // TODO.Translate + L"Move item", // move items // TODO.Translate L"Facility Staff", // TODO.Translate L"Eat", // eating at a facility (cantina etc.) // TODO.Translate L"Resting at Facility", // TODO.Translate diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index d8f4c51c..aef06b73 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -1739,7 +1739,7 @@ STR16 pPersonnelAssignmentStrings[] = L"Training Mobile Militia", // Missing L"Trainer", L"Student", - L"MoveItem", // move items + L"Move item", // move items L"Facility Staff", // Missing L"Eat", // eating at a facility (cantina etc.) L"Resting at Facility", // Missing diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 741658dc..59518c4e 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -1742,7 +1742,7 @@ STR16 pPersonnelAssignmentStrings[] = L"Forme la milice mobile",//!!! Too long ? -> It is OK L"Entraîneur", L"Élève", - L"MoveItem", // move items // TODO.Translate + L"Move item", // move items // TODO.Translate L"Exploitation infras.", //!!! Idem ? -> The current translation is OK L"Manger", // eating at a facility (cantina etc.) L"Repos infras.", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 34b19280..ca4ff8ea 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -1744,7 +1744,7 @@ STR16 pPersonnelAssignmentStrings[] = L"Trainiere Mobile Miliz", L"Trainer", L"Rekrut", - L"Umzug/ move items + L"Gegenstand verschieben", L"Betriebspersonal", L"Essen", // eating at a facility (cantina etc.) L"Betriebspause", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index d8ee25b1..443aff4e 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -1731,7 +1731,7 @@ STR16 pPersonnelAssignmentStrings[] = L"Training Mobile Militia", // TODO.Translate L"Allenatore", L"Studente", - L"MoveItem", // move items // TODO.Translate + L"Move item", // move items // TODO.Translate L"Facility Staff", // TODO.Translate L"Eat", // eating at a facility (cantina etc.) // TODO.Translate L"Resting at Facility", // TODO.Translate diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 7eff5b8a..f1c34622 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -1747,7 +1747,7 @@ STR16 pPersonnelAssignmentStrings[] = L"Training Mobile Militia", // TODO.Translate L"Instruktor", L"Uczeń", - L"MoveItem", // move items // TODO.Translate + L"Move item", // move items // TODO.Translate L"Facility Staff", // TODO.Translate L"Eat", // eating at a facility (cantina etc.) // TODO.Translate L"Resting at Facility", // TODO.Translate diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 27528161..60567b2e 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -1739,7 +1739,7 @@ STR16 pPersonnelAssignmentStrings[] = L"Тренирует мобильную группу", //Training Mobile Militia L"Тренер", L"Ученик", - L"MoveItem", // move items // TODO.Translate + L"Move item", // move items // TODO.Translate L"Работает с населением", //Facility Staff L"Eat", // eating at a facility (cantina etc.) // TODO.Translate L"Отдыхает", //Resting at Facility diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index b679c40f..dc513cda 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -1739,7 +1739,7 @@ STR16 pPersonnelAssignmentStrings[] = L"Training Mobile Militia", // TODO.Translate L"Trainer", L"Student", - L"MoveItem", // move items // TODO.Translate + L"Move item", // move items // TODO.Translate L"Facility Staff", // TODO.Translate L"Eat", // eating at a facility (cantina etc.) // TODO.Translate L"Resting at Facility", // TODO.Translate