diff --git a/projects/generate b/projects/generate index a57803529b..8efa19deca 100755 --- a/projects/generate +++ b/projects/generate @@ -153,7 +153,7 @@ load_lang_data() { Name=\"VCCustomBuildTool\" Description=\"Generating "$i" language file\" CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang "\$(InputPath)" \" - AdditionalDependencies=\"\" + AdditionalDependencies=\"..\\src\\lang\\english.txt\" Outputs=\"..\\bin\\lang\\"$i".lng\" /> diff --git a/projects/generate.vbs b/projects/generate.vbs index 9ca4a97aa0..3453592338 100755 --- a/projects/generate.vbs +++ b/projects/generate.vbs @@ -203,7 +203,7 @@ Function load_lang_data(dir) & vbCrLf & " Name=" & Chr(34) & "VCCustomBuildTool" & Chr(34) _ & vbCrLf & " Description=" & Chr(34) & "Generating " & file & " language file" & Chr(34) _ & vbCrLf & " CommandLine=" & Chr(34) & "..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " & Chr(34) _ - & vbCrLf & " AdditionalDependencies=" & Chr(34) & Chr(34) _ + & vbCrLf & " AdditionalDependencies=" & Chr(34) & "..\src\lang\english.txt" & Chr(34) _ & vbCrLf & " Outputs=" & Chr(34) & "..\bin\lang\" & file & ".lng" & Chr(34) _ & vbCrLf & " />" _ & vbCrLf & " " _ diff --git a/projects/langs_vs80.vcproj b/projects/langs_vs80.vcproj index ead33f3934..2414733571 100644 --- a/projects/langs_vs80.vcproj +++ b/projects/langs_vs80.vcproj @@ -56,7 +56,7 @@ Name="VCCustomBuildTool" Description="Generating afrikaans language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\afrikaans.lng" /> @@ -71,7 +71,7 @@ Name="VCCustomBuildTool" Description="Generating arabic_egypt language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\arabic_egypt.lng" /> @@ -86,7 +86,7 @@ Name="VCCustomBuildTool" Description="Generating brazilian_portuguese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\brazilian_portuguese.lng" /> @@ -101,7 +101,7 @@ Name="VCCustomBuildTool" Description="Generating bulgarian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\bulgarian.lng" /> @@ -116,7 +116,7 @@ Name="VCCustomBuildTool" Description="Generating catalan language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\catalan.lng" /> @@ -131,7 +131,7 @@ Name="VCCustomBuildTool" Description="Generating croatian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\croatian.lng" /> @@ -146,7 +146,7 @@ Name="VCCustomBuildTool" Description="Generating czech language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\czech.lng" /> @@ -161,7 +161,7 @@ Name="VCCustomBuildTool" Description="Generating danish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\danish.lng" /> @@ -176,7 +176,7 @@ Name="VCCustomBuildTool" Description="Generating dutch language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\dutch.lng" /> @@ -191,7 +191,7 @@ Name="VCCustomBuildTool" Description="Generating english language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\english.lng" /> @@ -206,7 +206,7 @@ Name="VCCustomBuildTool" Description="Generating english_US language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\english_US.lng" /> @@ -221,7 +221,7 @@ Name="VCCustomBuildTool" Description="Generating esperanto language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\esperanto.lng" /> @@ -236,7 +236,7 @@ Name="VCCustomBuildTool" Description="Generating estonian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\estonian.lng" /> @@ -251,7 +251,7 @@ Name="VCCustomBuildTool" Description="Generating finnish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\finnish.lng" /> @@ -266,7 +266,7 @@ Name="VCCustomBuildTool" Description="Generating french language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\french.lng" /> @@ -281,7 +281,7 @@ Name="VCCustomBuildTool" Description="Generating galician language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\galician.lng" /> @@ -296,7 +296,7 @@ Name="VCCustomBuildTool" Description="Generating german language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\german.lng" /> @@ -311,7 +311,7 @@ Name="VCCustomBuildTool" Description="Generating hebrew language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\hebrew.lng" /> @@ -326,7 +326,7 @@ Name="VCCustomBuildTool" Description="Generating hungarian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\hungarian.lng" /> @@ -341,7 +341,7 @@ Name="VCCustomBuildTool" Description="Generating icelandic language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\icelandic.lng" /> @@ -356,7 +356,7 @@ Name="VCCustomBuildTool" Description="Generating indonesian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\indonesian.lng" /> @@ -371,7 +371,7 @@ Name="VCCustomBuildTool" Description="Generating italian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\italian.lng" /> @@ -386,7 +386,7 @@ Name="VCCustomBuildTool" Description="Generating japanese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\japanese.lng" /> @@ -401,7 +401,7 @@ Name="VCCustomBuildTool" Description="Generating korean language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\korean.lng" /> @@ -416,7 +416,7 @@ Name="VCCustomBuildTool" Description="Generating latvian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\latvian.lng" /> @@ -431,7 +431,7 @@ Name="VCCustomBuildTool" Description="Generating lithuanian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\lithuanian.lng" /> @@ -446,7 +446,7 @@ Name="VCCustomBuildTool" Description="Generating luxembourgish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\luxembourgish.lng" /> @@ -461,7 +461,7 @@ Name="VCCustomBuildTool" Description="Generating norwegian_bokmal language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\norwegian_bokmal.lng" /> @@ -476,7 +476,7 @@ Name="VCCustomBuildTool" Description="Generating norwegian_nynorsk language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\norwegian_nynorsk.lng" /> @@ -491,7 +491,7 @@ Name="VCCustomBuildTool" Description="Generating piglatin language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\piglatin.lng" /> @@ -506,7 +506,7 @@ Name="VCCustomBuildTool" Description="Generating polish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\polish.lng" /> @@ -521,7 +521,7 @@ Name="VCCustomBuildTool" Description="Generating portuguese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\portuguese.lng" /> @@ -536,7 +536,7 @@ Name="VCCustomBuildTool" Description="Generating romanian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\romanian.lng" /> @@ -551,7 +551,7 @@ Name="VCCustomBuildTool" Description="Generating russian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\russian.lng" /> @@ -566,7 +566,7 @@ Name="VCCustomBuildTool" Description="Generating serbian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\serbian.lng" /> @@ -581,7 +581,7 @@ Name="VCCustomBuildTool" Description="Generating simplified_chinese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\simplified_chinese.lng" /> @@ -596,7 +596,7 @@ Name="VCCustomBuildTool" Description="Generating slovak language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\slovak.lng" /> @@ -611,7 +611,7 @@ Name="VCCustomBuildTool" Description="Generating slovenian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\slovenian.lng" /> @@ -626,7 +626,7 @@ Name="VCCustomBuildTool" Description="Generating spanish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\spanish.lng" /> @@ -641,7 +641,7 @@ Name="VCCustomBuildTool" Description="Generating swedish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\swedish.lng" /> @@ -656,7 +656,7 @@ Name="VCCustomBuildTool" Description="Generating traditional_chinese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\traditional_chinese.lng" /> @@ -671,7 +671,7 @@ Name="VCCustomBuildTool" Description="Generating turkish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\turkish.lng" /> @@ -686,7 +686,7 @@ Name="VCCustomBuildTool" Description="Generating ukrainian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\ukrainian.lng" /> @@ -701,7 +701,7 @@ Name="VCCustomBuildTool" Description="Generating welsh language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\welsh.lng" /> diff --git a/projects/langs_vs90.vcproj b/projects/langs_vs90.vcproj index d614018592..e03b3fc227 100644 --- a/projects/langs_vs90.vcproj +++ b/projects/langs_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCCustomBuildTool" Description="Generating afrikaans language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\afrikaans.lng" /> @@ -72,7 +72,7 @@ Name="VCCustomBuildTool" Description="Generating arabic_egypt language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\arabic_egypt.lng" /> @@ -87,7 +87,7 @@ Name="VCCustomBuildTool" Description="Generating brazilian_portuguese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\brazilian_portuguese.lng" /> @@ -102,7 +102,7 @@ Name="VCCustomBuildTool" Description="Generating bulgarian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\bulgarian.lng" /> @@ -117,7 +117,7 @@ Name="VCCustomBuildTool" Description="Generating catalan language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\catalan.lng" /> @@ -132,7 +132,7 @@ Name="VCCustomBuildTool" Description="Generating croatian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\croatian.lng" /> @@ -147,7 +147,7 @@ Name="VCCustomBuildTool" Description="Generating czech language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\czech.lng" /> @@ -162,7 +162,7 @@ Name="VCCustomBuildTool" Description="Generating danish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\danish.lng" /> @@ -177,7 +177,7 @@ Name="VCCustomBuildTool" Description="Generating dutch language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\dutch.lng" /> @@ -192,7 +192,7 @@ Name="VCCustomBuildTool" Description="Generating english language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\english.lng" /> @@ -207,7 +207,7 @@ Name="VCCustomBuildTool" Description="Generating english_US language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\english_US.lng" /> @@ -222,7 +222,7 @@ Name="VCCustomBuildTool" Description="Generating esperanto language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\esperanto.lng" /> @@ -237,7 +237,7 @@ Name="VCCustomBuildTool" Description="Generating estonian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\estonian.lng" /> @@ -252,7 +252,7 @@ Name="VCCustomBuildTool" Description="Generating finnish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\finnish.lng" /> @@ -267,7 +267,7 @@ Name="VCCustomBuildTool" Description="Generating french language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\french.lng" /> @@ -282,7 +282,7 @@ Name="VCCustomBuildTool" Description="Generating galician language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\galician.lng" /> @@ -297,7 +297,7 @@ Name="VCCustomBuildTool" Description="Generating german language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\german.lng" /> @@ -312,7 +312,7 @@ Name="VCCustomBuildTool" Description="Generating hebrew language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\hebrew.lng" /> @@ -327,7 +327,7 @@ Name="VCCustomBuildTool" Description="Generating hungarian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\hungarian.lng" /> @@ -342,7 +342,7 @@ Name="VCCustomBuildTool" Description="Generating icelandic language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\icelandic.lng" /> @@ -357,7 +357,7 @@ Name="VCCustomBuildTool" Description="Generating indonesian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\indonesian.lng" /> @@ -372,7 +372,7 @@ Name="VCCustomBuildTool" Description="Generating italian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\italian.lng" /> @@ -387,7 +387,7 @@ Name="VCCustomBuildTool" Description="Generating japanese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\japanese.lng" /> @@ -402,7 +402,7 @@ Name="VCCustomBuildTool" Description="Generating korean language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\korean.lng" /> @@ -417,7 +417,7 @@ Name="VCCustomBuildTool" Description="Generating latvian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\latvian.lng" /> @@ -432,7 +432,7 @@ Name="VCCustomBuildTool" Description="Generating lithuanian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\lithuanian.lng" /> @@ -447,7 +447,7 @@ Name="VCCustomBuildTool" Description="Generating luxembourgish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\luxembourgish.lng" /> @@ -462,7 +462,7 @@ Name="VCCustomBuildTool" Description="Generating norwegian_bokmal language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\norwegian_bokmal.lng" /> @@ -477,7 +477,7 @@ Name="VCCustomBuildTool" Description="Generating norwegian_nynorsk language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\norwegian_nynorsk.lng" /> @@ -492,7 +492,7 @@ Name="VCCustomBuildTool" Description="Generating piglatin language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\piglatin.lng" /> @@ -507,7 +507,7 @@ Name="VCCustomBuildTool" Description="Generating polish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\polish.lng" /> @@ -522,7 +522,7 @@ Name="VCCustomBuildTool" Description="Generating portuguese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\portuguese.lng" /> @@ -537,7 +537,7 @@ Name="VCCustomBuildTool" Description="Generating romanian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\romanian.lng" /> @@ -552,7 +552,7 @@ Name="VCCustomBuildTool" Description="Generating russian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\russian.lng" /> @@ -567,7 +567,7 @@ Name="VCCustomBuildTool" Description="Generating serbian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\serbian.lng" /> @@ -582,7 +582,7 @@ Name="VCCustomBuildTool" Description="Generating simplified_chinese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\simplified_chinese.lng" /> @@ -597,7 +597,7 @@ Name="VCCustomBuildTool" Description="Generating slovak language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\slovak.lng" /> @@ -612,7 +612,7 @@ Name="VCCustomBuildTool" Description="Generating slovenian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\slovenian.lng" /> @@ -627,7 +627,7 @@ Name="VCCustomBuildTool" Description="Generating spanish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\spanish.lng" /> @@ -642,7 +642,7 @@ Name="VCCustomBuildTool" Description="Generating swedish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\swedish.lng" /> @@ -657,7 +657,7 @@ Name="VCCustomBuildTool" Description="Generating traditional_chinese language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\traditional_chinese.lng" /> @@ -672,7 +672,7 @@ Name="VCCustomBuildTool" Description="Generating turkish language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\turkish.lng" /> @@ -687,7 +687,7 @@ Name="VCCustomBuildTool" Description="Generating ukrainian language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\ukrainian.lng" /> @@ -702,7 +702,7 @@ Name="VCCustomBuildTool" Description="Generating welsh language file" CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" " - AdditionalDependencies="" + AdditionalDependencies="..\src\lang\english.txt" Outputs="..\bin\lang\welsh.lng" /> diff --git a/src/engine.cpp b/src/engine.cpp index 9b639bf2b7..cf2a77cba1 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -481,11 +481,11 @@ void StartupOneEngine(Engine *e, Date aging_date) e->flags = 0; e->company_avail = 0; - /* The magic value of 729 days below comes from the NewGRF spec. If the - * base intro date is before 1922 then the random number of days is not - * added. */ + /* Don't randomise the start-date in the first two years after gamestart to ensure availability + * of engines in early starting games. + * Note: TTDP uses fixed 1922 */ r = Random(); - e->intro_date = ei->base_intro <= ConvertYMDToDate(1922, 0, 1) ? ei->base_intro : (Date)GB(r, 0, 9) + ei->base_intro; + e->intro_date = ei->base_intro <= ConvertYMDToDate(_settings_game.game_creation.starting_year + 2, 0, 1) ? ei->base_intro : (Date)GB(r, 0, 9) + ei->base_intro; if (e->intro_date <= _date) { e->age = (aging_date - e->intro_date) >> 5; e->company_avail = (CompanyMask)-1; diff --git a/src/lang/english.txt b/src/lang/english.txt index 0b683b8123..90b7c7090b 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2220,8 +2220,8 @@ STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT :{BLACK}Select n STR_7031_CHANGE_THE_COMPANY_VEHICLE :{BLACK}Change the company vehicle livery STR_7032_CHANGE_THE_PRESIDENT_S :{BLACK}Change the manager's name STR_7033_CHANGE_THE_COMPANY_NAME :{BLACK}Change the company name -STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Increase size of loan -STR_7036_REPAY_PART_OF_LOAN :{BLACK}Repay part of loan +STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Increase size of loan. Ctrl+Click borrows as much as possible +STR_7036_REPAY_PART_OF_LOAN :{BLACK}Repay part of loan. Ctrl+Click repays as much loan as possible STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manager) STR_7038_INAUGURATED :{GOLD}Inaugurated: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vehicles: diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp index c897b7dcaf..545e367d25 100644 --- a/src/network/network_gamelist.cpp +++ b/src/network/network_gamelist.cpp @@ -51,7 +51,8 @@ static void NetworkGameListHandleDelayedInsert() strecpy(item->info.hostname, ins_item->info.hostname, lastof(item->info.hostname)); item->online = false; } - item->manually = ins_item->manually; + item->manually |= ins_item->manually; + if (item->manually) NetworkRebuildHostList(); UpdateNetworkGameWindow(false); } free(ins_item); @@ -114,6 +115,7 @@ void NetworkGameListRemoveItem(NetworkGameList *remove) remove = NULL; DEBUG(net, 4, "[gamelist] removed server from list"); + NetworkRebuildHostList(); UpdateNetworkGameWindow(false); return; } diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index d034c8fcbe..f7442a7e1c 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -679,7 +679,6 @@ public: if (this->server != NULL) { if (keycode == WKC_DELETE) { // Press 'delete' to remove servers NetworkGameListRemoveItem(this->server); - NetworkRebuildHostList(); this->server = NULL; this->list_pos = SLP_INVALID; } @@ -700,10 +699,7 @@ public: virtual void OnQueryTextFinished(char *str) { - if (!StrEmpty(str)) { - NetworkAddServer(str); - NetworkRebuildHostList(); - } + if (!StrEmpty(str)) NetworkAddServer(str); } virtual void OnResize(Point new_size, Point delta) diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index f2a91a8b04..9846d46257 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1621,6 +1621,12 @@ Town *CreateRandomTown(uint attempts, TownSize size, bool city, TownLayout layou static const byte _num_initial_towns[4] = {5, 11, 23, 46}; // very low, low, normal, high +/** This function will generate a certain amount of towns, with a certain layout + * It can be called from the scenario editor (i.e.: generate Random Towns) + * as well as from world creation. + * @param layout which towns will be set to, when created + * @return true if towns have been successfully created + */ bool GenerateTowns(TownLayout layout) { uint num = 0; @@ -1629,25 +1635,27 @@ bool GenerateTowns(TownLayout layout) SetGeneratingWorldProgress(GWP_TOWN, n); + /* First attempt will be made at creating the suggested number of towns. + * Note that this is really a suggested value, not a required one. + * We would not like the system to lock up just because the user wanted 100 cities on a 64*64 map, would we? */ do { bool city = (_settings_game.economy.larger_towns != 0 && Chance16(1, _settings_game.economy.larger_towns)); IncreaseGeneratingWorldProgress(GWP_TOWN); /* try 20 times to create a random-sized town for the first loop. */ - if (CreateRandomTown(20, TS_RANDOM, city, layout) != NULL) num++; + if (CreateRandomTown(20, TS_RANDOM, city, layout) != NULL) num++; // if creation successfull, raise a flag } while (--n); - /* give it a last try, but now more aggressive */ + /* If num is still zero at this point, it means that not a single town has been created. + * So give it a last try, but now more aggressive */ if (num == 0 && CreateRandomTown(10000, TS_RANDOM, _settings_game.economy.larger_towns != 0, layout) == NULL) { if (GetNumTowns() == 0) { if (_game_mode != GM_EDITOR) { extern StringID _switch_mode_errorstr; _switch_mode_errorstr = STR_COULD_NOT_CREATE_TOWN; } - - return false; } + return false; // we are still without a town? we failed, simply } - return true; }