diff -r a3271158d93b -r 0d0df215fb52 project_files/HedgewarsMobile/Classes/OverlayViewController.h --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.h Fri Jul 16 00:18:03 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.h Sat Jul 17 03:59:10 2010 +0200 @@ -7,23 +7,28 @@ // #import +#import "SDL_sysvideo.h" -@class PopoverMenuViewController; +@class InGameMenuViewController; @interface OverlayViewController : UIViewController { + // the timer that dims the overlay NSTimer *dimTimer; - // used only on the ipad - UIPopoverController *popoverController; - - PopoverMenuViewController *popupMenu; + // the in-game menu + UIPopoverController *popoverController; // iPad only + InGameMenuViewController *popupMenu; BOOL isPopoverVisible; + // ths touch section CGFloat initialDistanceForPinching; + + // the sdl window underneath + SDL_Window *sdlwindow; } @property (nonatomic,retain) id popoverController; -@property (nonatomic,retain) PopoverMenuViewController *popupMenu; +@property (nonatomic,retain) InGameMenuViewController *popupMenu; BOOL isGameRunning; @@ -39,7 +44,5 @@ -(void) dismissPopover; -(void) dimOverlay; -(void) activateOverlay; --(void) chatAppear; --(void) chatDisappear; @end