r11443 - packages/trunk/between/debian/patches

[Paul Wise]

Author: pabs
Date: 2010-10-30 11:53:41 +0000 (Sat, 30 Oct 2010)
New Revision: 11443

Modified:
   packages/trunk/between/debian/patches/abs_path.patch
Log:
refresh patch

Modified: packages/trunk/between/debian/patches/abs_path.patch
===================================================================
--- packages/trunk/between/debian/patches/abs_path.patch	2010-10-30 11:48:42 UTC (rev 11442)
+++ packages/trunk/between/debian/patches/abs_path.patch	2010-10-30 11:53:41 UTC (rev 11443)
@@ -6,7 +6,7 @@
 @@ -12,7 +12,7 @@
  
  
- Image *readTGA( char *inFileName ) {
+ Image *readTGA( const char *inFileName ) {
 -    return readTGA( "graphics", inFileName );
 +    return readTGA( DATADIR"graphics", inFileName );
      }
@@ -16,7 +16,7 @@
 +++ b/game7/gameSource/musicPlayer.cpp
 @@ -425,7 +425,7 @@
  
- void loadMusicImage( char *inTGAFileName ) {
+ void loadMusicImage( const char *inTGAFileName ) {
          
 -    musicImage = readTGA( "music", inTGAFileName );
 +    musicImage = readTGA( DATADIR"music", inTGAFileName );
@@ -25,19 +25,19 @@
      h = musicImage->getHeight();
 --- a/minorGems/util/SettingsManager.cpp
 +++ b/minorGems/util/SettingsManager.cpp
-@@ -260,7 +260,7 @@
+@@ -379,7 +379,7 @@
  
  
  SettingsManagerStaticMembers::SettingsManagerStaticMembers()
--    : mDirectoryName( stringDuplicate( "settings" ) ) {
-+    : mDirectoryName( stringDuplicate( ETCDIR ) ) {
+-    : mDirectoryName( stringDuplicate( "settings" ) ),
++    : mDirectoryName( stringDuplicate( ETCDIRs ) ),
+       mHashSalt( stringDuplicate( "default_salt" ) ) {
      
      }
- 
 --- a/game7/gameSource/Client.cpp
 +++ b/game7/gameSource/Client.cpp
 @@ -254,7 +254,22 @@
-
+                 
                      mPlayerID = stringDuplicate( returnedID );
  
 -                    SettingsManager::setSetting( "playerID", mPlayerID );