diff options
| author | Arnaud Boutonné | 2010-11-26 23:30:31 +0000 |
|---|---|---|
| committer | Arnaud Boutonné | 2010-11-26 23:30:31 +0000 |
| commit | fd6157e77897380df5c405fe073d5bb728323d8d (patch) | |
| tree | 6ca5405bc91adbe93c64c3abd267f940f871459d | |
| parent | bab5aa433bb4319edfddfde7ed03cfeed337a884 (diff) | |
| download | scummvm-rg350-fd6157e77897380df5c405fe073d5bb728323d8d.tar.gz scummvm-rg350-fd6157e77897380df5c405fe073d5bb728323d8d.tar.bz2 scummvm-rg350-fd6157e77897380df5c405fe073d5bb728323d8d.zip | |
HUGO: Avoid using 'short' in function definition
svn-id: r54504
| -rw-r--r-- | engines/hugo/file.h | 8 | ||||
| -rw-r--r-- | engines/hugo/route.h | 2 | ||||
| -rw-r--r-- | engines/hugo/sound.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/hugo/file.h b/engines/hugo/file.h index 94b51e68ef..1f231d0604 100644 --- a/engines/hugo/file.h +++ b/engines/hugo/file.h @@ -56,15 +56,15 @@ public: bool fileExists(char *filename); - sound_pt getSound(short sound, uint16 *size); + sound_pt getSound(int16 sound, uint16 *size); void instructions(); void readBootFile(); void readImage(int objNum, object_t *objPtr); void readUIFImages(); - void readUIFItem(short id, byte *buf); - void restoreGame(short slot); - void saveGame(short slot, const char *descrip); + void readUIFItem(int16 id, byte *buf); + void restoreGame(int16 slot); + void saveGame(int16 slot, const char *descrip); virtual void openDatabaseFiles() = 0; virtual void closeDatabaseFiles() = 0; diff --git a/engines/hugo/route.h b/engines/hugo/route.h index b2185a4bb7..6aeb1a0b29 100644 --- a/engines/hugo/route.h +++ b/engines/hugo/route.h @@ -56,7 +56,7 @@ public: Route(HugoEngine *vm); void processRoute(); - bool startRoute(go_t go_for, short id, short cx, short cy); + bool startRoute(go_t go_for, int16 id, int16 cx, int16 cy); void setDirection(uint16 keyCode); void setWalk(uint16 direction); diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h index d377ddc834..202e497215 100644 --- a/engines/hugo/sound.h +++ b/engines/hugo/sound.h @@ -47,8 +47,8 @@ public: void toggleMusic(); void toggleSound(); void setMusicVolume(); - void playMusic(short tune); - void playSound(short sound, stereo_t channel, byte priority); + void playMusic(int16 tune); + void playSound(int16 sound, stereo_t channel, byte priority); void initSound(); private: |