Mercurial > sumwars

changeset 1979:d8cc8dfe0caf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed incorrect ifdef code paths (inverted APPLE and WINDOWS scenario).
author thegusty999
date Fri, 28 Oct 2011 08:32:13 +0000
parents 53c510b2e097
children e7ca64fa8b7c
files src/gui/creditswindow.cpp
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui/creditswindow.cpp	Fri Oct 28 08:28:41 2011 +0000
+++ b/src/gui/creditswindow.cpp	Fri Oct 28 08:32:13 2011 +0000
@@ -53,10 +53,6 @@
 
 	Ogre::ConfigFile cf;
 #if defined (__APPLE__)
-	cf.load("authors.txt");
-#elif defined (__unix__)
-	cf.load(std::string(CFG_FILES_DIR) + "authors.txt");
-#else
     Ogre::String path;
     CFBundleRef mainBundle = CFBundleGetMainBundle();
     CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
@@ -65,6 +61,10 @@
     CFRelease(resourcesURL);
     path = resPath;
     cf.load(path + "/authors.txt");
+#elif defined (__unix__)
+	cf.load(std::string(CFG_FILES_DIR) + "authors.txt");
+#else // WINDOWS
+	cf.load("authors.txt");
 #endif
 
 	// Go through all sections & settings in the file