Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfixes'

master
automerge 2013-01-18 08:00:44 +01:00 committed by cybersphinx
parent 8b14b26ae7 c5d07a5407
commit 170f3a9931
37 changed files with 88 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
macosx/Resources/Warzone-Info.plist
View File

@ -37,11 +37,11 @@
<key>LSApplicationCategoryType</key>
<string>public.app-category.strategy-games</string>
<key>CFBundleShortVersionString</key>
<string>VCS_TAG [VCS_SHORT_HASH]</string>
<string>VCS_TAG :VCS_SHORT_HASH:</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2012 The Warzone 2100 Project</string>
<string>Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2013 The Warzone 2100 Project</string>
<key>CFBundleGetInfoString</key>
<string>VCS_TAG [VCS_SHORT_HASH], Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2012 The Warzone 2100 Project</string>
<string>VCS_TAG :VCS_SHORT_HASH:, Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2013 The Warzone 2100 Project</string>
<key>CFBundleHelpBookFolder</key>
<string>WarzoneHelp</string>
<key>CFBundleHelpBookName</key>

4
macosx/Resources/wzlocal/English.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/ca_ES.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 El projecte Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 El projecte Warzone 2100";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/da.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/de.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/el.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/en_GB.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/es.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/et_EE.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/fr.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/hu.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/it.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/ko.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "워존";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "워존 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 워존 2100 프로젝트";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 워존 2100 프로젝트";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/la.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/pl.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/pt.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/ru.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/sk.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/sl.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/tr.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/uk_UA.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

4
macosx/Resources/wzlocal/zh_TW.lproj/InfoPlist.strings
View File

@ -9,8 +9,8 @@ CFBundleName = "Warzone";
/* Warzone 2100 */ /* Name of the app bundle */
CFBundleDisplayName = "Warzone 2100";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2012 The Warzone 2100 Project";
/* Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project */ /* Copyright string */
NSHumanReadableCopyright = "Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2013 The Warzone 2100 Project";
/* Warzone 2100 Map / Mod File */ /* Description of .wz files */

8
src/mapdisplay.cpp
View File

@ -109,12 +109,16 @@ void renderResearchToBuffer(RESEARCH *psResearch, UDWORD OriginX, UDWORD OriginY
//this defines how the button is drawn
IMDType = IMDTYPE_COMPONENT;
psResGraphic = psResearch->psStat;
// NOTE: Another kludge to deal with the superTransport to make it "fit" the display.
// FIXME: Another kludge to deal with the superTransport to make it "fit" the display.
// Using pName, should be safe to compare, pName doesn't get translated.
if (!strcmp("SuperTransport", psResearch->pName))
if (!strcmp("R-SuperTransport", psResearch->pName))
{
scale = RESEARCH_COMPONENT_SCALE / 3;
}
else if (!strcmp("R-Cyborg-Transport", psResearch->pName))
{
scale = RESEARCH_COMPONENT_SCALE / 2;
}
else
{
scale = RESEARCH_COMPONENT_SCALE;

6
tests/maptest.cpp
View File

@ -24,7 +24,11 @@ int main(int argc, char **argv)
GAMEMAP *map;
char filename[PATH_MAX], *delim;
fscanf(fp, "%256s\n", filename);
if (fscanf(fp, "%254s\n", filename) != 1)
{
fprintf(stderr, "maptest: Couldn't fscanf maplist.txt.\n");
return -1;
}
// Strip "/game.map"
delim = strrchr(filename, '/');

6
tests/modeltest.c
View File

@ -247,7 +247,11 @@ int main(int argc, char **argv)
{
char filename[PATH_MAX];
fscanf(fp, "%256s\n", filename);
if (fscanf(fp, "%254s\n", filename) != 1)
{
fprintf(stderr, "%s: Failed to read filename\n", argv[0]);
return -1;
}
printf("Testing model: %s\n", filename);
strcpy(fullpath, datapath);
strcat(fullpath, filename);

6
tests/qtscripttest.cpp
View File

@ -22,7 +22,11 @@ int main(int argc, char **argv)
strcat(datapath, "/../data/");
while (!feof(fp))
{
fscanf(fp, "%256s\n", filename);
if (fscanf(fp, "%254s\n", filename) != 1)
{
fprintf(stderr, "%s: Failed to fscanf jslist.txt.\n", argv[0]);
return -1;
}
printf("Testing script: %s\n", filename);
strcpy(fullpath, datapath);
strcat(fullpath, filename);