diff options
author | David Corrales | 2007-08-05 19:34:20 +0000 |
---|---|---|
committer | David Corrales | 2007-08-05 19:34:20 +0000 |
commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/gob/game.h | |
parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/gob/game.h')
-rw-r--r-- | engines/gob/game.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/gob/game.h b/engines/gob/game.h index 2181d219f2..c83497eaeb 100644 --- a/engines/gob/game.h +++ b/engines/gob/game.h @@ -147,11 +147,14 @@ public: void evaluateScroll(int16 x, int16 y); - int16 checkKeys(int16 *pMousex, int16 *pMouseY, int16 *pButtons, char handleMouse); + int16 checkKeys(int16 *pMousex = 0, int16 *pMouseY = 0, + int16 *pButtons = 0, char handleMouse = 0); void start(void); void totSub(int8 flags, const char *newTotFile); void switchTotSub(int16 index, int16 skipPlay); + void freeCollision(int16 id); + virtual void playTot(int16 skipPlay) = 0; virtual void clearCollisions(void) = 0; @@ -215,13 +218,12 @@ protected: int16 adjustKey(int16 key); - byte *loadLocTexts(void); + byte *loadLocTexts(int32 *dataSize = 0); int32 loadTotFile(const char *path); void loadExtTable(void); void loadImFile(void); void setCollisions(void); - void freeCollision(int16 id); void collSub(uint16 offset); void collAreaSub(int16 index, int8 enter); int16 openLocTextFile(char *locTextFile, int language); |