# HG changeset patch # User koda # Date 1316993568 -7200 # Node ID 5073285b659999ddf72e6e393395bb43544d50a3 # Parent 302408e45052a2f4ca347dc4fb937c67182de9ab changed Game arguments to accept data path on 9th array element (like planned) diff -r 302408e45052 -r 5073285b6599 hedgewars/hwengine.pas --- 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} diff -r 302408e45052 -r 5073285b6599 hedgewars/uTouch.pas --- 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; diff -r 302408e45052 -r 5073285b6599 project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m --- 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];