aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorJoost Peters2004-08-20 13:37:50 +0000
committerJoost Peters2004-08-20 13:37:50 +0000
commitcdd3397c29614901be2851135be598bd3cf05ce1 (patch)
tree61a122b0c7bf837f38678c0e7370de4d9704617b /sky
parent02c5ffb639738b0ee609507619f761ce65693e82 (diff)
downloadscummvm-rg350-cdd3397c29614901be2851135be598bd3cf05ce1.tar.gz
scummvm-rg350-cdd3397c29614901be2851135be598bd3cf05ce1.tar.bz2
scummvm-rg350-cdd3397c29614901be2851135be598bd3cf05ce1.zip
Initialize variables (fix valgrind warnings)
svn-id: r14648
Diffstat (limited to 'sky')
-rw-r--r--sky/mouse.cpp4
-rw-r--r--sky/sky.cpp6
2 files changed, 6 insertions, 4 deletions
diff --git a/sky/mouse.cpp b/sky/mouse.cpp
index aae5c3f2f6..86ef028d01 100644
--- a/sky/mouse.cpp
+++ b/sky/mouse.cpp
@@ -91,6 +91,8 @@ Mouse::Mouse(OSystem *system, Disk *skyDisk) {
_system = system;
_mouseB = 0;
_currentCursor = 6;
+ _mouseX = GAME_SCREEN_WIDTH / 2;
+ _mouseY = GAME_SCREEN_HEIGHT / 2;
_miceData = _skyDisk->loadFile(MICE_FILE, NULL);
@@ -193,7 +195,7 @@ void Mouse::spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY) {
void Mouse::mouseEngine(uint16 mouseX, uint16 mouseY) {
_mouseX = mouseX;
_mouseY = mouseY;
-
+
_logicClick = (_mouseB > 0); // click signal is available for Logic for one gamecycle
if (!Logic::_scriptVariables[MOUSE_STOP]) {
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 2bd538d79f..956943c830 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -197,11 +197,11 @@ void SkyEngine::handleKey(void) {
void SkyEngine::go() {
- if (!_dump_file)
- _dump_file = stdout;
-
initialise();
+ _sdl_mouse_x = GAME_SCREEN_WIDTH / 2;
+ _sdl_mouse_y = GAME_SCREEN_HEIGHT / 2;
+
bool introSkipped = false;
if (!_quickLaunch) {
if (_systemVars.gameVersion > 267) {// don't do intro for floppydemos