changed Game arguments to accept data path on 9th array element (like planned) hedgeroid
authorkoda
Mon, 26 Sep 2011 01:32:48 +0200
branchhedgeroid
changeset 6029 5073285b6599
parent 6027 302408e45052
child 6031 95d565991edd
changed Game arguments to accept data path on 9th array element (like planned)
hedgewars/hwengine.pas
hedgewars/uTouch.pas
project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m
--- a/hedgewars/hwengine.pas	Mon Sep 26 01:16:15 2011 +0200
+++ b/hedgewars/hwengine.pas	Mon Sep 26 01:32:48 2011 +0200
@@ -267,14 +267,7 @@
 {$IFDEF HWLIBRARY}
     cBits:= 32;
     cTimerInterval:= 8;
-{$IFDEF ANDROID}
-    PathPrefix:= gameArgs[11];
-    cFullScreen:= true;
-{$ELSE}
-    PathPrefix:= 'Data';
-    cFullScreen:= false;
-{$ENDIF}
-    UserPathPrefix:= '.';
+    cFullScreen:= {$IFDEF MOBILE}true{$ELSE}false{$ENDIF};
     cShowFPS:= {$IFDEF DEBUGFILE}true{$ELSE}false{$ENDIF};
     val(gameArgs[0], ipcPort);
     val(gameArgs[1], cScreenWidth);
@@ -287,7 +280,8 @@
     isSoundEnabled:= gameArgs[6] = '1';
     isMusicEnabled:= gameArgs[7] = '1';
     cAltDamage:= gameArgs[8] = '1';
-    val(gameArgs[9], rotationQt);
+    PathPrefix:= gameArgs[9];
+    UserPathPrefix:= PathPrefix;
     recordFileName:= gameArgs[10];
     cStereoMode:= smNone;
 {$ENDIF}
--- a/hedgewars/uTouch.pas	Mon Sep 26 01:16:15 2011 +0200
+++ b/hedgewars/uTouch.pas	Mon Sep 26 01:32:48 2011 +0200
@@ -22,7 +22,7 @@
 
 interface
 
-uses sysutils, math, uConsole, uVariables, SDLh, uTypes, uFloat, uConsts, uIO, uCommands, GLUnit, uCommandHandlers;
+uses sysutils, math, uConsole, uVariables, SDLh, uTypes, uFloat, uConsts, uIO, uCommands, GLUnit;
 
 type
     PTouch_Finger = ^Touch_Finger;
--- a/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m	Mon Sep 26 01:16:15 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m	Mon Sep 26 01:32:48 2011 +0200
@@ -81,7 +81,6 @@
 
     NSString *horizontalSize = [[NSString alloc] initWithFormat:@"%d", width * (int)getScreenScale()];
     NSString *verticalSize = [[NSString alloc] initWithFormat:@"%d", height * (int)getScreenScale()];
-    NSString *rotation = [[NSString alloc] initWithString:@"0"];
 
     NSString *modelId = getModelType();
     NSInteger tmpQuality;
@@ -112,12 +111,11 @@
     gameArgs[ 6] = [[[settings objectForKey:@"sound"] stringValue] UTF8String];                 //isSoundEnabled
     gameArgs[ 7] = [[[settings objectForKey:@"music"] stringValue] UTF8String];                 //isMusicEnabled
     gameArgs[ 8] = [[[settings objectForKey:@"alternate"] stringValue] UTF8String];             //cAltDamage
-    gameArgs[ 9] = [rotation UTF8String];                                                       //rotateQt
+    gameArgs[ 9] = [[[NSBundle mainBundle] resourcePath] UTF8String];                           //PathPrefix
     gameArgs[10] = (self.gameType == gtSave) ? [self.savePath UTF8String] : NULL;               //recordFileName
 
     [verticalSize release];
     [horizontalSize release];
-    [rotation release];
     [localeString release];
     [ipcString release];