[Scummvm-cvs-logs] SF.net SVN: scummvm:[38995] scummvm/trunk/engines/cruise
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Sun Mar 1 03:20:22 CET 2009
Revision: 38995
http://scummvm.svn.sourceforge.net/scummvm/?rev=38995&view=rev
Author: dreammaster
Date: 2009-03-01 02:20:22 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Implemented proper support for the Pause 'p' key
Modified Paths:
--------------
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/cruise_main.h
scummvm/trunk/engines/cruise/function.cpp
Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp 2009-03-01 02:19:06 UTC (rev 38994)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp 2009-03-01 02:20:22 UTC (rev 38995)
@@ -43,10 +43,6 @@
drawSolidBox(64, 100, 256, 117, 0);
}
-void resetRaster(uint8 *rasterPtr, int32 rasterSize) {
- memset(rasterPtr, 0, rasterSize);
-}
-
void loadPakedFileToMem(int fileIdx, uint8 *buffer) {
changeCursor(CURSOR_DISK);
@@ -1267,7 +1263,6 @@
}
int processInput(void) {
- static bool pausedButtonDown = false;
int16 mouseX = 0;
int16 mouseY = 0;
int16 button = 0;
@@ -1312,7 +1307,9 @@
if (keyboardCode == Common::KEYCODE_p) {
keyboardCode = Common::KEYCODE_INVALID;
_vm->pauseEngine(true);
+ mouseOff();
+ bool pausedButtonDown = false;
while (!_vm->shouldQuit()) {
getMouseStatus(&main10, &mouseX, &button, &mouseY);
@@ -1331,8 +1328,8 @@
return 1;
keyboardCode = Common::KEYCODE_INVALID;
- pausedButtonDown = false;
_vm->pauseEngine(false);
+ mouseOn();
return 0;
}
Modified: scummvm/trunk/engines/cruise/cruise_main.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.h 2009-03-01 02:19:06 UTC (rev 38994)
+++ scummvm/trunk/engines/cruise/cruise_main.h 2009-03-01 02:20:22 UTC (rev 38995)
@@ -109,7 +109,6 @@
void changeScriptParamInList(int param1, int param2, scriptInstanceStruct * pScriptInstance, int newValue, int param3);
uint8 *getDataFromData3(ovlData3Struct * ptr, int param);
void removeExtention(const char *name, char *buffer);
-void resetRaster(uint8 * rasterPtr, int32 rasterSize);
void resetPtr2(scriptInstanceStruct * ptr);
void getFileExtention(const char *name, char *buffer);
void *allocAndZero(int size);
Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp 2009-03-01 02:19:06 UTC (rev 38994)
+++ scummvm/trunk/engines/cruise/function.cpp 2009-03-01 02:20:22 UTC (rev 38995)
@@ -666,7 +666,7 @@
return 0;
}
-int16 fontFileIndex;
+int16 fontFileIndex = -1;
int16 Op_SetFont(void) {
fontFileIndex = popVar();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list