equal
deleted
inserted
replaced
59 -(void) displayOverlayLater:(id) object { |
59 -(void) displayOverlayLater:(id) object { |
60 NSDictionary *dict = (NSDictionary *)object; |
60 NSDictionary *dict = (NSDictionary *)object; |
61 |
61 |
62 [self.overlayController setUseClassicMenu:[[dict objectForKey:@"menu"] boolValue]]; |
62 [self.overlayController setUseClassicMenu:[[dict objectForKey:@"menu"] boolValue]]; |
63 [self.overlayController setInitialOrientation:[[dict objectForKey:@"orientation"] intValue]]; |
63 [self.overlayController setInitialOrientation:[[dict objectForKey:@"orientation"] intValue]]; |
64 objcExportsInit(self.overlayController); |
|
65 |
64 |
66 UIWindow *gameWindow = (IS_DUALHEAD() ? [HedgewarsAppDelegate sharedAppDelegate].uiwindow : [[UIApplication sharedApplication] keyWindow]); |
65 UIWindow *gameWindow = (IS_DUALHEAD() ? [HedgewarsAppDelegate sharedAppDelegate].uiwindow : [[UIApplication sharedApplication] keyWindow]); |
67 [gameWindow addSubview:self.overlayController.view]; |
66 [gameWindow addSubview:self.overlayController.view]; |
68 } |
67 } |
69 |
68 |
126 [verticalSize release]; |
125 [verticalSize release]; |
127 [horizontalSize release]; |
126 [horizontalSize release]; |
128 [rotation release]; |
127 [rotation release]; |
129 [localeString release]; |
128 [localeString release]; |
130 [ipcString release]; |
129 [ipcString release]; |
|
130 |
|
131 objcExportsInit(self.overlayController); |
131 |
132 |
132 // this is the pascal fuction that starts the game, wrapped around isInGame |
133 // this is the pascal fuction that starts the game, wrapped around isInGame |
133 [HedgewarsAppDelegate sharedAppDelegate].isInGame = YES; |
134 [HedgewarsAppDelegate sharedAppDelegate].isInGame = YES; |
134 Game(gameArgs); |
135 Game(gameArgs); |
135 [HedgewarsAppDelegate sharedAppDelegate].isInGame = NO; |
136 [HedgewarsAppDelegate sharedAppDelegate].isInGame = NO; |