From 71500c7ff2651c972c67461e121bb8252c13a2b0 Mon Sep 17 00:00:00 2001 From: vexed Date: Wed, 16 Jan 2013 18:42:41 -0500 Subject: [PATCH 1/3] Fix Super & Cyborg transports sizes in intel display fixes ticket:3781 --- src/mapdisplay.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mapdisplay.cpp b/src/mapdisplay.cpp index 497b87c4a..0f0255bf6 100644 --- a/src/mapdisplay.cpp +++ b/src/mapdisplay.cpp @@ -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; From 21d8642186dc8a1a160ca4dd497ec1065ae29d70 Mon Sep 17 00:00:00 2001 From: dak180 Date: Wed, 16 Jan 2013 22:06:05 -0500 Subject: [PATCH 2/3] Update the copyright year in the mac strings. --- macosx/Resources/Warzone-Info.plist | 6 +++--- macosx/Resources/wzlocal/English.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/ca_ES.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/da.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/de.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/el.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/en_GB.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/es.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/et_EE.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/fr.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/hu.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/it.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/ko.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/la.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/pl.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/pt.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/ru.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/sk.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/sl.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/tr.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/uk_UA.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings | 4 ++-- macosx/Resources/wzlocal/zh_TW.lproj/InfoPlist.strings | 4 ++-- 33 files changed, 67 insertions(+), 67 deletions(-) diff --git a/macosx/Resources/Warzone-Info.plist b/macosx/Resources/Warzone-Info.plist index d6796b481..6b2d08c79 100644 --- a/macosx/Resources/Warzone-Info.plist +++ b/macosx/Resources/Warzone-Info.plist @@ -37,11 +37,11 @@ LSApplicationCategoryType public.app-category.strategy-games CFBundleShortVersionString - VCS_TAG [VCS_SHORT_HASH] + VCS_TAG :VCS_SHORT_HASH: NSHumanReadableCopyright - Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2012 The Warzone 2100 Project + Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2013 The Warzone 2100 Project CFBundleGetInfoString - VCS_TAG [VCS_SHORT_HASH], Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2012 The Warzone 2100 Project + VCS_TAG :VCS_SHORT_HASH:, Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2013 The Warzone 2100 Project CFBundleHelpBookFolder WarzoneHelp CFBundleHelpBookName diff --git a/macosx/Resources/wzlocal/English.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/English.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/English.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/English.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/ca_ES.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/ca_ES.lproj/InfoPlist.strings index 1c3f816d4..c1a03aaeb 100644 --- a/macosx/Resources/wzlocal/ca_ES.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/ca_ES.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/da.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/da.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/da.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/da.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/de.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/de.lproj/InfoPlist.strings index 0dce7c3ba..48cfb8881 100644 --- a/macosx/Resources/wzlocal/de.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/de.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/el.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/el.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/el.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/el.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/en_GB.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/en_GB.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/en_GB.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/en_GB.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/es.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/es.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/es.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/es.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/et_EE.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/et_EE.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/et_EE.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/et_EE.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/fr.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/fr.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/fr.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/fr.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/hu.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/hu.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/hu.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/hu.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/it.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/it.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/it.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/it.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/ko.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/ko.lproj/InfoPlist.strings index 28e117add..670675547 100644 --- a/macosx/Resources/wzlocal/ko.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/ko.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/la.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/la.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/la.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/la.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings index 0e5d86f64..67ca3ca66 100644 --- a/macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/pl.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/pl.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/pl.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/pl.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/pt.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/pt.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/pt.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/pt.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings index 34551cb8e..0084f1a99 100644 --- a/macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings index 4d24b3010..36fe56498 100644 --- a/macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/ru.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/ru.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/ru.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/ru.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/sk.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/sk.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/sk.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/sk.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/sl.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/sl.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/sl.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/sl.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/tr.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/tr.lproj/InfoPlist.strings index 190bc4099..09d69f808 100644 --- a/macosx/Resources/wzlocal/tr.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/tr.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/uk_UA.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/uk_UA.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/uk_UA.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/uk_UA.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings @@ -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 */ diff --git a/macosx/Resources/wzlocal/zh_TW.lproj/InfoPlist.strings b/macosx/Resources/wzlocal/zh_TW.lproj/InfoPlist.strings index 63f5e9e60..2908f9a10 100644 --- a/macosx/Resources/wzlocal/zh_TW.lproj/InfoPlist.strings +++ b/macosx/Resources/wzlocal/zh_TW.lproj/InfoPlist.strings @@ -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 */ From c5d07a54071be885f64f6cabfee49ea3cd7e495b Mon Sep 17 00:00:00 2001 From: Cyp Date: Thu, 17 Jan 2013 15:28:33 +0100 Subject: [PATCH 3/3] Squelch warnings. Fixes ticket:3880 and ticket:3882. --- tests/maptest.cpp | 6 +++++- tests/modeltest.c | 8 +++++++- tests/qtscripttest.cpp | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/maptest.cpp b/tests/maptest.cpp index 931e48545..7427494a7 100644 --- a/tests/maptest.cpp +++ b/tests/maptest.cpp @@ -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, '/'); diff --git a/tests/modeltest.c b/tests/modeltest.c index b86a64cc6..1374271a8 100644 --- a/tests/modeltest.c +++ b/tests/modeltest.c @@ -30,6 +30,7 @@ #ifndef WIN32 #include #include +#include #else typedef int bool; #define PATH_MAX 255 @@ -228,6 +229,7 @@ static void check_pie(const char *input) } } } + fclose(fp); } int main(int argc, char **argv) @@ -245,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); diff --git a/tests/qtscripttest.cpp b/tests/qtscripttest.cpp index 83308c330..2d2236766 100644 --- a/tests/qtscripttest.cpp +++ b/tests/qtscripttest.cpp @@ -21,7 +21,11 @@ int main(int argc, char **argv) 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);