equal
deleted
inserted
replaced
22 #import "GameInterfaceBridge.h" |
22 #import "GameInterfaceBridge.h" |
23 #import "PascalImports.h" |
23 #import "PascalImports.h" |
24 #import "EngineProtocolNetwork.h" |
24 #import "EngineProtocolNetwork.h" |
25 #import "OverlayViewController.h" |
25 #import "OverlayViewController.h" |
26 #import "StatsPageViewController.h" |
26 #import "StatsPageViewController.h" |
|
27 #import "ObjcExports.h" |
27 |
28 |
28 @implementation GameInterfaceBridge |
29 @implementation GameInterfaceBridge |
29 @synthesize parentController, systemSettings, savePath, overlayController, engineProtocol, ipcPort, gameType; |
30 @synthesize parentController, systemSettings, savePath, overlayController, engineProtocol, ipcPort, gameType; |
30 |
31 |
31 -(id) initWithController:(id) viewController { |
32 -(id) initWithController:(id) viewController { |
58 -(void) displayOverlayLater:(id) object { |
59 -(void) displayOverlayLater:(id) object { |
59 NSDictionary *dict = (NSDictionary *)object; |
60 NSDictionary *dict = (NSDictionary *)object; |
60 |
61 |
61 [self.overlayController setUseClassicMenu:[[dict objectForKey:@"menu"] boolValue]]; |
62 [self.overlayController setUseClassicMenu:[[dict objectForKey:@"menu"] boolValue]]; |
62 [self.overlayController setInitialOrientation:[[dict objectForKey:@"orientation"] intValue]]; |
63 [self.overlayController setInitialOrientation:[[dict objectForKey:@"orientation"] intValue]]; |
|
64 objcExportsInit(self.overlayController); |
63 |
65 |
64 UIWindow *gameWindow = (IS_DUALHEAD() ? [HedgewarsAppDelegate sharedAppDelegate].uiwindow : [[UIApplication sharedApplication] keyWindow]); |
66 UIWindow *gameWindow = (IS_DUALHEAD() ? [HedgewarsAppDelegate sharedAppDelegate].uiwindow : [[UIApplication sharedApplication] keyWindow]); |
65 [gameWindow addSubview:self.overlayController.view]; |
67 [gameWindow addSubview:self.overlayController.view]; |
66 } |
68 } |
67 |
69 |
154 // prepare options for overlay and add it to the future sdl uiwindow |
156 // prepare options for overlay and add it to the future sdl uiwindow |
155 NSDictionary *overlayOptions = [[NSDictionary alloc] initWithObjectsAndKeys: |
157 NSDictionary *overlayOptions = [[NSDictionary alloc] initWithObjectsAndKeys: |
156 [NSNumber numberWithInt:self.parentController.interfaceOrientation],@"orientation", |
158 [NSNumber numberWithInt:self.parentController.interfaceOrientation],@"orientation", |
157 [self.systemSettings objectForKey:@"menu"],@"menu", |
159 [self.systemSettings objectForKey:@"menu"],@"menu", |
158 nil]; |
160 nil]; |
159 [self performSelector:@selector(displayOverlayLater:) withObject:overlayOptions afterDelay:3]; |
161 [self performSelector:@selector(displayOverlayLater:) withObject:overlayOptions afterDelay:0.1]; |
160 [overlayOptions release]; |
162 [overlayOptions release]; |
161 |
163 |
162 // SYSTEMS ARE GO!! |
164 // SYSTEMS ARE GO!! |
163 [self startGameEngine]; |
165 [self startGameEngine]; |
164 |
166 |