Merged from revision: 7668

- Externalized hardcoded TownInfo text which shows the number of Total # of prisoners/capacity, to language text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-12-01 20:57:11 +00:00
parent 5064e59785
commit 0ef41fffd7
9 changed files with 10 additions and 2 deletions
@@ -456,9 +456,9 @@ void AddTextToTownBox( void )
}
// prisoners
swprintf( wString, L"%s:", pwTownInfoStrings[13] );
swprintf( wString, L"%s:", pwTownInfoStrings[ 13 ] );
AddMonoString( &hStringHandle, wString );
swprintf( wString, L"%d/%d - %dA %dR %dE %dO %dG", numprisoners, capacity, aPrisoners[PRISONER_ADMIN], aPrisoners[PRISONER_REGULAR], aPrisoners[PRISONER_ELITE], aPrisoners[PRISONER_OFFICER], aPrisoners[PRISONER_GENERAL] );
swprintf( wString, pwTownInfoStrings[ 14 ], numprisoners, capacity, aPrisoners[PRISONER_ADMIN], aPrisoners[PRISONER_REGULAR], aPrisoners[PRISONER_ELITE], aPrisoners[PRISONER_OFFICER], aPrisoners[PRISONER_GENERAL] );
AddSecondColumnMonoString( &hStringHandle, wString );
}
}
+1
View File
@@ -3562,6 +3562,7 @@ STR16 pwTownInfoStrings[] =
L"民兵", // the state of the trained civilians in the town
L"巡逻民兵", // L"Mobile Training", // HEADROCK HAM 3.6: The stat of Mobile militia training in town
L"囚犯", // Flugente: display number of prisoners
L"%d/%d - %dA %dR %dE %dO %dG", // TODO.Translate // Info: Total # of prisoners/capacity - # of Admins # of Regulars # of Elites # of Officers # of Generals
};
// Mine strings
+1
View File
@@ -3560,6 +3560,7 @@ STR16 pwTownInfoStrings[] =
L"Militie", // the state of the trained civilians in the town
L"Mobile Training", // HEADROCK HAM 3.6: The stat of Mobile militia training in town // TODO.Translate
L"Prisoners", // Flugente: display number of prisoners // TODO.Translate
L"%d/%d - %dA %dR %dE %dO %dG", // TODO.Translate // Info: Total # of prisoners/capacity - # of Admins # of Regulars # of Elites # of Officers # of Generals
};
// Mine strings
+1
View File
@@ -3561,6 +3561,7 @@ STR16 pwTownInfoStrings[] =
L"Militia", // the state of the trained civilians in the town
L"Mobile Training", // HEADROCK HAM 3.6: The stat of Mobile militia training in town
L"Prisoners", // Flugente: display number of prisoners
L"%d/%d - %dA %dR %dE %dO %dG", // Info: Total # of prisoners/capacity - # of Admins # of Regulars # of Elites # of Officers # of Generals
};
// Mine strings
+1
View File
@@ -3565,6 +3565,7 @@ STR16 pwTownInfoStrings[] =
L"Milice ", // the state of the trained civilians in the town
L"Formation mobile ", // HEADROCK HAM 3.6: The stat of Mobile militia training in town
L"Prisonniers ", // Flugente: display number of prisoners
L"%d/%d - %dA %dR %dÉ %dO %dG", // TODO.Translate // Info: Total # of prisoners/capacity - # of Admins # of Regulars # of Elites # of Officers # of Generals
};
// Mine strings
+1
View File
@@ -3559,6 +3559,7 @@ STR16 pwTownInfoStrings[] =
L"Miliz", // the state of the trained civilians in the town
L"Mobile M. Training", // HEADROCK HAM 3.6: The stat of Mobile militia training in town
L"Prisoners", // Flugente: display number of prisoners // TODO.Translate
L"%d/%d - %dA %dR %dE %dO %dG", // TODO.Translate // Info: Total # of prisoners/capacity - # of Admins # of Regulars # of Elites # of Officers # of Generals
};
// Mine strings
+1
View File
@@ -3556,6 +3556,7 @@ STR16 pwTownInfoStrings[] =
L"Esercito", // the state of the trained civilians in the town
L"Mobile Training", // HEADROCK HAM 3.6: The stat of Mobile militia training in town // TODO.Translate
L"Prisoners", // Flugente: display number of prisoners // TODO.Translate
L"%d/%d - %dA %dR %dE %dO %dG", // TODO.Translate // Info: Total # of prisoners/capacity - # of Admins # of Regulars # of Elites # of Officers # of Generals
};
// Mine strings
+1
View File
@@ -3569,6 +3569,7 @@ STR16 pwTownInfoStrings[] =
L"Samoobrona", // the state of the trained civilians in the town
L"Mobile Training", // HEADROCK HAM 3.6: The stat of Mobile militia training in town // TODO.Translate
L"Prisoners", // Flugente: display number of prisoners // TODO.Translate
L"%d/%d - %dA %dR %dE %dO %dG", // TODO.Translate // Info: Total # of prisoners/capacity - # of Admins # of Regulars # of Elites # of Officers # of Generals
};
// Mine strings
+1
View File
@@ -3557,6 +3557,7 @@ STR16 pwTownInfoStrings[] =
L"Ополчение", // the state of the trained civilians in the town
L"Тренинг мобильных групп", // HEADROCK HAM 3.6: The stat of Mobile militia training in town //Mobile Training
L"Заключенные", // Flugente: display number of prisoners
L"%d/%d - %dA %dR %dE %dO %dG", // TODO.Translate // Info: Total # of prisoners/capacity - # of Admins # of Regulars # of Elites # of Officers # of Generals
};
// Mine strings