hedgewars: comparison project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m

equal deleted inserted replaced

-:88cfcd9161d3
+:42b256eca362
 * File created on 18/04/2011.
 */
 #import "GameInterfaceBridge.h"
-#import "PascalImports.h"
+#import "ServerSetup.h"
 #import "EngineProtocolNetwork.h"
 #import "OverlayViewController.h"
 #import "StatsPageViewController.h"
 #import "AudioManagerController.h"
 #import "ObjcExports.h"
 @implementation GameInterfaceBridge
 @synthesize parentController, savePath, overlayController, engineProtocol, ipcPort, gameType;
 -(id) initWithController:(id) viewController {
 if (self = [super init]) {
-self.ipcPort = randomPort();
+self.ipcPort = [ServerSetup randomPort];
 self.gameType = gtNone;
 self.savePath = nil;
 self.parentController = (UIViewController *)viewController;
 self.engineProtocol = [[EngineProtocolNetwork alloc] initOnPort:self.ipcPort];
 UIView *injected = (IS_DUALHEAD() ? self.parentController.view : UIVIEW_HW_SDLVIEW);
 [injected addSubview:self.overlayController.view];
 }
 // main routine for calling the actual game engine
--(void) startGameEngine {
+-(void) engineLaunch {
 const char *gameArgs[11];
-NSInteger width, height;
+CGFloat width, height;
+CGFloat screenScale = [[UIScreen mainScreen] safeScale];
 NSString *ipcString = [[NSString alloc] initWithFormat:@"%d", self.ipcPort];
 NSString *localeString = [[NSString alloc] initWithFormat:@"%@.txt", [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode]];
 NSUserDefaults *settings = [NSUserDefaults standardUserDefaults];
 if (IS_DUALHEAD()) {
 CGRect screenBounds = [[[UIScreen screens] objectAtIndex:1] bounds];
-width = (int) screenBounds.size.width;
+width = screenBounds.size.width;
-height = (int) screenBounds.size.height;
+height = screenBounds.size.height;
 } else {
 CGRect screenBounds = [[UIScreen mainScreen] bounds];
-width = (int) screenBounds.size.height;
+width = screenBounds.size.height;
-height = (int) screenBounds.size.width;
+height = screenBounds.size.width;
 }
-NSString *horizontalSize = [[NSString alloc] initWithFormat:@"%d", width * (int)getScreenScale()];
+NSString *horizontalSize = [[NSString alloc] initWithFormat:@"%d", (int)(width * screenScale)];
-NSString *verticalSize = [[NSString alloc] initWithFormat:@"%d", height * (int)getScreenScale()];
+NSString *verticalSize = [[NSString alloc] initWithFormat:@"%d", (int)(height * screenScale)];
-NSString *modelId = getModelType();
+NSString *modelId = [HWUtils modelType];
 NSInteger tmpQuality;
 if ([modelId hasPrefix:@"iPhone1"] || [modelId hasPrefix:@"iPod1,1"] || [modelId hasPrefix:@"iPod2,1"])     // = iPhone and iPhone 3G or iPod Touch or iPod Touch 2G
 tmpQuality = 0x00000001 | 0x00000002 | 0x00000008 | 0x00000040;                 // rqLowRes | rqBlurryLand | rqSimpleRope | rqKillFlakes
 else if ([modelId hasPrefix:@"iPhone2"] || [modelId hasPrefix:@"iPod3"])                                    // = iPhone 3GS or iPod Touch 3G
 tmpQuality = 0x00000002 | 0x00000040;                                           // rqBlurryLand | rqKillFlakes
 [verticalSize release];
 [horizontalSize release];
 [localeString release];
 [ipcString release];
-objcExportsInit();
+[ObjcExports initialize];
 // this is the pascal fuction that starts the game, wrapped around isInGame
 [HedgewarsAppDelegate sharedAppDelegate].isInGame = YES;
 Game(gameArgs);
 [HedgewarsAppDelegate sharedAppDelegate].isInGame = NO;
 [userDefaults synchronize];
 [AudioManagerController pauseBackgroundMusic];
 // SYSTEMS ARE GO!!
-[self startGameEngine];
+[self engineLaunch];
 // remove completed games notification
 [userDefaults setObject:@"" forKey:@"savedGamePath"];
 [userDefaults synchronize];
 [AudioManagerController playBackgroundMusic];
 }
 // set up variables for a local game
--(void) startLocalGame:(NSDictionary *)withDictionary {
+-(void) startLocalGame:(NSDictionary *)withOptions {
 self.gameType = gtLocal;
 NSDateFormatter *outputFormatter = [[NSDateFormatter alloc] init];
 [outputFormatter setDateFormat:@"yyyy-MM-dd '@' HH.mm"];
 NSString *path = [[NSString alloc] initWithFormat:@"%@%@.hws",SAVES_DIRECTORY(),[outputFormatter stringFromDate:[NSDate date]]];
 // in the rare case in which a savefile with the same name exists the older one must be removed (or it gets corrupted)
 if ([[NSFileManager defaultManager] fileExistsAtPath:self.savePath])
 [[NSFileManager defaultManager] removeItemAtPath:self.savePath error:nil];
-[self.engineProtocol spawnThread:self.savePath withOptions:withDictionary];
+[self.engineProtocol spawnThread:self.savePath withOptions:withOptions];
 [self prepareEngineLaunch];
 }
 // set up variables for a save game
 -(void) startSaveGame:(NSString *)atPath {
 self.gameType = gtSave;
 self.savePath = atPath;
 [self.engineProtocol spawnThread:self.savePath];
+[self prepareEngineLaunch];
+}
+-(void) startMissionGame:(NSString *)withScript {
+self.gameType = gtMission;
+self.savePath = nil;
+NSString *missionPath = [[NSString alloc] initWithFormat:@"escript Missions/Training/%@.lua",withScript];
+NSDictionary *config = [NSDictionary dictionaryWithObject:missionPath forKey:@"mission_command"];
+[missionPath release];
+[self.engineProtocol spawnThread:nil withOptions:config];
 [self prepareEngineLaunch];
 }
 -(void) gameHasEndedWithStats:(NSArray *)stats {
 // wrap this around a retain/realse to prevent being deallocated too soon

branch	hedgeroid
changeset 6224	42b256eca362
parent 6029	5073285b6599
parent 6209	074ab6ebcb3e
child 6328	d14adf1c7721