aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2012-02-23 02:04:40 +0100
committerJohannes Schickel2012-02-23 02:04:40 +0100
commite1edb20fed788aafc70f70448957b03b4f8f237d (patch)
treef1b2675b3ce7b710edacf1a03bbaeafcedb93691
parente83e31c2cc90a5311c839903b0a120eacf3dde20 (diff)
downloadscummvm-rg350-e1edb20fed788aafc70f70448957b03b4f8f237d.tar.gz
scummvm-rg350-e1edb20fed788aafc70f70448957b03b4f8f237d.tar.bz2
scummvm-rg350-e1edb20fed788aafc70f70448957b03b4f8f237d.zip
IPHONE: Move VideoContext definition to iphone_common.h.
-rw-r--r--backends/platform/iphone/iphone_common.h18
-rw-r--r--backends/platform/iphone/iphone_video.h18
2 files changed, 18 insertions, 18 deletions
diff --git a/backends/platform/iphone/iphone_common.h b/backends/platform/iphone/iphone_common.h
index 5a46a6dde6..044b279386 100644
--- a/backends/platform/iphone/iphone_common.h
+++ b/backends/platform/iphone/iphone_common.h
@@ -55,6 +55,24 @@ enum GraphicsModes {
kGraphicsModeNone = 1
};
+struct VideoContext {
+ // Game screen state
+ int screenWidth, screenHeight;
+
+ // Overlay state
+ int overlayWidth, overlayHeight;
+
+ // Mouse cursor state
+ int mouseX, mouseY;
+ int mouseHotspotX, mouseHotspotY;
+ int mouseWidth, mouseHeight;
+ bool mouseIsVisible;
+
+ // Misc state
+ GraphicsModes graphicsMode;
+ int shakeOffsetY;
+};
+
// On the ObjC side
void iPhone_setGraphicsMode(GraphicsModes mode);
void iPhone_updateScreen(int mouseX, int mouseY);
diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h
index 733851f8b7..2677267171 100644
--- a/backends/platform/iphone/iphone_video.h
+++ b/backends/platform/iphone/iphone_video.h
@@ -34,24 +34,6 @@
#include "iphone_keyboard.h"
#include "iphone_common.h"
-struct VideoContext {
- // Game screen state
- int screenWidth, screenHeight;
-
- // Overlay state
- int overlayWidth, overlayHeight;
-
- // Mouse cursor state
- int mouseX, mouseY;
- int mouseHotspotX, mouseHotspotY;
- int mouseWidth, mouseHeight;
- bool mouseIsVisible;
-
- // Misc state
- GraphicsModes graphicsMode;
- int shakeOffsetY;
-};
-
@interface iPhoneView : UIView {
NSMutableArray *_events;
SoftKeyboard *_keyboardView;