[Scummvm-cvs-logs] SF.net SVN: scummvm:[45616] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Nov 2 22:55:02 CET 2009
Revision: 45616
http://scummvm.svn.sourceforge.net/scummvm/?rev=45616&view=rev
Author: fingolfin
Date: 2009-11-02 21:54:57 +0000 (Mon, 02 Nov 2009)
Log Message:
-----------
Changed foo(void) to foo() in almost all non-backend source files
Modified Paths:
--------------
scummvm/trunk/backends/platform/sdl/graphics.cpp
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/common/util.cpp
scummvm/trunk/common/util.h
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/agi/console.h
scummvm/trunk/engines/agi/detection.cpp
scummvm/trunk/engines/agi/keyboard.cpp
scummvm/trunk/engines/agi/op_test.cpp
scummvm/trunk/engines/agi/preagi.h
scummvm/trunk/engines/agi/predictive.cpp
scummvm/trunk/engines/agi/saveload.cpp
scummvm/trunk/engines/agi/sound.cpp
scummvm/trunk/engines/agos/midi.h
scummvm/trunk/engines/agos/script.cpp
scummvm/trunk/engines/agos/script_s1.cpp
scummvm/trunk/engines/cine/anim.h
scummvm/trunk/engines/cine/bg_list.cpp
scummvm/trunk/engines/cine/bg_list.h
scummvm/trunk/engines/cine/cine.h
scummvm/trunk/engines/cine/gfx.h
scummvm/trunk/engines/cine/part.cpp
scummvm/trunk/engines/cine/part.h
scummvm/trunk/engines/cine/saveload.cpp
scummvm/trunk/engines/cine/script.h
scummvm/trunk/engines/cine/script_fw.cpp
scummvm/trunk/engines/cine/texte.h
scummvm/trunk/engines/cine/various.cpp
scummvm/trunk/engines/cine/various.h
scummvm/trunk/engines/cine/xref.txt
scummvm/trunk/engines/cruise/actor.cpp
scummvm/trunk/engines/cruise/actor.h
scummvm/trunk/engines/cruise/cruise.h
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/cruise_main.h
scummvm/trunk/engines/cruise/decompiler.cpp
scummvm/trunk/engines/cruise/font.cpp
scummvm/trunk/engines/cruise/font.h
scummvm/trunk/engines/cruise/function.cpp
scummvm/trunk/engines/cruise/function.h
scummvm/trunk/engines/cruise/gfxModule.cpp
scummvm/trunk/engines/cruise/gfxModule.h
scummvm/trunk/engines/cruise/linker.cpp
scummvm/trunk/engines/cruise/linker.h
scummvm/trunk/engines/cruise/mainDraw.cpp
scummvm/trunk/engines/cruise/mainDraw.h
scummvm/trunk/engines/cruise/object.cpp
scummvm/trunk/engines/cruise/object.h
scummvm/trunk/engines/cruise/overlay.cpp
scummvm/trunk/engines/cruise/overlay.h
scummvm/trunk/engines/cruise/perso.cpp
scummvm/trunk/engines/cruise/perso.h
scummvm/trunk/engines/cruise/saveload.cpp
scummvm/trunk/engines/cruise/saveload.h
scummvm/trunk/engines/cruise/script.cpp
scummvm/trunk/engines/cruise/script.h
scummvm/trunk/engines/cruise/stack.cpp
scummvm/trunk/engines/cruise/stack.h
scummvm/trunk/engines/cruise/vars.h
scummvm/trunk/engines/cruise/volume.cpp
scummvm/trunk/engines/cruise/volume.h
scummvm/trunk/engines/draci/barchive.cpp
scummvm/trunk/engines/draci/barchive.h
scummvm/trunk/engines/draci/music.h
scummvm/trunk/engines/draci/sound.h
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/gob/draw_bargon.cpp
scummvm/trunk/engines/gob/expression.h
scummvm/trunk/engines/gob/goblin.cpp
scummvm/trunk/engines/gob/goblin.h
scummvm/trunk/engines/gob/goblin_v1.cpp
scummvm/trunk/engines/gob/goblin_v2.cpp
scummvm/trunk/engines/gob/hotspots.cpp
scummvm/trunk/engines/gob/map.cpp
scummvm/trunk/engines/gob/map.h
scummvm/trunk/engines/gob/map_v1.cpp
scummvm/trunk/engines/gob/mult.cpp
scummvm/trunk/engines/gob/util.cpp
scummvm/trunk/engines/gob/util.h
scummvm/trunk/engines/groovie/music.cpp
scummvm/trunk/engines/groovie/music.h
scummvm/trunk/engines/kyra/sound_intern.h
scummvm/trunk/engines/kyra/sound_midi.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/lure/sound.h
scummvm/trunk/engines/m4/console.h
scummvm/trunk/engines/m4/midi.h
scummvm/trunk/engines/made/music.h
scummvm/trunk/engines/made/redreader.cpp
scummvm/trunk/engines/made/redreader.h
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/queen/music.h
scummvm/trunk/engines/saga/actor.cpp
scummvm/trunk/engines/saga/animation.cpp
scummvm/trunk/engines/saga/animation.h
scummvm/trunk/engines/saga/console.h
scummvm/trunk/engines/saga/events.cpp
scummvm/trunk/engines/saga/events.h
scummvm/trunk/engines/saga/font.cpp
scummvm/trunk/engines/saga/font.h
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/interface.h
scummvm/trunk/engines/saga/music.cpp
scummvm/trunk/engines/saga/music.h
scummvm/trunk/engines/saga/objectmap.cpp
scummvm/trunk/engines/saga/objectmap.h
scummvm/trunk/engines/saga/palanim.cpp
scummvm/trunk/engines/saga/palanim.h
scummvm/trunk/engines/saga/puzzle.cpp
scummvm/trunk/engines/saga/puzzle.h
scummvm/trunk/engines/saga/render.cpp
scummvm/trunk/engines/saga/render.h
scummvm/trunk/engines/saga/saga.h
scummvm/trunk/engines/saga/scene.h
scummvm/trunk/engines/saga/script.cpp
scummvm/trunk/engines/saga/script.h
scummvm/trunk/engines/saga/sprite.cpp
scummvm/trunk/engines/saga/sprite.h
scummvm/trunk/engines/saga/sthread.cpp
scummvm/trunk/engines/sci/engine/kpathing.cpp
scummvm/trunk/engines/sci/engine/said.y
scummvm/trunk/engines/sci/gui/gui_animate.h
scummvm/trunk/engines/sci/gui/gui_controls.h
scummvm/trunk/engines/sci/gui/gui_gfx.cpp
scummvm/trunk/engines/sci/gui/gui_gfx.h
scummvm/trunk/engines/sci/gui/gui_portrait.h
scummvm/trunk/engines/sci/gui/gui_text.h
scummvm/trunk/engines/sci/gui/gui_transitions.h
scummvm/trunk/engines/sci/resource.h
scummvm/trunk/engines/sci/sfx/core.cpp
scummvm/trunk/engines/sci/sfx/seq/gm.cpp
scummvm/trunk/engines/scumm/he/logic_he.h
scummvm/trunk/engines/scumm/insane/insane.cpp
scummvm/trunk/engines/scumm/insane/insane.h
scummvm/trunk/engines/scumm/insane/insane_ben.cpp
scummvm/trunk/engines/scumm/insane/insane_enemy.cpp
scummvm/trunk/engines/scumm/insane/insane_iact.cpp
scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
scummvm/trunk/engines/scumm/player_nes.cpp
scummvm/trunk/engines/scumm/player_v2a.cpp
scummvm/trunk/engines/sky/autoroute.cpp
scummvm/trunk/engines/sky/autoroute.h
scummvm/trunk/engines/sky/compact.cpp
scummvm/trunk/engines/sky/compact.h
scummvm/trunk/engines/sky/control.cpp
scummvm/trunk/engines/sky/control.h
scummvm/trunk/engines/sky/disk.cpp
scummvm/trunk/engines/sky/disk.h
scummvm/trunk/engines/sky/grid.cpp
scummvm/trunk/engines/sky/grid.h
scummvm/trunk/engines/sky/intro.cpp
scummvm/trunk/engines/sky/intro.h
scummvm/trunk/engines/sky/logic.cpp
scummvm/trunk/engines/sky/logic.h
scummvm/trunk/engines/sky/mouse.cpp
scummvm/trunk/engines/sky/mouse.h
scummvm/trunk/engines/sky/music/adlibchannel.cpp
scummvm/trunk/engines/sky/music/adlibchannel.h
scummvm/trunk/engines/sky/music/adlibmusic.cpp
scummvm/trunk/engines/sky/music/adlibmusic.h
scummvm/trunk/engines/sky/music/gmchannel.cpp
scummvm/trunk/engines/sky/music/gmchannel.h
scummvm/trunk/engines/sky/music/gmmusic.cpp
scummvm/trunk/engines/sky/music/gmmusic.h
scummvm/trunk/engines/sky/music/mt32music.cpp
scummvm/trunk/engines/sky/music/mt32music.h
scummvm/trunk/engines/sky/music/musicbase.cpp
scummvm/trunk/engines/sky/music/musicbase.h
scummvm/trunk/engines/sky/screen.cpp
scummvm/trunk/engines/sky/screen.h
scummvm/trunk/engines/sky/sky.cpp
scummvm/trunk/engines/sky/sky.h
scummvm/trunk/engines/sky/sound.cpp
scummvm/trunk/engines/sky/sound.h
scummvm/trunk/engines/sky/text.cpp
scummvm/trunk/engines/sky/text.h
scummvm/trunk/engines/sword1/animation.cpp
scummvm/trunk/engines/sword1/animation.h
scummvm/trunk/engines/sword1/collision.h
scummvm/trunk/engines/sword1/control.cpp
scummvm/trunk/engines/sword1/control.h
scummvm/trunk/engines/sword1/eventman.cpp
scummvm/trunk/engines/sword1/eventman.h
scummvm/trunk/engines/sword1/logic.cpp
scummvm/trunk/engines/sword1/logic.h
scummvm/trunk/engines/sword1/memman.cpp
scummvm/trunk/engines/sword1/memman.h
scummvm/trunk/engines/sword1/menu.cpp
scummvm/trunk/engines/sword1/menu.h
scummvm/trunk/engines/sword1/mouse.cpp
scummvm/trunk/engines/sword1/mouse.h
scummvm/trunk/engines/sword1/music.cpp
scummvm/trunk/engines/sword1/objectman.cpp
scummvm/trunk/engines/sword1/objectman.h
scummvm/trunk/engines/sword1/resman.cpp
scummvm/trunk/engines/sword1/resman.h
scummvm/trunk/engines/sword1/router.h
scummvm/trunk/engines/sword1/screen.cpp
scummvm/trunk/engines/sword1/screen.h
scummvm/trunk/engines/sword1/sound.cpp
scummvm/trunk/engines/sword1/sound.h
scummvm/trunk/engines/sword1/sword1.cpp
scummvm/trunk/engines/sword1/sword1.h
scummvm/trunk/engines/sword1/text.cpp
scummvm/trunk/engines/sword1/text.h
scummvm/trunk/engines/sword2/animation.cpp
scummvm/trunk/engines/sword2/animation.h
scummvm/trunk/engines/tinsel/actors.cpp
scummvm/trunk/engines/tinsel/actors.h
scummvm/trunk/engines/tinsel/background.cpp
scummvm/trunk/engines/tinsel/background.h
scummvm/trunk/engines/tinsel/bg.cpp
scummvm/trunk/engines/tinsel/bmv.cpp
scummvm/trunk/engines/tinsel/bmv.h
scummvm/trunk/engines/tinsel/cliprect.cpp
scummvm/trunk/engines/tinsel/config.cpp
scummvm/trunk/engines/tinsel/config.h
scummvm/trunk/engines/tinsel/cursor.cpp
scummvm/trunk/engines/tinsel/cursor.h
scummvm/trunk/engines/tinsel/debugger.cpp
scummvm/trunk/engines/tinsel/debugger.h
scummvm/trunk/engines/tinsel/dialogs.cpp
scummvm/trunk/engines/tinsel/dialogs.h
scummvm/trunk/engines/tinsel/drives.cpp
scummvm/trunk/engines/tinsel/drives.h
scummvm/trunk/engines/tinsel/events.cpp
scummvm/trunk/engines/tinsel/events.h
scummvm/trunk/engines/tinsel/faders.cpp
scummvm/trunk/engines/tinsel/faders.h
scummvm/trunk/engines/tinsel/font.cpp
scummvm/trunk/engines/tinsel/font.h
scummvm/trunk/engines/tinsel/handle.cpp
scummvm/trunk/engines/tinsel/handle.h
scummvm/trunk/engines/tinsel/heapmem.cpp
scummvm/trunk/engines/tinsel/mareels.cpp
scummvm/trunk/engines/tinsel/mareels.h
scummvm/trunk/engines/tinsel/move.cpp
scummvm/trunk/engines/tinsel/move.h
scummvm/trunk/engines/tinsel/music.cpp
scummvm/trunk/engines/tinsel/music.h
scummvm/trunk/engines/tinsel/object.cpp
scummvm/trunk/engines/tinsel/object.h
scummvm/trunk/engines/tinsel/palette.cpp
scummvm/trunk/engines/tinsel/palette.h
scummvm/trunk/engines/tinsel/pcode.cpp
scummvm/trunk/engines/tinsel/pcode.h
scummvm/trunk/engines/tinsel/pdisplay.cpp
scummvm/trunk/engines/tinsel/pdisplay.h
scummvm/trunk/engines/tinsel/play.cpp
scummvm/trunk/engines/tinsel/play.h
scummvm/trunk/engines/tinsel/polygons.cpp
scummvm/trunk/engines/tinsel/polygons.h
scummvm/trunk/engines/tinsel/rince.cpp
scummvm/trunk/engines/tinsel/rince.h
scummvm/trunk/engines/tinsel/saveload.cpp
scummvm/trunk/engines/tinsel/savescn.cpp
scummvm/trunk/engines/tinsel/savescn.h
scummvm/trunk/engines/tinsel/scene.cpp
scummvm/trunk/engines/tinsel/scene.h
scummvm/trunk/engines/tinsel/sched.cpp
scummvm/trunk/engines/tinsel/sched.h
scummvm/trunk/engines/tinsel/scroll.cpp
scummvm/trunk/engines/tinsel/scroll.h
scummvm/trunk/engines/tinsel/sound.cpp
scummvm/trunk/engines/tinsel/sound.h
scummvm/trunk/engines/tinsel/strres.cpp
scummvm/trunk/engines/tinsel/strres.h
scummvm/trunk/engines/tinsel/sysvar.cpp
scummvm/trunk/engines/tinsel/sysvar.h
scummvm/trunk/engines/tinsel/timers.cpp
scummvm/trunk/engines/tinsel/timers.h
scummvm/trunk/engines/tinsel/tinlib.cpp
scummvm/trunk/engines/tinsel/tinlib.h
scummvm/trunk/engines/tinsel/tinsel.cpp
scummvm/trunk/engines/tinsel/tinsel.h
scummvm/trunk/engines/tinsel/token.cpp
scummvm/trunk/engines/tinsel/token.h
scummvm/trunk/sound/mididrv.h
scummvm/trunk/sound/mods/infogrames.cpp
scummvm/trunk/sound/mods/infogrames.h
scummvm/trunk/sound/mods/paula.h
scummvm/trunk/sound/mods/protracker.cpp
Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -89,7 +89,7 @@
return GFX_DOUBLESIZE;
}
-void OSystem_SDL::beginGFXTransaction(void) {
+void OSystem_SDL::beginGFXTransaction() {
assert(_transactionMode == kTransactionNone);
_transactionMode = kTransactionActive;
@@ -107,7 +107,7 @@
_oldVideoMode = _videoMode;
}
-OSystem::TransactionError OSystem_SDL::endGFXTransaction(void) {
+OSystem::TransactionError OSystem_SDL::endGFXTransaction() {
int errors = kTransactionSuccess;
assert(_transactionMode != kTransactionNone);
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -575,7 +575,7 @@
free(icon);
}
-OSystem::MutexRef OSystem_SDL::createMutex(void) {
+OSystem::MutexRef OSystem_SDL::createMutex() {
return (MutexRef) SDL_CreateMutex();
}
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -90,8 +90,8 @@
virtual void initBackend();
- void beginGFXTransaction(void);
- TransactionError endGFXTransaction(void);
+ void beginGFXTransaction();
+ TransactionError endGFXTransaction();
#ifdef USE_RGB_COLOR
// Game screen
Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/common/util.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -32,7 +32,7 @@
#ifdef _WIN32_WCE
// This is required for the debugger attachment
-extern bool isSmartphone(void);
+extern bool isSmartphone();
#endif
#ifdef __PLAYSTATION2__
@@ -178,7 +178,7 @@
return _randSeed % (max + 1);
}
-uint RandomSource::getRandomBit(void) {
+uint RandomSource::getRandomBit() {
_randSeed = 0xDEADBF03 * (_randSeed + 1);
_randSeed = (_randSeed >> 13) | (_randSeed << 19);
return _randSeed & 1;
Modified: scummvm/trunk/common/util.h
===================================================================
--- scummvm/trunk/common/util.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/common/util.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -139,7 +139,7 @@
* Identical to getRandomNumber(1), but faster, hopefully.
* @return a random bit, either 0 or 1
*/
- uint getRandomBit(void);
+ uint getRandomBit();
/**
* Generates a random unsigned integer in the interval [min, max].
* @param min the lower bound
Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/agi.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -269,7 +269,7 @@
}
}
-void AgiEngine::pollTimer(void) {
+void AgiEngine::pollTimer() {
static uint32 m = 0;
uint32 dm;
@@ -715,7 +715,7 @@
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech);
}
-void AgiEngine::parseFeatures(void) {
+void AgiEngine::parseFeatures() {
if (!ConfMan.hasKey("features"))
return;
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/agi.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -721,10 +721,10 @@
bool _noSaveLoadAllowed;
- virtual void pollTimer(void) = 0;
- virtual int getKeypress(void) = 0;
- virtual bool isKeypress(void) = 0;
- virtual void clearKeyQueue(void) = 0;
+ virtual void pollTimer() = 0;
+ virtual int getKeypress() = 0;
+ virtual bool isKeypress() = 0;
+ virtual void clearKeyQueue() = 0;
AgiBase(OSystem *syst, const AGIGameDescription *gameDesc);
@@ -755,9 +755,9 @@
Common::Language getLanguage() const;
Common::Platform getPlatform() const;
const char *getGameMD5() const;
- void initFeatures(void);
+ void initFeatures();
void setFeature(uint32 feature);
- void initVersion(void);
+ void initVersion();
void setVersion(uint16 version);
bool canLoadGameStateCurrently();
@@ -800,7 +800,7 @@
int checkCollision(VtEntry *v);
int checkPosition(VtEntry *v);
- void parseFeatures(void);
+ void parseFeatures();
int _firstSlot;
@@ -854,10 +854,10 @@
int agiUnloadResource(int, int);
void agiUnloadResources();
- virtual void pollTimer(void);
- virtual int getKeypress(void);
- virtual bool isKeypress(void);
- virtual void clearKeyQueue(void);
+ virtual void pollTimer();
+ virtual int getKeypress();
+ virtual bool isKeypress();
+ virtual void clearKeyQueue();
static void agiTimerFunctionLow(void *refCon);
void initPriTable();
@@ -981,27 +981,27 @@
int messageBox(const char *);
int selectionBox(const char *, const char **);
- void closeWindow(void);
+ void closeWindow();
void drawWindow(int, int, int, int);
void printText(const char *, int, int, int, int, int, int, bool checkerboard = false);
void printTextConsole(const char *, int, int, int, int, int);
int print(const char *, int, int, int);
char *wordWrapString(const char *, int *);
char *agiSprintf(const char *);
- void writeStatus(void);
- void writePrompt(void);
- void clearPrompt(void);
+ void writeStatus();
+ void writePrompt();
+ void clearPrompt();
void clearLines(int, int, int);
void flushLines(int, int);
- bool predictiveDialog(void);
+ bool predictiveDialog();
private:
void printStatus(const char *message, ...) GCC_PRINTF(2, 3);
void printText2(int l, const char *msg, int foff, int xoff, int yoff, int len, int fg, int bg, bool checkerboard = false);
void blitTextbox(const char *p, int y, int x, int len);
void eraseTextbox();
- void loadDict(void);
- bool matchWord(void);
+ void loadDict();
+ bool matchWord();
// Predictive dialog
// TODO: Move this to a separate class
Modified: scummvm/trunk/engines/agi/console.h
===================================================================
--- scummvm/trunk/engines/agi/console.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/console.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -49,7 +49,7 @@
class Console : public GUI::Debugger {
public:
Console(AgiEngine *vm);
- virtual ~Console(void);
+ virtual ~Console();
protected:
virtual void preEnter();
@@ -81,7 +81,7 @@
class PreAGI_Console : public GUI::Debugger {
public:
PreAGI_Console(PreAgiEngine *vm);
- virtual ~PreAGI_Console(void) {}
+ virtual ~PreAGI_Console() {}
protected:
virtual void preEnter() {}
@@ -95,7 +95,7 @@
class Mickey_Console : public PreAGI_Console {
public:
Mickey_Console(PreAgiEngine *vm, Mickey *mickey);
- virtual ~Mickey_Console(void) {}
+ virtual ~Mickey_Console() {}
protected:
virtual void preEnter() {}
@@ -113,7 +113,7 @@
class Winnie_Console : public PreAGI_Console {
public:
Winnie_Console(PreAgiEngine *vm, Winnie *winnie);
- virtual ~Winnie_Console(void) {}
+ virtual ~Winnie_Console() {}
protected:
virtual void preEnter() {}
Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/detection.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -74,7 +74,7 @@
return _gameDescription->desc.filesDescriptions[0].md5;
}
-void AgiBase::initFeatures(void) {
+void AgiBase::initFeatures() {
_gameFeatures = _gameDescription->features;
}
@@ -86,7 +86,7 @@
_gameVersion = version;
}
-void AgiBase::initVersion(void) {
+void AgiBase::initVersion() {
_gameVersion = _gameDescription->version;
}
Modified: scummvm/trunk/engines/agi/keyboard.cpp
===================================================================
--- scummvm/trunk/engines/agi/keyboard.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/keyboard.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -421,12 +421,12 @@
return key;
}
-bool AgiEngine::isKeypress(void) {
+bool AgiEngine::isKeypress() {
processEvents();
return _keyQueueStart != _keyQueueEnd;
}
-int AgiEngine::getKeypress(void) {
+int AgiEngine::getKeypress() {
int k;
while (_keyQueueStart == _keyQueueEnd) // block
@@ -437,7 +437,7 @@
return k;
}
-void AgiEngine::clearKeyQueue(void) {
+void AgiEngine::clearKeyQueue() {
while (isKeypress()) {
getKeypress();
}
Modified: scummvm/trunk/engines/agi/op_test.cpp
===================================================================
--- scummvm/trunk/engines/agi/op_test.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/op_test.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -36,7 +36,7 @@
static uint8 testPosn(uint8, uint8, uint8, uint8, uint8);
static uint8 testSaid(uint8, uint8 *);
static uint8 testController(uint8);
-static uint8 testKeypressed(void);
+static uint8 testKeypressed();
static uint8 testCompareStrings(uint8, uint8);
static AgiEngine *g_agi;
Modified: scummvm/trunk/engines/agi/preagi.h
===================================================================
--- scummvm/trunk/engines/agi/preagi.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/preagi.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -41,10 +41,10 @@
void initialize();
public:
- void pollTimer(void) {}
- int getKeypress(void) { return 0; }
- bool isKeypress(void) { return false; }
- void clearKeyQueue(void) {}
+ void pollTimer() {}
+ int getKeypress() { return 0; }
+ bool isKeypress() { return false; }
+ void clearKeyQueue() {}
PreAgiEngine(OSystem *syst, const AGIGameDescription *gameDesc);
virtual ~PreAgiEngine();
Modified: scummvm/trunk/engines/agi/predictive.cpp
===================================================================
--- scummvm/trunk/engines/agi/predictive.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/predictive.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -92,7 +92,7 @@
memcpy(str, tmp.c_str(), strlen(str));
}
-bool AgiEngine::predictiveDialog(void) {
+bool AgiEngine::predictiveDialog() {
int key = 0, active = -1, lastactive = 0;
bool rc = false;
uint8 x;
@@ -483,7 +483,7 @@
return rc;
}
-void AgiEngine::loadDict(void) {
+void AgiEngine::loadDict() {
Common::File inFile;
int lines = 0;
@@ -550,7 +550,7 @@
printf("Time to parse pred.dic: %d, total: %d\n", time3-time2, time3-time1);
}
-bool AgiEngine::matchWord(void) {
+bool AgiEngine::matchWord() {
if (_currentCode.empty()) {
return false;
}
Modified: scummvm/trunk/engines/agi/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agi/saveload.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/saveload.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -974,11 +974,11 @@
}
}
-void AgiEngine::clearImageStack(void) {
+void AgiEngine::clearImageStack() {
_imageStack.clear();
}
-void AgiEngine::releaseImageStack(void) {
+void AgiEngine::releaseImageStack() {
_imageStack.clear();
}
Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agi/sound.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -931,7 +931,7 @@
}
}
-uint32 SoundMgr::mixSound(void) {
+uint32 SoundMgr::mixSound() {
register int i, p;
const int16 *src;
int c, b, m;
Modified: scummvm/trunk/engines/agos/midi.h
===================================================================
--- scummvm/trunk/engines/agos/midi.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agos/midi.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -121,7 +121,7 @@
// Timing functions - MidiDriver now operates timers
void setTimerCallback(void *timer_param, void (*timer_proc) (void *)) { }
- uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; }
+ uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; }
// Channel allocation functions
MidiChannel *allocateChannel() { return 0; }
Modified: scummvm/trunk/engines/agos/script.cpp
===================================================================
--- scummvm/trunk/engines/agos/script.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agos/script.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -33,7 +33,7 @@
#include "agos/agos.h"
#ifdef _WIN32_WCE
-extern bool isSmartphone(void);
+extern bool isSmartphone();
#endif
namespace AGOS {
Modified: scummvm/trunk/engines/agos/script_s1.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_s1.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/agos/script_s1.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -29,7 +29,7 @@
#include "agos/agos.h"
#ifdef _WIN32_WCE
-extern bool isSmartphone(void);
+extern bool isSmartphone();
#endif
namespace AGOS {
Modified: scummvm/trunk/engines/cine/anim.h
===================================================================
--- scummvm/trunk/engines/cine/anim.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/anim.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -101,7 +101,7 @@
extern Common::Array<AnimData> animDataTable;
-void freeAnimDataTable(void);
+void freeAnimDataTable();
void freeAnimDataRange(byte startIdx, byte numIdx);
int loadResource(const char *resourceName, int16 idx = -1);
void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGameFormat saveGameFormat);
Modified: scummvm/trunk/engines/cine/bg_list.cpp
===================================================================
--- scummvm/trunk/engines/cine/bg_list.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/bg_list.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -76,7 +76,7 @@
/*! \brief Reset var8 (probably something related to bgIncrustList)
*/
-void resetBgIncrustList(void) {
+void resetBgIncrustList() {
var8 = 0;
}
Modified: scummvm/trunk/engines/cine/bg_list.h
===================================================================
--- scummvm/trunk/engines/cine/bg_list.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/bg_list.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -49,7 +49,7 @@
void addSpriteFilledToBGList(int16 idx);
void createBgIncrustListElement(int16 objIdx, int16 param);
-void resetBgIncrustList(void);
+void resetBgIncrustList();
void loadBgIncrustFromSave(Common::SeekableReadStream &fHandle);
} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/cine.h
===================================================================
--- scummvm/trunk/engines/cine/cine.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/cine.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -87,8 +87,8 @@
Common::Language getLanguage() const;
Common::Platform getPlatform() const;
- bool loadSaveDirectory(void);
- void makeSystemMenu(void);
+ bool loadSaveDirectory();
+ void makeSystemMenu();
int modifyGameSpeed(int speedChange);
int getTimerDelay() const;
Common::Error loadGameState(int slot);
@@ -106,7 +106,7 @@
TextHandler _textHandler;
private:
- void initialize(void);
+ void initialize();
void resetEngine();
bool loadPlainSaveFW(Common::SeekableReadStream &in, CineSaveGameFormat saveGameFormat);
bool loadTempSaveOS(Common::SeekableReadStream &in);
Modified: scummvm/trunk/engines/cine/gfx.h
===================================================================
--- scummvm/trunk/engines/cine/gfx.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/gfx.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -264,7 +264,7 @@
void gfxCopyPage(byte *source, byte *dest);
void transformPaletteRange(byte startColor, byte numColor, int8 r, int8 g, int8 b);
-void gfxFlipPage(void);
+void gfxFlipPage();
void gfxDrawMaskedSprite(const byte *ptr, const byte *msk, uint16 width, uint16 height, byte *page, int16 x, int16 y);
void gfxFillSprite(const byte *src4, uint16 sw, uint16 sh, byte *dst4, int16 sx, int16 sy, uint8 fillColor = 0);
@@ -288,17 +288,17 @@
void drawSpriteRaw2(const byte *spritePtr, byte transColor, int16 width, int16 height, byte *page, int16 x, int16 y);
void maskBgOverlay(const byte *spritePtr, const byte *maskPtr, int16 width, int16 height, byte *page, int16 x, int16 y);
-void fadeFromBlack(void);
-void fadeToBlack(void);
+void fadeFromBlack();
+void fadeToBlack();
// wtf?!
//void gfxDrawMaskedSprite(byte *param1, byte *param2, byte *param3, byte *param4, int16 param5);
-void gfxWaitVBL(void);
-void gfxRedrawMouseCursor(void);
+void gfxWaitVBL();
+void gfxRedrawMouseCursor();
void blitScreen(byte *frontBuffer, byte *backbuffer);
void blitRawScreen(byte *frontBuffer);
-void flip(void);
+void flip();
} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/part.cpp
===================================================================
--- scummvm/trunk/engines/cine/part.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/part.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -65,7 +65,7 @@
loadPal(partName);
}
-void closePart(void) {
+void closePart() {
// TODO
}
Modified: scummvm/trunk/engines/cine/part.h
===================================================================
--- scummvm/trunk/engines/cine/part.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/part.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -40,7 +40,7 @@
extern Common::Array<PartBuffer> partBuffer;
void loadPart(const char *partName);
-void closePart(void);
+void closePart();
int16 findFileInBundle(const char *fileName);
Modified: scummvm/trunk/engines/cine/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cine/saveload.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/saveload.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -457,7 +457,7 @@
}
}
-bool CineEngine::loadSaveDirectory(void) {
+bool CineEngine::loadSaveDirectory() {
Common::InSaveFile *fHandle;
char tmp[80];
Modified: scummvm/trunk/engines/cine/script.h
===================================================================
--- scummvm/trunk/engines/cine/script.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/script.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -63,7 +63,7 @@
explicit ScriptVars(unsigned int len = 50);
ScriptVars(Common::SeekableReadStream &fHandle, unsigned int len = 50);
ScriptVars(const ScriptVars &src);
- ~ScriptVars(void);
+ ~ScriptVars();
ScriptVars &operator=(const ScriptVars &src);
int16 &operator[](unsigned int idx);
@@ -73,7 +73,7 @@
void save(Common::OutSaveFile &fHandle, unsigned int len) const;
void load(Common::SeekableReadStream &fHandle);
void load(Common::SeekableReadStream &fHandle, unsigned int len);
- void reset(void);
+ void reset();
};
class FWScriptInfo;
@@ -98,7 +98,7 @@
explicit RawScript(uint16 size);
RawScript(const FWScriptInfo &info, const byte *data, uint16 size);
RawScript(const RawScript &src);
- ~RawScript(void);
+ ~RawScript();
RawScript &operator=(const RawScript &src);
@@ -106,7 +106,7 @@
/*! \brief Size of script
* \return Size of script
*/
- const ScriptVars &labels(void) const;
+ const ScriptVars &labels() const;
byte getByte(unsigned int pos) const;
uint16 getWord(unsigned int pos) const;
const char *getString(unsigned int pos) const;
@@ -130,7 +130,7 @@
/// \brief Run the script one more time
/// \return Run count before incrementation
- int16 run(void) { return _runCount++; }
+ int16 run() { return _runCount++; }
};
/*! \brief Future Wars script, prcLinkedListStruct replacement
@@ -283,7 +283,7 @@
FWScript(const RawScript &script, int16 index);
// FWScript(const RawObjectScript &script, int16 index);
FWScript(const FWScript &src);
- ~FWScript(void);
+ ~FWScript();
int execute();
void save(Common::OutSaveFile &fHandle) const;
@@ -380,11 +380,11 @@
void runObjectScript(int16 entryIdx);
-void executeObjectScripts(void);
-void executeGlobalScripts(void);
+void executeObjectScripts();
+void executeGlobalScripts();
-void purgeObjectScripts(void);
-void purgeGlobalScripts(void);
+void purgeObjectScripts();
+void purgeGlobalScripts();
} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/script_fw.cpp
===================================================================
--- scummvm/trunk/engines/cine/script_fw.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/script_fw.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -263,7 +263,7 @@
/*! \brief Destructor
*/
-ScriptVars::~ScriptVars(void) {
+ScriptVars::~ScriptVars() {
delete[] _vars;
}
@@ -340,7 +340,7 @@
/*! \brief Reset all values to 0
*/
-void ScriptVars::reset(void) {
+void ScriptVars::reset() {
memset( _vars, 0, _size * sizeof(int16));
}
@@ -374,7 +374,7 @@
/*! \brief Destructor
*/
-RawScript::~RawScript(void) {
+RawScript::~RawScript() {
delete[] _data;
}
@@ -511,7 +511,7 @@
/*! \brief Initial script labels
* \return Precalculated script labels
*/
-const ScriptVars &RawScript::labels(void) const {
+const ScriptVars &RawScript::labels() const {
assert(_data);
return _labels;
}
@@ -614,7 +614,7 @@
_compare(src._compare), _index(src._index), _labels(src._labels),
_localVars(src._localVars), _globalVars(src._globalVars), _info(info) { }
-FWScript::~FWScript(void) {
+FWScript::~FWScript() {
delete _info;
}
@@ -1916,7 +1916,7 @@
return flag;
}
-void executeObjectScripts(void) {
+void executeObjectScripts() {
ScriptList::iterator it = objectScripts.begin();
for (; it != objectScripts.end();) {
if ((*it)->_index < 0 || (*it)->execute() < 0) {
@@ -1927,7 +1927,7 @@
}
}
-void executeGlobalScripts(void) {
+void executeGlobalScripts() {
ScriptList::iterator it = globalScripts.begin();
for (; it != globalScripts.end();) {
if ((*it)->_index < 0 || (*it)->execute() < 0) {
@@ -1941,13 +1941,13 @@
/*! \todo Remove object scripts with script index of -1 (Not script position, but script index!).
* This would seem to be valid for both Future Wars and Operation Stealth.
*/
-void purgeObjectScripts(void) {
+void purgeObjectScripts() {
}
/*! \todo Remove global scripts with script index of -1 (Not script position, but script index!).
* This would seem to be valid for both Future Wars and Operation Stealth.
*/
-void purgeGlobalScripts(void) {
+void purgeGlobalScripts() {
}
////////////////////////////////////
Modified: scummvm/trunk/engines/cine/texte.h
===================================================================
--- scummvm/trunk/engines/cine/texte.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/texte.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -63,7 +63,7 @@
void loadTextData(const char *filename);
void loadErrmessDat(const char *fname);
-void freeErrmessDat(void);
+void freeErrmessDat();
void loadPoldatDat(const char *fname);
int fitLine(const char *ptr, int maxWidth, int &words, int &width);
Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/various.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -56,7 +56,7 @@
void drawString(const char *string, byte param) {
}
-void waitPlayerInput(void) {
+void waitPlayerInput() {
}
void setTextWindow(uint16 param1, uint16 param2, uint16 param3, uint16 param4) {
@@ -151,7 +151,7 @@
egoMovedWithKeyboard = x || y;
}
-void stopMusicAfterFadeOut(void) {
+void stopMusicAfterFadeOut() {
// if (g_sfxPlayer->_fadeOutCounter != 0 && g_sfxPlayer->_fadeOutCounter < 100) {
// g_sfxPlayer->stop();
// }
@@ -324,7 +324,7 @@
}
}
-void CineEngine::makeSystemMenu(void) {
+void CineEngine::makeSystemMenu() {
int16 numEntry, systemCommand;
int16 mouseX, mouseY, mouseButton;
int16 selectedSave;
@@ -558,7 +558,7 @@
// TODO: Make separate functions for Future Wars's and Operation Stealth's version of this function, this is getting too messy
// TODO: Add support for using the different prepositions for different verbs (Doesn't work currently)
-void makeCommandLine(void) {
+void makeCommandLine() {
uint16 x, y;
commandVar1 = 0;
@@ -799,7 +799,7 @@
return currentSelection;
}
-void makeActionMenu(void) {
+void makeActionMenu() {
uint16 mouseButton;
uint16 mouseX;
uint16 mouseY;
@@ -822,7 +822,7 @@
inMenu = false;
}
-uint16 executePlayerInput(void) {
+uint16 executePlayerInput() {
uint16 var_5E;
uint16 var_2;
uint16 mouseX, mouseY, mouseButton;
@@ -1181,10 +1181,10 @@
return 0;
}
-void mainLoopSub6(void) {
+void mainLoopSub6() {
}
-void checkForPendingDataLoad(void) {
+void checkForPendingDataLoad() {
if (newPrcName[0] != 0) {
bool loadPrcOk = loadPrc(newPrcName);
@@ -1228,7 +1228,7 @@
}
}
-void hideMouse(void) {
+void hideMouse() {
}
void removeExtention(char *dest, const char *source) {
@@ -1587,7 +1587,7 @@
}
}
-void processSeqList(void) {
+void processSeqList() {
Common::List<SeqListElement>::iterator it;
for (it = seqList.begin(); it != seqList.end(); ++it) {
Modified: scummvm/trunk/engines/cine/various.h
===================================================================
--- scummvm/trunk/engines/cine/various.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/various.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -39,10 +39,10 @@
void initLanguage(Common::Language lang);
int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X, uint16 Y, uint16 width, bool recheckValue = false);
-void makeCommandLine(void);
-void makeActionMenu(void);
+void makeCommandLine();
+void makeActionMenu();
void drawString(const char *string, byte param);
-void waitPlayerInput(void);
+void waitPlayerInput();
void setTextWindow(uint16 param1, uint16 param2, uint16 param3, uint16 param4);
extern bool disableSystemMenu;
@@ -111,25 +111,25 @@
extern char currentCtName[15];
extern char currentPartName[15];
-void stopSample(void);
-void stopMusicAfterFadeOut(void);
-uint16 executePlayerInput(void);
+void stopSample();
+void stopMusicAfterFadeOut();
+uint16 executePlayerInput();
-void drawOverlays(void);
+void drawOverlays();
extern uint16 mouseUpdateStatus;
extern uint16 dummyU16;
void getMouseData(uint16 param, uint16 *pButton, uint16 *pX, uint16 *pY);
-int getKeyData(void);
+int getKeyData();
uint16 processKeyboard(uint16 param);
-void mainLoopSub6(void);
+void mainLoopSub6();
-void checkForPendingDataLoad(void);
+void checkForPendingDataLoad();
-void hideMouse(void);
+void hideMouse();
void removeExtention(char *dest, const char *source);
@@ -150,7 +150,7 @@
bool isSeqRunning(uint16 param1, uint16 param2, uint16 param3);
void addSeqListElement(uint16 objIdx, int16 param1, int16 param2, int16 frame, int16 param4, int16 param5, int16 param6, int16 param7, int16 param8);
void modifySeqListElement(uint16 objIdx, int16 var4Test, int16 param1, int16 param2, int16 param3, int16 param4);
-void processSeqList(void);
+void processSeqList();
void resetGfxEntityEntry(uint16 objIdx);
Modified: scummvm/trunk/engines/cine/xref.txt
===================================================================
--- scummvm/trunk/engines/cine/xref.txt 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cine/xref.txt 2009-11-02 21:54:57 UTC (rev 45616)
@@ -128,7 +128,7 @@
prc.cpp:
resetGlobalScriptsHead() - removed (obsoleted by Common::List)
-freePrcLinkedList(void) - removed (obsoleted by Common::List::clear())
+freePrcLinkedList() - removed (obsoleted by Common::List::clear())
rel.cpp:
resetObjectScriptHead() - removed (obsoleted by Common::List)
Modified: scummvm/trunk/engines/cruise/actor.cpp
===================================================================
--- scummvm/trunk/engines/cruise/actor.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/actor.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -711,7 +711,7 @@
/**
* Handles the processing of any active actors to allow for handling movement
*/
-void processAnimation(void) {
+void processAnimation() {
objectParamsQuery params;
MovementEntry moveInfo;
actorStruct *currentActor = actorHead.next;
Modified: scummvm/trunk/engines/cruise/actor.h
===================================================================
--- scummvm/trunk/engines/cruise/actor.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/actor.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -68,7 +68,7 @@
bool isAnimFinished(int overlayIdx, int idx, actorStruct *pStartEntry, int objType);
actorStruct *findActor(actorStruct *pStartEntry, int overlayIdx, int objIdx, int type);
-void processAnimation(void);
+void processAnimation();
void getPixel(int x, int y);
} // End of namespace Cruise
Modified: scummvm/trunk/engines/cruise/cruise.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/cruise.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -63,12 +63,12 @@
int _gameSpeed;
bool _speedFlag;
- void initialize(void);
- void deinitialise(void);
+ void initialize();
+ void deinitialise();
bool loadLanguageStrings();
bool makeLoad(char *saveName);
void mainLoop();
- int processInput(void);
+ int processInput();
protected:
// Engine APIs
virtual Common::Error run();
@@ -100,7 +100,7 @@
virtual void syncSoundSettings();
const CRUISEGameDescription *_gameDescription;
- void initAllData(void);
+ void initAllData();
Common::RandomSource _rnd;
};
Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -441,7 +441,7 @@
return NULL;
}
-void CruiseEngine::initAllData(void) {
+void CruiseEngine::initAllData() {
int i;
setupFuncArray();
@@ -779,7 +779,7 @@
Common::KeyCode keyboardCode = Common::KEYCODE_INVALID;
-void freeStuff2(void) {
+void freeStuff2() {
warning("implement freeStuff2");
}
@@ -1070,7 +1070,7 @@
return found;
}
-int processInventory(void) {
+int processInventory() {
if (menuTable[1]) {
menuElementSubStruct *pMenuElementSub = getSelectedEntryInMenu(menuTable[1]);
@@ -1380,7 +1380,7 @@
}
}
-void closeAllMenu(void) {
+void closeAllMenu() {
if (menuTable[0]) {
freeMenu(menuTable[0]);
menuTable[0] = NULL;
@@ -1417,7 +1417,7 @@
extern bool manageEvents();
-int CruiseEngine::processInput(void) {
+int CruiseEngine::processInput() {
int16 mouseX = 0;
int16 mouseY = 0;
int16 button = 0;
@@ -1788,7 +1788,7 @@
}
-void CruiseEngine::mainLoop(void) {
+void CruiseEngine::mainLoop() {
//int32 t_start,t_left;
//uint32 t_end;
//int32 q=0; /* Dummy */
Modified: scummvm/trunk/engines/cruise/cruise_main.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/cruise_main.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -94,7 +94,7 @@
void resetFileEntry(int32 entryNumber);
uint8 *mainProc14(uint16 overlay, uint16 idx);
void printInfoBlackBox(const char *string);
-void waitForPlayerInput(void);
+void waitForPlayerInput();
void loadPackedFileToMem(int fileIdx, uint8 * buffer);
int getNumObjectsByClass(int scriptIdx, int param);
void resetFileEntryRange(int param1, int param2);
@@ -105,14 +105,14 @@
void resetPtr2(scriptInstanceStruct * ptr);
void getFileExtention(const char *name, char *buffer);
void *allocAndZero(int size);
-void freeStuff2(void);
-void mainLoop(void);
+void freeStuff2();
+void mainLoop();
void getMouseStatus(int16 *pMouseVar, int16 *pMouseX, int16 *pMouseButton, int16 *pMouseY);
bool testMask(int x, int y, unsigned char* pData, int stride);
menuElementSubStruct *getSelectedEntryInMenu(menuStruct *pMenu);
-void closeAllMenu(void);
+void closeAllMenu();
int removeFinishedScripts(scriptInstanceStruct *ptrHandle);
-void initBigVar3(void);
+void initBigVar3();
void resetActorPtr(actorStruct *ptr);
void removeAllScripts(scriptInstanceStruct *ptrHandle);
Modified: scummvm/trunk/engines/cruise/decompiler.cpp
===================================================================
--- scummvm/trunk/engines/cruise/decompiler.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/decompiler.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -234,7 +234,7 @@
sprintf(buffer, "%d", var);
}
-char getByteFromDecompScriptReal(void) {
+char getByteFromDecompScriptReal() {
short int var = currentDecompScript[currentDecompScriptPtr->var4];
currentDecompScriptPtr->var4 = currentDecompScriptPtr->var4 + 1;
@@ -257,7 +257,7 @@
sprintf(buffer, "%d", var);
}
-int16 getShortFromDecompScriptReal(void) {
+int16 getShortFromDecompScriptReal() {
int16 var = (int16)READ_BE_UINT16(currentDecompScript + currentDecompScriptPtr->var4);
currentDecompScriptPtr->var4 = currentDecompScriptPtr->var4 + 2;
@@ -345,7 +345,7 @@
}
}
-int decompLoadVar(void) {
+int decompLoadVar() {
switch (currentScriptOpcodeType) {
case 0: {
char buffer[256];
@@ -416,7 +416,7 @@
}
}
-int decompSaveVar(void) {
+int decompSaveVar() {
// int var = popVar();
switch (currentScriptOpcodeType) {
@@ -492,7 +492,7 @@
return (0);
}
-int decompOpcodeType2(void) {
+int decompOpcodeType2() {
switch (currentScriptOpcodeType) {
case 1: {
char buffer3[256];
@@ -536,7 +536,7 @@
return (0);
}
-int decompMath(void) {
+int decompMath() {
char *param1 = popDecomp();
char *param2 = popDecomp();
@@ -588,7 +588,7 @@
return (0);
}
-int decompBoolCompare(void) {
+int decompBoolCompare() {
char *param1;
char *param2;
@@ -601,7 +601,7 @@
return 0;
}
-int decompTest(void) {
+int decompTest() {
unsigned long int oldOffset = currentDecompScriptPtr->var4;
short int offset = getShortFromDecompScriptReal();
@@ -659,7 +659,7 @@
return 0;
}
-int decompCompare(void) {
+int decompCompare() {
char *param;
param = popDecomp();
@@ -684,7 +684,7 @@
return 0;
}
-int decompSwapStack(void) {
+int decompSwapStack() {
char *stack1;
char *stack2;
char buffer1[4000];
@@ -702,7 +702,7 @@
return 0;
}
-int decompFunction(void) {
+int decompFunction() {
currentScriptOpcodeType = getByteFromDecompScriptReal();
// addDecomp("OP_%X", currentScriptOpcodeType);
switch (currentScriptOpcodeType) {
@@ -1279,18 +1279,18 @@
uint8 stop = 0;
-int decompStop(void) {
+int decompStop() {
stop = 1;
addDecomp("stop\n");
return 0;
}
-int decompBreak(void) {
+int decompBreak() {
addDecomp("break");
return 0;
}
-void generateIndentation(void) {
+void generateIndentation() {
int i, j;
for (i = 0; i < positionInDecompileLineTable; i++) {
Modified: scummvm/trunk/engines/cruise/font.cpp
===================================================================
--- scummvm/trunk/engines/cruise/font.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/font.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -137,7 +137,7 @@
fontFileHandle.close();
}
-void initSystem(void) {
+void initSystem() {
int32 i;
itemColor = 15;
@@ -168,7 +168,7 @@
loadFNT("system.fnt");
}
-void freeSystem(void) {
+void freeSystem() {
MemFree(_systemFNT);
}
Modified: scummvm/trunk/engines/cruise/font.h
===================================================================
--- scummvm/trunk/engines/cruise/font.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/font.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -51,8 +51,8 @@
#include "common/pack-end.h" // END STRUCT PACKING
void loadFNT(const char *fileName);
-void initSystem(void);
-void freeSystem(void);
+void initSystem();
+void freeSystem();
//////////////////////////////////////////////////
void bigEndianShortToNative(void *var);
Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/function.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -38,7 +38,7 @@
//#define FUNCTION_DEBUG
-int16 Op_LoadOverlay(void) {
+int16 Op_LoadOverlay() {
char *pOverlayName;
char overlayName[38] = "";
int overlayLoadResult;
@@ -63,7 +63,7 @@
return(overlayLoadResult);
}
-int16 Op_Strcpy(void) {
+int16 Op_Strcpy() {
char *ptr1 = (char *)popPtr();
char *ptr2 = (char *)popPtr();
@@ -81,7 +81,7 @@
return (0);
}
-int16 Op_Exec(void) {
+int16 Op_Exec() {
int scriptIdx;
int ovlIdx;
uint8 *ptr;
@@ -122,7 +122,7 @@
return (0);
}
-int16 Op_AddProc(void) {
+int16 Op_AddProc() {
int pop1 = popVar();
int pop2;
int overlay;
@@ -154,7 +154,7 @@
return (0);
}
-int16 Op_Narrator(void) {
+int16 Op_Narrator() {
int pop1 = popVar();
int pop2 = popVar();
@@ -167,7 +167,7 @@
return (0);
}
-int16 Op_GetMouseX(void) {
+int16 Op_GetMouseX() {
int16 dummy;
int16 mouseX;
int16 mouseY;
@@ -178,7 +178,7 @@
return (mouseX);
}
-int16 Op_GetMouseY(void) {
+int16 Op_GetMouseY() {
int16 dummy;
int16 mouseX;
int16 mouseY;
@@ -189,7 +189,7 @@
return (mouseY);
}
-int16 Op_Random(void) {
+int16 Op_Random() {
int var = popVar();
if (var < 2) {
@@ -199,7 +199,7 @@
return (_vm->_rnd.getRandomNumber(var - 1));
}
-int16 Op_PlayFX(void) {
+int16 Op_PlayFX() {
int volume = popVar();
int speed = popVar();
/*int channelNum = */popVar();
@@ -216,7 +216,7 @@
return (0);
}
-int16 Op_LoopFX(void) {
+int16 Op_LoopFX() {
int volume = popVar();
int speed = popVar();
/*int channelNum = */popVar();
@@ -233,7 +233,7 @@
return (0);
}
-int16 Op_StopFX(void) {
+int16 Op_StopFX() {
int channelNum = popVar();
if (channelNum == -1) {
@@ -248,7 +248,7 @@
return 0;
}
-int16 Op_FreqFX(void) {
+int16 Op_FreqFX() {
int volume = popVar();
int freq2 = popVar();
int channelNum = popVar();
@@ -263,7 +263,7 @@
return (0);
}
-int16 Op_FreeCT(void) {
+int16 Op_FreeCT() {
freeCTP();
return (0);
}
@@ -291,18 +291,18 @@
}
}
-int16 Op_FreeCell(void) {
+int16 Op_FreeCell() {
freeObjectList(&cellHead);
return (0);
}
-int16 Op_freeBackgroundInscrustList(void) {
+int16 Op_freeBackgroundInscrustList() {
freeBackgroundIncrustList(&backgroundIncrustHead);
return (0);
}
-int16 Op_UnmergeBackgroundIncrust(void) {
+int16 Op_UnmergeBackgroundIncrust() {
int obj = popVar();
int ovl = popVar();
@@ -315,13 +315,13 @@
return (0);
}
-int16 Op_FreePreload(void) {
+int16 Op_FreePreload() {
// TODO: See if this is needed
debug(1, "Op_FreePreload not implemented");
return (0);
}
-int16 Op_RemoveMessage(void) {
+int16 Op_RemoveMessage() {
int idx;
int overlay;
@@ -337,7 +337,7 @@
return (0);
}
-int16 Op_FindSet(void) {
+int16 Op_FindSet() {
int16 i;
char name[36] = "";
char *ptr;
@@ -360,7 +360,7 @@
return -1;
}
-int16 Op_RemoveFrame(void) {
+int16 Op_RemoveFrame() {
int count = popVar();
int start = popVar();
@@ -369,7 +369,7 @@
return (0);
}
-int16 Op_comment(void) {
+int16 Op_comment() {
char *var;
var = (char *)popPtr();
@@ -379,7 +379,7 @@
return (0);
}
-int16 Op_RemoveProc(void) {
+int16 Op_RemoveProc() {
int idx;
int overlay;
@@ -395,7 +395,7 @@
return (0);
}
-int16 Op_FreeOverlay(void) {
+int16 Op_FreeOverlay() {
char localName[36] = "";
char *namePtr;
@@ -411,7 +411,7 @@
return 0;
}
-int16 Op_FindProc(void) {
+int16 Op_FindProc() {
char name[36] = "";
char *ptr;
int param;
@@ -425,13 +425,13 @@
return param;
}
-int16 Op_GetRingWord(void) {
+int16 Op_GetRingWord() {
// Original method had a ringed queue allowing this method to return words one at a time.
// But it never seemed to be used; no entries were ever added to the list
return 0;
}
-int16 Op_KillMenu(void) {
+int16 Op_KillMenu() {
// Free menus, if active
if (menuTable[0]) {
freeMenu(menuTable[0]);
@@ -453,14 +453,14 @@
return 0;
}
-int16 Op_UserMenu(void) {
+int16 Op_UserMenu() {
int oldValue = playerMenuEnabled;
playerMenuEnabled = popVar();
return oldValue;
}
-int16 Op_UserOn(void) {
+int16 Op_UserOn() {
int oldValue = userEnabled;
int newValue = popVar();
@@ -471,7 +471,7 @@
return oldValue;
}
-int16 Op_Display(void) {
+int16 Op_Display() {
int oldValue = displayOn;
int newValue = popVar();
@@ -482,7 +482,7 @@
return oldValue;
}
-int16 Op_FreezeParent(void) {
+int16 Op_FreezeParent() {
if (currentScriptPtr->var1A == 20) {
changeScriptParamInList(currentScriptPtr->var18, currentScriptPtr->var16, &procHead, -1, 9997);
} else if (currentScriptPtr->var1A == 30) {
@@ -492,7 +492,7 @@
return 0;
}
-int16 Op_LoadBackground(void) {
+int16 Op_LoadBackground() {
int result = 0;
char bgName[36] = "";
char *ptr;
@@ -520,7 +520,7 @@
return result;
}
-int16 Op_FrameExist(void) {
+int16 Op_FrameExist() {
int param;
param = popVar();
@@ -536,7 +536,7 @@
return 0;
}
-int16 Op_LoadFrame(void) {
+int16 Op_LoadFrame() {
int param1;
int param2;
int param3;
@@ -568,7 +568,7 @@
return 0;
}
-int16 Op_LoadAbs(void) {
+int16 Op_LoadAbs() {
int slot;
char name[36] = "";
char *ptr;
@@ -591,7 +591,7 @@
return result;
}
-int16 Op_InitializeState(void) {
+int16 Op_InitializeState() {
int param1 = popVar();
int objIdx = popVar();
int ovlIdx = popVar();
@@ -608,11 +608,11 @@
return (0);
}
-int16 Op_GetlowMemory(void) {
+int16 Op_GetlowMemory() {
return lowMemory;
}
-int16 Op_AniDir(void) {
+int16 Op_AniDir() {
int type = popVar();
int objIdx = popVar();
int ovlIdx = popVar();
@@ -627,7 +627,7 @@
return -1;
}
-int16 Op_FadeOut(void) {
+int16 Op_FadeOut() {
for (long int i = 0; i < 256; i += 32) {
for (long int j = 0; j < 256; j++) {
int offsetTable[3];
@@ -661,7 +661,7 @@
return 0;
}
-int16 Op_FindOverlay(void) {
+int16 Op_FindOverlay() {
char name[36] = "";
char *ptr;
@@ -673,7 +673,7 @@
return (isOverlayLoaded(name));
}
-int16 Op_WriteObject(void) {
+int16 Op_WriteObject() {
int16 returnParam;
int16 param1 = popVar();
@@ -687,7 +687,7 @@
return returnParam;
}
-int16 Op_ReadObject(void) {
+int16 Op_ReadObject() {
int16 returnParam;
int member = popVar();
@@ -699,12 +699,12 @@
return returnParam;
}
-int16 Op_FadeIn(void) {
+int16 Op_FadeIn() {
doFade = 1;
return 0;
}
-int16 Op_GetMouseButton(void) {
+int16 Op_GetMouseButton() {
int16 dummy;
int16 mouseX;
int16 mouseY;
@@ -715,7 +715,7 @@
return mouseButton;
}
-int16 Op_AddCell(void) {
+int16 Op_AddCell() {
int16 objType = popVar();
int16 objIdx = popVar();
int16 overlayIdx = popVar();
@@ -728,7 +728,7 @@
return 0;
}
-int16 Op_AddBackgroundIncrust(void) {
+int16 Op_AddBackgroundIncrust() {
int16 objType = popVar();
int16 objIdx = popVar();
@@ -742,7 +742,7 @@
return 0;
}
-int16 Op_RemoveCell(void) {
+int16 Op_RemoveCell() {
int objType = popVar();
int objectIdx = popVar();
int ovlNumber = popVar();
@@ -758,13 +758,13 @@
int16 fontFileIndex = -1;
-int16 Op_SetFont(void) {
+int16 Op_SetFont() {
fontFileIndex = popVar();
return 0;
}
-int16 Op_UnfreezeParent(void) {
+int16 Op_UnfreezeParent() {
if (currentScriptPtr->var1A == 0x14) {
changeScriptParamInList(currentScriptPtr->var18, currentScriptPtr->var16, &procHead, -1, 0);
} else if (currentScriptPtr->var1A == 0x1E) {
@@ -774,7 +774,7 @@
return 0;
}
-int16 Op_ProtectionFlag(void) {
+int16 Op_ProtectionFlag() {
int16 temp = protectionCode;
int16 newVar;
@@ -786,7 +786,7 @@
return temp;
}
-int16 Op_ClearScreen(void) {
+int16 Op_ClearScreen() {
int bgIdx = popVar();
if ((bgIdx >= 0) && (bgIdx < NBSCREENS) && (backgroundScreens[bgIdx])) {
@@ -798,7 +798,7 @@
return 0;
}
-int16 Op_AddMessage(void) {
+int16 Op_AddMessage() {
int16 color = popVar();
int16 var_2 = popVar();
int16 var_4 = popVar();
@@ -822,18 +822,18 @@
return 0;
}
-int16 Op_Preload(void) {
+int16 Op_Preload() {
popPtr();
popVar();
return 0;
}
-int16 Op_LoadCt(void) {
+int16 Op_LoadCt() {
return initCt((const char *)popPtr());
}
-int16 Op_EndAnim(void) {
+int16 Op_EndAnim() {
int param1 = popVar();
int param2 = popVar();
int overlay = popVar();
@@ -844,14 +844,14 @@
return isAnimFinished(overlay, param2, &actorHead, param1);
}
-int16 Op_Protect(void) {
+int16 Op_Protect() {
popPtr();
popVar();
return 0;
}
-int16 Op_AutoCell(void) {
+int16 Op_AutoCell() {
cellStruct *pObject;
int signal = popVar();
@@ -906,7 +906,7 @@
return 0;
}
-int16 Op_Sizeof(void) {
+int16 Op_Sizeof() {
objectParamsQuery params;
int index = popVar();
int overlay = popVar();
@@ -919,7 +919,7 @@
return params.nbState - 1;
}
-int16 Op_SetActiveBackground(void) {
+int16 Op_SetActiveBackground() {
int currentPlane = masterScreen;
int newPlane = popVar();
@@ -934,7 +934,7 @@
return currentPlane;
}
-int16 Op_RemoveBackground(void) {
+int16 Op_RemoveBackground() {
int backgroundIdx = popVar();
if (backgroundIdx > 0 && backgroundIdx < 8) {
@@ -956,14 +956,14 @@
int vblLimit;
-int16 Op_VBL(void) {
+int16 Op_VBL() {
vblLimit = popVar();
return 0;
}
int op7BVar = 0;
-int16 Op_Sec(void) {
+int16 Op_Sec() {
int di = popVar();
int si = 1 - op7BVar;
int sign;
@@ -979,7 +979,7 @@
return si;
}
-int16 Op_RemoveBackgroundIncrust(void) {
+int16 Op_RemoveBackgroundIncrust() {
int idx = popVar();
int overlay = popVar();
@@ -992,7 +992,7 @@
return 0;
}
-int16 Op_SetColor(void) {
+int16 Op_SetColor() {
int colorB = popVar();
int colorG = popVar();
int colorR = popVar();
@@ -1023,7 +1023,7 @@
return 0;
}
-int16 Op_Inventory(void) {
+int16 Op_Inventory() {
int si = var41;
var41 = popVar();
@@ -1031,7 +1031,7 @@
return si;
}
-int16 Op_RemoveOverlay(void) {
+int16 Op_RemoveOverlay() {
int overlayIdx;
overlayIdx = popVar();
@@ -1043,7 +1043,7 @@
return 0;
}
-int16 Op_ComputeLine(void) {
+int16 Op_ComputeLine() {
int y2 = popVar();
int x2 = popVar();
int y1 = popVar();
@@ -1058,14 +1058,14 @@
return maxValue;
}
-int16 Op_FindMsg(void) {
+int16 Op_FindMsg() {
int si = popVar();
popVar();
return si;
}
-int16 Op_SetZoom(void) {
+int16 Op_SetZoom() {
var46 = popVar();
var45 = popVar();
var42 = popVar();
@@ -1081,14 +1081,14 @@
return (param1 * param2) >> 8;
}
-int16 Op_GetStep(void) {
+int16 Op_GetStep() {
int si = popVar();
int dx = popVar();
return subOp23(dx, si);
}
-int16 Op_GetZoom(void) {
+int16 Op_GetZoom() {
return (computeZoom(popVar()));
}
@@ -1195,7 +1195,7 @@
int flag_obstacle; // numPolyBis
// add animation
-int16 Op_AddAnimation(void) {
+int16 Op_AddAnimation() {
int stepY = popVar();
int stepX = popVar();
int direction = popVar();
@@ -1248,7 +1248,7 @@
return 0;
}
-int16 Op_RemoveAnimation(void) {
+int16 Op_RemoveAnimation() {
int objType = popVar();
int objIdx = popVar();
int ovlIdx = popVar();
@@ -1260,12 +1260,12 @@
return removeAnimation(&actorHead, ovlIdx, objIdx, objType);
}
-int16 Op_regenerateBackgroundIncrust(void) {
+int16 Op_regenerateBackgroundIncrust() {
regenerateBackgroundIncrust(&backgroundIncrustHead);
return 0;
}
-int16 Op_SetStringColors(void) {
+int16 Op_SetStringColors() {
// TODO: here ignore if low color mode
subColor = (uint8) popVar();
@@ -1276,7 +1276,7 @@
return 0;
}
-int16 Op_XClick(void) {
+int16 Op_XClick() {
int x = popVar();
if (x != -1) {
@@ -1287,7 +1287,7 @@
return aniX;
}
-int16 Op_YClick(void) {
+int16 Op_YClick() {
int y = popVar();
if (y != -1) {
@@ -1298,7 +1298,7 @@
return aniY;
}
-int16 Op_GetPixel(void) {
+int16 Op_GetPixel() {
int x = popVar();
int y = popVar();
@@ -1306,7 +1306,7 @@
return numPoly;
}
-int16 Op_TrackAnim(void) { // setup actor position
+int16 Op_TrackAnim() { // setup actor position
actorStruct *pActor;
int var0 = popVar();
@@ -1336,7 +1336,7 @@
return 0;
}
-int16 Op_BgName(void) {
+int16 Op_BgName() {
char* bgName = (char*)popPtr();
int bgIdx = popVar();
@@ -1352,7 +1352,7 @@
return 0;
}
-int16 Op_LoadSong(void) {
+int16 Op_LoadSong() {
const char *ptr = (const char *)popPtr();
char buffer[33];
@@ -1364,27 +1364,27 @@
return 0;
}
-int16 Op_PlaySong(void) {
+int16 Op_PlaySong() {
if (_vm->sound().songLoaded() && !_vm->sound().songPlayed())
_vm->sound().playMusic();
return 0;
}
-int16 Op_StopSong(void) {
+int16 Op_StopSong() {
if (_vm->sound().isPlaying())
_vm->sound().stopMusic();
return 0;
}
-int16 Op_RestoreSong(void) {
+int16 Op_RestoreSong() {
// Used in the original to restore the contents of a song. Doesn't seem to be used,
// since the backup buffer it uses is never set
return 0;
}
-int16 Op_SongSize(void) {
+int16 Op_SongSize() {
int size, oldSize;
if (_vm->sound().songLoaded()) {
@@ -1399,7 +1399,7 @@
return oldSize;
}
-int16 Op_SetPattern(void) {
+int16 Op_SetPattern() {
int value = popVar();
int offset = popVar();
@@ -1410,26 +1410,26 @@
return 0;
}
-int16 Op_FadeSong(void) {
+int16 Op_FadeSong() {
_vm->sound().fadeSong();
return 0;
}
-int16 Op_FreeSong(void) {
+int16 Op_FreeSong() {
_vm->sound().stopMusic();
_vm->sound().removeMusic();
return 0;
}
-int16 Op_SongLoop(void) {
+int16 Op_SongLoop() {
bool oldLooping = _vm->sound().musicLooping();
_vm->sound().musicLoop(popVar() != 0);
return oldLooping;
}
-int16 Op_SongPlayed(void) {
+int16 Op_SongPlayed() {
return _vm->sound().songPlayed();
}
@@ -1437,17 +1437,17 @@
flagCt = value;
}
-int16 Op_CTOn(void) {
+int16 Op_CTOn() {
setVar49Value(1);
return 0;
}
-int16 Op_CTOff(void) {
+int16 Op_CTOff() {
setVar49Value(0);
return 0;
}
-int16 Op_FreezeOverlay(void) {
+int16 Op_FreezeOverlay() {
//int var0;
//int var1;
int temp;
@@ -1465,7 +1465,7 @@
return temp;
}
-int16 Op_FreezeCell(void) {
+int16 Op_FreezeCell() {
int newFreezz = popVar();
int oldFreeze = popVar();
int backgroundPlante = popVar();
@@ -1492,7 +1492,7 @@
}
}
-int16 Op_FreezeAni(void) {
+int16 Op_FreezeAni() {
/*
* int var0;
* int var1;
@@ -1516,7 +1516,7 @@
return 0;
}
-int16 Op_Itoa(void) {
+int16 Op_Itoa() {
int nbp = popVar();
int param[160];
char txt[40];
@@ -1546,7 +1546,7 @@
return 0;
}
-int16 Op_Strcat(void) {
+int16 Op_Strcat() {
char *pSource = (char *)popPtr();
char *pDest = (char *)popPtr();
@@ -1560,7 +1560,7 @@
return 0;
}
-int16 Op_FindSymbol(void) {
+int16 Op_FindSymbol() {
int var0 = popVar();
char *ptr = (char *)popPtr();
int var1 = popVar();
@@ -1571,7 +1571,7 @@
return getProcParam(var1, var0, ptr);
}
-int16 Op_FindObject(void) {
+int16 Op_FindObject() {
char var_26[36];
char *ptr = (char *)popPtr();
int overlayIdx;
@@ -1590,7 +1590,7 @@
return getProcParam(overlayIdx, 40, var_26);
}
-int16 Op_SetObjectAtNode(void) {
+int16 Op_SetObjectAtNode() {
int16 node = popVar();
int16 obj = popVar();
int16 ovl = popVar();
@@ -1610,7 +1610,7 @@
return 0;
}
-int16 Op_GetNodeX(void) {
+int16 Op_GetNodeX() {
int16 node = popVar();
int nodeInfo[2];
@@ -1622,7 +1622,7 @@
return nodeInfo[0];
}
-int16 Op_GetNodeY(void) {
+int16 Op_GetNodeY() {
int16 node = popVar();
int nodeInfo[2];
@@ -1634,7 +1634,7 @@
return nodeInfo[1];
}
-int16 Op_SetVolume(void) {
+int16 Op_SetVolume() {
int oldVolume = _vm->sound().getVolume();
int newVolume = popVar();
@@ -1647,7 +1647,7 @@
return oldVolume >> 2;
}
-int16 Op_SongExist(void) {
+int16 Op_SongExist() {
const char *songName = (char*)popPtr();
if (songName) {
@@ -1662,33 +1662,33 @@
return 0;
}
-int16 Op_TrackPos(void) {
+int16 Op_TrackPos() {
// This function returns a variable that never seems to change from 0
return 0;
}
-int16 Op_SetNodeState(void) {
+int16 Op_SetNodeState() {
int16 state = popVar();
int16 node = popVar();
return setNodeState(node, state);
}
-int16 Op_SetNodeColor(void) {
+int16 Op_SetNodeColor() {
int16 color = popVar();
int16 node = popVar();
return setNodeColor(node, color);
}
-int16 Op_SetXDial(void) {
+int16 Op_SetXDial() {
int16 old = xdial;
xdial = popVar();
return old;
}
-int16 Op_DialogOn(void) {
+int16 Op_DialogOn() {
dialogueObj = popVar();
dialogueOvl = popVar();
@@ -1700,7 +1700,7 @@
return 0;
}
-int16 Op_DialogOff(void) {
+int16 Op_DialogOff() {
dialogueEnabled = false;
objectReset();
@@ -1715,7 +1715,7 @@
return 0;
}
-int16 Op_LinkObjects(void) {
+int16 Op_LinkObjects() {
int type = popVar();
int obj2 = popVar();
int ovl2 = popVar();
@@ -1732,7 +1732,7 @@
return 0;
}
-int16 Op_UserClick(void) {
+int16 Op_UserClick() {
sysKey = popVar();
sysY = popVar();
sysX = popVar();
@@ -1740,7 +1740,7 @@
return 0;
}
-int16 Op_XMenuItem(void) {
+int16 Op_XMenuItem() {
int index = popVar();
int count = 0;
@@ -1760,7 +1760,7 @@
return 0;
}
-int16 Op_YMenuItem(void) {
+int16 Op_YMenuItem() {
int index = popVar();
int count = 0;
@@ -1785,7 +1785,7 @@
return (int16)(menuTable[0] != NULL);
}
-int16 Op_AutoControl(void) {
+int16 Op_AutoControl() {
int oldValue = automaticMode;
int newValue = popVar();
@@ -1797,7 +1797,7 @@
return oldValue;
}
-int16 Op_MouseMove(void) {
+int16 Op_MouseMove() {
int16 handle, button;
Common::Point pt;
@@ -1810,18 +1810,18 @@
return 0;
}
-int16 Op_MouseEnd(void) {
+int16 Op_MouseEnd() {
if (automoveInc < automoveMax)
return (int16)false;
return (int16)true;
}
-int16 Op_MsgExist(void) {
+int16 Op_MsgExist() {
return isMessage;
}
-int16 Op_UserDelay(void) {
+int16 Op_UserDelay() {
int delay = popVar();
if (delay >= 0) {
@@ -1831,13 +1831,13 @@
return userDelay;
}
-int16 Op_ThemeReset(void) {
+int16 Op_ThemeReset() {
objectReset();
return 0;
}
-int16 Op_UserWait(void) {
+int16 Op_UserWait() {
userWait = 1;
if (currentScriptPtr->type == scriptType_PROC) {
changeScriptParamInList(currentScriptPtr->overlayNumber, currentScriptPtr->scriptNumber, &procHead, -1, 9999);
@@ -1984,7 +1984,7 @@
Op_KillMenu,
};
-int32 opcodeType8(void) {
+int32 opcodeType8() {
int opcode = getByteFromScript();
if (!opcode)
Modified: scummvm/trunk/engines/cruise/function.h
===================================================================
--- scummvm/trunk/engines/cruise/function.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/function.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -30,12 +30,12 @@
extern int flag_obstacle;
extern int vblLimit;
-int32 opcodeType8(void);
+int32 opcodeType8();
int16 computeZoom(int param);
int16 subOp23(int param1, int param2);
void freeObjectList(cellStruct *pListHead);
int removeAnimation(actorStruct * pHead, int overlay, int objIdx, int objType);
-int16 Op_FadeOut(void);
+int16 Op_FadeOut();
} // End of namespace Cruise
Modified: scummvm/trunk/engines/cruise/gfxModule.cpp
===================================================================
--- scummvm/trunk/engines/cruise/gfxModule.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/gfxModule.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -201,10 +201,10 @@
*(pOutput++) = B;
}
-void gfxModuleData_gfxWaitVSync(void) {
+void gfxModuleData_gfxWaitVSync() {
}
-void gfxModuleData_flip(void) {
+void gfxModuleData_flip() {
}
void gfxCopyRect(const uint8 *sourceBuffer, int width, int height, byte *dest, int x, int y, int colour) {
@@ -225,13 +225,13 @@
}
}
-void gfxModuleData_Init(void) {
+void gfxModuleData_Init() {
memset(globalScreen, 0, 320 * 200);
memset(page00, 0, 320 * 200);
memset(page10, 0, 320 * 200);
}
-void gfxModuleData_flipScreen(void) {
+void gfxModuleData_flipScreen() {
memcpy(globalScreen, gfxModuleData.pPage00, 320 * 200);
flip();
Modified: scummvm/trunk/engines/cruise/gfxModule.h
===================================================================
--- scummvm/trunk/engines/cruise/gfxModule.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/gfxModule.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -49,9 +49,9 @@
void gfxModuleData_gfxClearFrameBuffer(uint8 *ptr);
void gfxModuleData_setDirtyColors(int min, int max);
void gfxModuleData_setPalColor(int idx, int r, int g, int b);
-void gfxModuleData_field_90(void);
-void gfxModuleData_gfxWaitVSync(void);
-void gfxModuleData_flip(void);
+void gfxModuleData_field_90();
+void gfxModuleData_gfxWaitVSync();
+void gfxModuleData_flip();
void gfxModuleData_updatePalette();
void gfxModuleData_updateScreen();
@@ -59,14 +59,14 @@
void gfxModuleData_gfxCopyScreen(const uint8 *sourcePtr, uint8 *destPtr);
void convertGfxFromMode4(const uint8 *sourcePtr, int width, int height, uint8 *destPtr);
void convertGfxFromMode5(const uint8 *sourcePtr, int width, int height, uint8 *destPtr);
-void gfxModuleData_Init(void);
-void gfxModuleData_flipScreen(void);
+void gfxModuleData_Init();
+void gfxModuleData_flipScreen();
//void gfxModuleData_setPal(uint8 * ptr);
void gfxModuleData_convertOldPalColor(uint16 oldColor, uint8 *pOutput);
void gfxModuleData_setPalEntries(const byte *ptr, int start, int num);
void gfxModuleData_setPal256(const byte *ptr);
void gfxModuleData_addDirtyRect(const Common::Rect &r);
-void flip(void);
+void flip();
void drawSolidBox(int32 x1, int32 y1, int32 x2, int32 y2, uint8 colour);
void resetBitmap(uint8 *dataPtr, int32 dataSize);
Modified: scummvm/trunk/engines/cruise/linker.cpp
===================================================================
--- scummvm/trunk/engines/cruise/linker.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/linker.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -270,7 +270,7 @@
}
// check that the newly loaded isn't used by the already loaded overlays
-void updateAllScriptsImports(void) {
+void updateAllScriptsImports() {
int i;
for (i = 0; i < 90; i++) {
Modified: scummvm/trunk/engines/cruise/linker.h
===================================================================
--- scummvm/trunk/engines/cruise/linker.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/linker.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -28,7 +28,7 @@
namespace Cruise {
-void updateAllScriptsImports(void);
+void updateAllScriptsImports();
} // End of namespace Cruise
#endif
Modified: scummvm/trunk/engines/cruise/mainDraw.cpp
===================================================================
--- scummvm/trunk/engines/cruise/mainDraw.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/mainDraw.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -56,7 +56,7 @@
pNewEntry->pCell = pObject;
}
-void freeAutoCell(void) {
+void freeAutoCell() {
autoCellStruct *pCurrent = autoCellHead.next;
while (pCurrent) {
@@ -126,7 +126,7 @@
PCFadeFlag = 0;
}
-void flipScreen(void) {
+void flipScreen() {
if (switchPal) {
for (unsigned long int i = 0; i < 256*3; i++) {
workpal[i] = palScreen[masterScreen][i];
@@ -341,7 +341,7 @@
-void buildSegment(void) {
+void buildSegment() {
int16* pOut = XMIN_XMAX;
if ((polyXMin >= 320) || (polyXMax < 0) || (polyYMax < 0) || (polyYMin >= 200)) {
@@ -1265,7 +1265,7 @@
}
#ifdef _DEBUG
-void drawCtp(void) {
+void drawCtp() {
/* int i;
if (ctp_walkboxTable) {
Modified: scummvm/trunk/engines/cruise/mainDraw.h
===================================================================
--- scummvm/trunk/engines/cruise/mainDraw.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/mainDraw.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -37,7 +37,7 @@
void pixel(int x, int y, char color);
void mainDraw(int16 param);
-void flipScreen(void);
+void flipScreen();
void buildPolyModel(int X, int Y, int scale, char *ptr2, char *destBuffer, char *dataPtr);
void drawSprite(int width, int height, cellStruct *currentObjPtr, const uint8 *dataIn, int ys, int xs, uint8 *output, const uint8 *dataBuf);
void flipPoly(int fileId, int16 *dataPtr, int scale, char** newFrame, int X, int Y, int *outX, int *outY, int *outScale);
Modified: scummvm/trunk/engines/cruise/object.cpp
===================================================================
--- scummvm/trunk/engines/cruise/object.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/object.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -288,7 +288,7 @@
return 0;
}
-void objectReset(void) {
+void objectReset() {
for (int i = 1; i < numOfLoadedOverlay; i++) {
if (overlayTable[i].alreadyLoaded && overlayTable[i].ovlData) {
if (overlayTable[i].ovlData->arrayObject) {
Modified: scummvm/trunk/engines/cruise/object.h
===================================================================
--- scummvm/trunk/engines/cruise/object.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/object.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -53,7 +53,7 @@
objDataStruct *getObjectDataFromOverlay(int ovlIdx, int objIdx);
int16 getSingleObjectParam(int16 overlayIdx, int16 param2, int16 param3, int16 * returnParam);
int16 getMultipleObjectParam(int16 overlayIdx, int16 objectIdx, objectParamsQuery * returnParam);
-void objectReset(void);
+void objectReset();
const char *getObjectName(int index, const char *string);
int getObjectClass(int overlayIdx, int objIdx);
Modified: scummvm/trunk/engines/cruise/overlay.cpp
===================================================================
--- scummvm/trunk/engines/cruise/overlay.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/overlay.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -33,7 +33,7 @@
overlayStruct overlayTable[90];
int numOfLoadedOverlay;
-void initOverlayTable(void) {
+void initOverlayTable() {
int i;
for (i = 0; i < 90; i++) {
Modified: scummvm/trunk/engines/cruise/overlay.h
===================================================================
--- scummvm/trunk/engines/cruise/overlay.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/overlay.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -179,7 +179,7 @@
extern overlayStruct overlayTable[90];
extern int numOfLoadedOverlay;
-void initOverlayTable(void);
+void initOverlayTable();
int loadOverlay(const char * scriptName);
int32 findOverlayByName2(const char * name);
int findOverlayByName(const char *overlayName);
Modified: scummvm/trunk/engines/cruise/perso.cpp
===================================================================
--- scummvm/trunk/engines/cruise/perso.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/perso.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -39,7 +39,7 @@
}
}
-void freeCTP(void) {
+void freeCTP() {
for (unsigned long int i = 0; i < NUM_PERSONS; i++) {
freePerso(i);
Modified: scummvm/trunk/engines/cruise/perso.h
===================================================================
--- scummvm/trunk/engines/cruise/perso.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/perso.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -63,7 +63,7 @@
int cor_droite(int x1, int y1, int x2, int y2, point* outputTable);
void freePerso(int persoIdx);
-void freeCTP(void);
+void freeCTP();
void affiche_chemin(int16 persoIdx, MovementEntry &data);
int direction(int x1, int y1, int x2, int y2, int inc_jo1, int inc_jo2);
Modified: scummvm/trunk/engines/cruise/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cruise/saveload.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/saveload.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -659,7 +659,7 @@
overlayTable[overlayNumber].alreadyLoaded = 0;
}
-void initVars(void) {
+void initVars() {
closeAllMenu();
resetFileEntryRange(0, NUM_FILE_ENTRIES);
Modified: scummvm/trunk/engines/cruise/saveload.h
===================================================================
--- scummvm/trunk/engines/cruise/saveload.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/saveload.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -42,7 +42,7 @@
Common::Error saveSavegameData(int saveGameIdx, const Common::String &saveName);
Common::Error loadSavegameData(int saveGameIdx);
bool readSavegameHeader(Common::InSaveFile *in, CruiseSavegameHeader &header);
-void initVars(void);
+void initVars();
} // End of namespace Cruise
Modified: scummvm/trunk/engines/cruise/script.cpp
===================================================================
--- scummvm/trunk/engines/cruise/script.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/script.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -34,14 +34,14 @@
scriptInstanceStruct *currentScriptPtr;
-int8 getByteFromScript(void) {
+int8 getByteFromScript() {
int8 var = *(int8*)(currentData3DataPtr + currentScriptPtr->scriptOffset);
++currentScriptPtr->scriptOffset;
return (var);
}
-short int getShortFromScript(void) {
+short int getShortFromScript() {
short int var = (int16)READ_BE_UINT16(currentData3DataPtr + currentScriptPtr->scriptOffset);
currentScriptPtr->scriptOffset += 2;
@@ -49,7 +49,7 @@
}
// load opcode
-int32 opcodeType0(void) {
+int32 opcodeType0() {
int index = 0;
switch (currentScriptOpcodeType) {
@@ -128,7 +128,7 @@
}
// save opcode
-int32 opcodeType1(void) {
+int32 opcodeType1() {
int var = popVar();
int offset = 0;
@@ -222,7 +222,7 @@
return (0);
}
-int32 opcodeType2(void) {
+int32 opcodeType2() {
int index = 0;
switch (currentScriptOpcodeType) {
case 5:
@@ -269,15 +269,15 @@
return 0;
}
-int32 opcodeType10(void) { // break
+int32 opcodeType10() { // break
return (0);
}
-int32 opcodeType11(void) { // break
+int32 opcodeType11() { // break
return (1);
}
-int32 opcodeType4(void) { // test
+int32 opcodeType4() { // test
int boolVar = 0;
int var1 = popVar();
@@ -322,7 +322,7 @@
return (0);
}
-int32 opcodeType6(void) {
+int32 opcodeType6() {
int si = 0;
int pop = popVar();
@@ -343,7 +343,7 @@
return (0);
}
-int32 opcodeType7(void) {
+int32 opcodeType7() {
int var1 = popVar();
int var2 = popVar();
@@ -353,7 +353,7 @@
return (0);
}
-int32 opcodeType5(void) {
+int32 opcodeType5() {
int offset = currentScriptPtr->scriptOffset;
int short1 = getShortFromScript();
int newSi = short1 + offset;
@@ -408,7 +408,7 @@
return (0);
}
-int32 opcodeType3(void) { // math
+int32 opcodeType3() { // math
int pop1 = popVar();
int pop2 = popVar();
@@ -447,7 +447,7 @@
return 0;
}
-int32 opcodeType9(void) { // stop script
+int32 opcodeType9() { // stop script
//printf("Stop a script of overlay %s\n",overlayTable[currentScriptPtr->overlayNumber].overlayName);
currentScriptPtr->scriptNumber = -1;
return (1);
Modified: scummvm/trunk/engines/cruise/script.h
===================================================================
--- scummvm/trunk/engines/cruise/script.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/script.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -55,8 +55,8 @@
extern scriptInstanceStruct procHead;
extern scriptInstanceStruct *currentScriptPtr;
-void setupFuncArray(void);
-int8 getByteFromScript(void);
+void setupFuncArray();
+int8 getByteFromScript();
int removeScript(int overlay, int idx, scriptInstanceStruct * headPtr);
uint8 *attacheNewScriptToTail(scriptInstanceStruct *scriptHandlePtr, int16 overlayNumber, int16 param, int16 arg0, int16 arg1, int16 arg2, scriptTypeEnum scriptType);
Modified: scummvm/trunk/engines/cruise/stack.cpp
===================================================================
--- scummvm/trunk/engines/cruise/stack.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/stack.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -40,7 +40,7 @@
}
}
-int16 popVar(void) {
+int16 popVar() {
if (positionInStack <= 0) {
return (0);
}
Modified: scummvm/trunk/engines/cruise/stack.h
===================================================================
--- scummvm/trunk/engines/cruise/stack.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/stack.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -46,11 +46,11 @@
} data;
};
-int16 popVar(void);
+int16 popVar();
void pushVar(int16 var);
void pushPtr(void *ptr);
-void *popPtr(void);
+void *popPtr();
} // End of namespace Cruise
Modified: scummvm/trunk/engines/cruise/vars.h
===================================================================
--- scummvm/trunk/engines/cruise/vars.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/vars.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -51,8 +51,8 @@
menuElementSubStruct *ptrSub;
};
-typedef int32(*opcodeTypeFunction)(void);
-typedef int16(*opcodeFunction)(void);
+typedef int32(*opcodeTypeFunction)();
+typedef int16(*opcodeFunction)();
extern uint8 *_systemFNT;
extern int16 fontFileIndex;
Modified: scummvm/trunk/engines/cruise/volume.cpp
===================================================================
--- scummvm/trunk/engines/cruise/volume.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/volume.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -56,7 +56,7 @@
#endif
}
-void closePal(void) {
+void closePal() {
if (PAL_file.isOpen()) {
PAL_file.close();
@@ -68,7 +68,7 @@
}
}
-int closeBase(void) {
+int closeBase() {
if (currentVolumeFile.isOpen()) {
currentVolumeFile.close();
@@ -177,7 +177,7 @@
return (foundDisk);
}
-void freeDisk(void) {
+void freeDisk() {
if (currentVolumeFile.isOpen()) {
currentVolumeFile.close();
MemFree(volumePtrToFileDescriptor);
@@ -313,7 +313,7 @@
}
}
-int closeCnf(void) {
+int closeCnf() {
for (long int i = 0; i < numOfDisks; i++) {
if (volumeData[i].ptr) {
MemFree(volumeData[i].ptr);
@@ -326,7 +326,7 @@
return 0;
}
-int16 readVolCnf(void) {
+int16 readVolCnf() {
int i;
Common::File fileHandle;
short int sizeHEntry;
Modified: scummvm/trunk/engines/cruise/volume.h
===================================================================
--- scummvm/trunk/engines/cruise/volume.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/cruise/volume.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -28,10 +28,10 @@
namespace Cruise {
-int16 readVolCnf(void);
-int closeCnf(void);
+int16 readVolCnf();
+int closeCnf();
int16 findFileInDisks(const char *name);
-void freeDisk(void);
+void freeDisk();
int16 findFileInList(const char *fileName);
////////////////
@@ -41,7 +41,7 @@
void askDisk(int16 discNumber);
void setObjectPosition(int16 param1, int16 param2, int16 param3, int16 param4);
-int closeBase(void);
+int closeBase();
} // End of namespace Cruise
Modified: scummvm/trunk/engines/draci/barchive.cpp
===================================================================
--- scummvm/trunk/engines/draci/barchive.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/draci/barchive.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -238,7 +238,7 @@
* Closes the currently opened archive. It can be called explicitly to
* free up memory.
*/
-void BArchive::closeArchive(void) {
+void BArchive::closeArchive() {
if (!_opened) {
return;
}
Modified: scummvm/trunk/engines/draci/barchive.h
===================================================================
--- scummvm/trunk/engines/draci/barchive.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/draci/barchive.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -43,7 +43,7 @@
byte _stopper; ///< Not used in BAR files, needed for DFW
/** Releases the file data (for memory considerations) */
- void close(void) {
+ void close() {
delete[] _data;
_data = NULL;
}
@@ -61,7 +61,7 @@
~BArchive() { closeArchive(); }
void openArchive(const Common::String &path);
- void closeArchive(void);
+ void closeArchive();
uint size() const { return _fileCount; }
/**
Modified: scummvm/trunk/engines/draci/music.h
===================================================================
--- scummvm/trunk/engines/draci/music.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/draci/music.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -67,7 +67,7 @@
void metaEvent(byte type, byte *data, uint16 length);
void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { }
- uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; }
+ uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; }
//Channel allocation functions
MidiChannel *allocateChannel() { return 0; }
Modified: scummvm/trunk/engines/draci/sound.h
===================================================================
--- scummvm/trunk/engines/draci/sound.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/draci/sound.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -41,7 +41,7 @@
uint _frequency;
byte* _data;
- void close(void) {
+ void close() {
delete[] _data;
_data = NULL;
}
Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/engine.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -43,7 +43,7 @@
#include "engines/metaengine.h"
#ifdef _WIN32_WCE
-extern bool isSmartphone(void);
+extern bool isSmartphone();
#endif
// FIXME: HACK for MidiEmu & error()
Modified: scummvm/trunk/engines/gob/draw_bargon.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_bargon.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/draw_bargon.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -33,7 +33,7 @@
Draw_Bargon::Draw_Bargon(GobEngine *vm) : Draw_v2(vm) {
}
-void Draw_Bargon::initScreen(void) {
+void Draw_Bargon::initScreen() {
_vm->_global->_videoMode = 0x14;
_vm->_video->_surfWidth = 640;
_vm->_video->initPrimary(_vm->_global->_videoMode);
Modified: scummvm/trunk/engines/gob/expression.h
===================================================================
--- scummvm/trunk/engines/gob/expression.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/expression.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -116,7 +116,7 @@
void skipExpr(char stopToken);
void printExpr(char stopToken);
- void printVarIndex(void);
+ void printVarIndex();
int16 parseVarIndex(uint16 *size = 0, uint16 *type = 0);
int16 parseValExpr(byte stopToken = 99);
Modified: scummvm/trunk/engines/gob/goblin.cpp
===================================================================
--- scummvm/trunk/engines/gob/goblin.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/goblin.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -168,7 +168,7 @@
return index;
}
-void Goblin::initList(void) {
+void Goblin::initList() {
_objList = new Util::List;
_objList->pHead = 0;
_objList->pTail = 0;
@@ -210,7 +210,7 @@
}
}
-void Goblin::drawObjects(void) {
+void Goblin::drawObjects() {
Util::ListNode *ptr;
Util::ListNode *ptr2;
@@ -410,7 +410,7 @@
}
}
-void Goblin::animateObjects(void) {
+void Goblin::animateObjects() {
Util::ListNode *node;
Gob_Object *objDesc;
Scenery::AnimLayer *pLayer;
@@ -730,7 +730,7 @@
_pressedMapY = CLIP((int) _pressedMapY, 0, _vm->_map->_mapHeight - 1);
}
-void Goblin::adjustTarget(void) {
+void Goblin::adjustTarget() {
if ((_gobAction == 4) &&
(_vm->_map->getItem(_pressedMapX, _pressedMapY) == 0)) {
@@ -766,7 +766,7 @@
}
}
-void Goblin::targetItem(void) {
+void Goblin::targetItem() {
int16 tmpX;
int16 tmpY;
int16 items;
@@ -1162,7 +1162,7 @@
return gobIndex;
}
-void Goblin::zeroObjects(void) {
+void Goblin::zeroObjects() {
for (int i = 0; i < 4; i++)
_goblins[i] = 0;
@@ -1173,7 +1173,7 @@
_vm->_sound->sampleFree(&_soundData[i]);
}
-void Goblin::freeAllObjects(void) {
+void Goblin::freeAllObjects() {
_vm->_util->deleteList(_objList);
_objList = 0;
freeObjects();
@@ -1262,7 +1262,7 @@
_destItemType = obj->type;
}
-void Goblin::initVarPointers(void) {
+void Goblin::initVarPointers() {
_gobRetVarPtr.set(*_vm->_inter->_variables, 236);
_curGobStateVarPtr.set(*_vm->_inter->_variables, 240);
_curGobFrameVarPtr.set(*_vm->_inter->_variables, 244);
@@ -1316,7 +1316,7 @@
_itemInPocketVarPtr = (uint32) -2;
}
-void Goblin::loadGobDataFromVars(void) {
+void Goblin::loadGobDataFromVars() {
Gob_Object *obj;
_itemIndInPocket = (int32) _itemInPocketVarPtr;
Modified: scummvm/trunk/engines/gob/goblin.h
===================================================================
--- scummvm/trunk/engines/gob/goblin.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/goblin.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -198,20 +198,20 @@
// Functions
char rotateState(int16 from, int16 to);
void playSound(SoundDesc &snd, int16 repCount, int16 freq);
- void drawObjects(void);
- void animateObjects(void);
+ void drawObjects();
+ void animateObjects();
int16 getObjMaxFrame(Gob_Object * obj);
bool objIntersected(Gob_Object * obj1, Gob_Object * obj2);
void setMultStates(Gob_Object * gobDesc);
int16 nextLayer(Gob_Object * gobDesc);
void showBoredom(int16 gobIndex);
void switchGoblin(int16 index);
- void zeroObjects(void);
- void freeAllObjects(void);
+ void zeroObjects();
+ void freeAllObjects();
void loadObjects(const char *source);
- void initVarPointers(void);
+ void initVarPointers();
void saveGobDataToVars(int16 xPos, int16 yPos, int16 someVal);
- void loadGobDataFromVars(void);
+ void loadGobDataFromVars();
void pickItem(int16 indexToPocket, int16 idToPocket);
void placeItem(int16 indexInPocket, int16 idInPocket);
void swapItems(int16 indexToPick, int16 idToPick);
@@ -225,10 +225,10 @@
void move(int16 destX, int16 destY, int16 objIndex);
void animate(Mult::Mult_Object *obj);
- virtual void handleGoblins(void) = 0;
+ virtual void handleGoblins() = 0;
virtual void placeObject(Gob_Object * objDesc, char animated,
int16 index, int16 x, int16 y, int16 state) = 0;
- virtual void freeObjects(void) = 0;
+ virtual void freeObjects() = 0;
virtual void initiateMove(Mult::Mult_Object *obj) = 0;
virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
int16 nextAct, int16 framesCount) = 0;
@@ -243,12 +243,12 @@
GobEngine *_vm;
int16 peekGoblin(Gob_Object *curGob);
- void initList(void);
+ void initList();
void sortByOrder(Util::List *list);
void adjustDest(int16 posX, int16 posY);
- void adjustTarget(void);
+ void adjustTarget();
void targetDummyItem(Gob_Object *gobDesc);
- void targetItem(void);
+ void targetItem();
void moveFindItem(int16 posX, int16 posY);
void moveCheckSelect(int16 framesCount, Gob_Object * gobDesc,
int16 *pGobIndex, int16 *nextAct);
@@ -265,10 +265,10 @@
class Goblin_v1 : public Goblin {
public:
- virtual void handleGoblins(void) {}
+ virtual void handleGoblins() {}
virtual void placeObject(Gob_Object * objDesc, char animated,
int16 index, int16 x, int16 y, int16 state);
- virtual void freeObjects(void);
+ virtual void freeObjects();
virtual void initiateMove(Mult::Mult_Object *obj);
virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
int16 nextAct, int16 framesCount);
@@ -285,10 +285,10 @@
class Goblin_v2 : public Goblin_v1 {
public:
- virtual void handleGoblins(void);
+ virtual void handleGoblins();
virtual void placeObject(Gob_Object * objDesc, char animated,
int16 index, int16 x, int16 y, int16 state);
- virtual void freeObjects(void);
+ virtual void freeObjects();
virtual void initiateMove(Mult::Mult_Object *obj);
virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
int16 nextAct, int16 framesCount);
Modified: scummvm/trunk/engines/gob/goblin_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/goblin_v1.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/goblin_v1.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -42,7 +42,7 @@
_rotStates[3][0] = 27; _rotStates[3][1] = 25; _rotStates[3][2] = 26; _rotStates[3][3] = 6;
}
-void Goblin_v1::freeObjects(void) {
+void Goblin_v1::freeObjects() {
int16 state;
int16 col;
Modified: scummvm/trunk/engines/gob/goblin_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/goblin_v2.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/goblin_v2.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -45,7 +45,7 @@
_rotStates[3][0] = 23; _rotStates[3][1] = 21; _rotStates[3][2] = 22; _rotStates[3][3] = 6;
}
-void Goblin_v2::freeObjects(void) {
+void Goblin_v2::freeObjects() {
if (_gobsCount < 0)
return;
@@ -463,7 +463,7 @@
}
}
-void Goblin_v2::handleGoblins(void) {
+void Goblin_v2::handleGoblins() {
Mult::Mult_Object *obj0, *obj1;
Mult::Mult_AnimData *anim0, *anim1;
int16 pass;
Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/hotspots.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -1609,7 +1609,7 @@
return cursor;
}
-void Hotspots::oPlaytoons_F_1B(void) {
+void Hotspots::oPlaytoons_F_1B() {
int16 shortId;
int16 longId;
int16 var2;
Modified: scummvm/trunk/engines/gob/map.cpp
===================================================================
--- scummvm/trunk/engines/gob/map.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/map.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -461,7 +461,7 @@
}
}
-void Map::loadMapsInitGobs(void) {
+void Map::loadMapsInitGobs() {
int16 layer;
if (!_loadFromAvo)
Modified: scummvm/trunk/engines/gob/map.h
===================================================================
--- scummvm/trunk/engines/gob/map.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/map.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -100,7 +100,7 @@
int16 checkLongPath(int16 x0, int16 y0,
int16 x1, int16 y1, int16 i0, int16 i1);
- void loadMapsInitGobs(void);
+ void loadMapsInitGobs();
virtual int16 getItem(int x, int y) = 0;
virtual void setItem(int x, int y, int16 item) = 0;
@@ -166,7 +166,7 @@
virtual ~Map_v1();
protected:
- void init(void);
+ void init();
void loadSounds(Common::SeekableReadStream &data);
void loadGoblins(Common::SeekableReadStream &data, uint32 gobsPos);
void loadObjects(Common::SeekableReadStream &data, uint32 objsPos);
Modified: scummvm/trunk/engines/gob/map_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/map_v1.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/map_v1.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -40,7 +40,7 @@
Map_v1::~Map_v1() {
}
-void Map_v1::init(void) {
+void Map_v1::init() {
if (_passMap || _itemsMap)
return;
Modified: scummvm/trunk/engines/gob/mult.cpp
===================================================================
--- scummvm/trunk/engines/gob/mult.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/mult.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -109,7 +109,7 @@
delete _multData;
}
-void Mult::initAll(void) {
+void Mult::initAll() {
_objects = 0;
_animSurf.reset();
_renderData = 0;
@@ -117,7 +117,7 @@
_vm->_scenery->init();
}
-void Mult::freeAll(void) {
+void Mult::freeAll() {
freeMult();
for (int i = 0; i < 10; i++) {
@@ -149,12 +149,12 @@
_vm->_draw->freeSprite(22);
}
-void Mult::checkFreeMult(void) {
+void Mult::checkFreeMult() {
if (_multData)
freeMultKeys();
}
-void Mult::zeroMultData(void) {
+void Mult::zeroMultData() {
_multData = 0;
}
Modified: scummvm/trunk/engines/gob/util.cpp
===================================================================
--- scummvm/trunk/engines/gob/util.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/util.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -47,7 +47,7 @@
_startFrameTime = 0;
}
-uint32 Util::getTimeKey(void) {
+uint32 Util::getTimeKey() {
return g_system->getMillis() * _vm->_global->_speedFactor;
}
@@ -83,7 +83,7 @@
((g_system->getMillis() * _vm->_global->_speedFactor) < time));
}
-void Util::initInput(void) {
+void Util::initInput() {
_mouseButtons = kMouseButtonsNone;
_keyBufferHead = _keyBufferTail = 0;
}
@@ -151,7 +151,7 @@
}
}
-void Util::clearKeyBuf(void) {
+void Util::clearKeyBuf() {
processInput();
_keyBufferHead = _keyBufferTail = 0;
}
@@ -220,7 +220,7 @@
return 0;
}
-int16 Util::getKey(void) {
+int16 Util::getKey() {
Common::KeyState key;
while (!getKeyFromBuffer(key)) {
@@ -232,7 +232,7 @@
return translateKey(key);
}
-int16 Util::checkKey(void) {
+int16 Util::checkKey() {
Common::KeyState key;
getKeyFromBuffer(key);
@@ -266,7 +266,7 @@
g_system->warpMouse(x, y);
}
-void Util::waitMouseUp(void) {
+void Util::waitMouseUp() {
do {
processInput();
if (_mouseButtons != kMouseButtonsNone)
@@ -274,7 +274,7 @@
} while (_mouseButtons != kMouseButtonsNone);
}
-void Util::waitMouseDown(void) {
+void Util::waitMouseDown() {
int16 x;
int16 y;
MouseButtons buttons;
@@ -309,7 +309,7 @@
_mouseButtons = kMouseButtonsNone;
}
-void Util::clearPalette(void) {
+void Util::clearPalette() {
int16 i;
byte colors[1024];
Modified: scummvm/trunk/engines/gob/util.h
===================================================================
--- scummvm/trunk/engines/gob/util.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/gob/util.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -91,7 +91,7 @@
List() : pHead(0), pTail(0) {}
};
- uint32 getTimeKey(void);
+ uint32 getTimeKey();
int16 getRandom(int16 max);
void beep(int16 freq);
@@ -100,21 +100,21 @@
void delay(uint16 msecs);
void longDelay(uint16 msecs);
- void initInput(void);
+ void initInput();
void processInput(bool scroll = false);
- void clearKeyBuf(void);
- int16 getKey(void);
- int16 checkKey(void);
+ void clearKeyBuf();
+ int16 getKey();
+ int16 checkKey();
bool checkKey(int16 &key);
void getMouseState(int16 *pX, int16 *pY, MouseButtons *pButtons);
void setMousePos(int16 x, int16 y);
- void waitMouseUp(void);
- void waitMouseDown(void);
+ void waitMouseUp();
+ void waitMouseDown();
void waitMouseRelease(char drawMouse);
void forceMouseUp(bool onlyWhenSynced = false);
- void clearPalette(void);
+ void clearPalette();
int16 getFrameRate();
void setFrameRate(int16 rate);
void notifyNewAnim();
Modified: scummvm/trunk/engines/groovie/music.cpp
===================================================================
--- scummvm/trunk/engines/groovie/music.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/groovie/music.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -281,7 +281,7 @@
_driver->setTimerCallback(timer_param, timer_proc);
}
-uint32 MusicPlayerMidi::getBaseTempo(void) {
+uint32 MusicPlayerMidi::getBaseTempo() {
if (_driver)
return _driver->getBaseTempo();
else
Modified: scummvm/trunk/engines/groovie/music.h
===================================================================
--- scummvm/trunk/engines/groovie/music.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/groovie/music.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -97,7 +97,7 @@
void send(uint32 b);
void metaEvent(byte type, byte *data, uint16 length);
void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc);
- uint32 getBaseTempo(void);
+ uint32 getBaseTempo();
MidiChannel *allocateChannel();
MidiChannel *getPercussionChannel();
Modified: scummvm/trunk/engines/kyra/sound_intern.h
===================================================================
--- scummvm/trunk/engines/kyra/sound_intern.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/kyra/sound_intern.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -129,7 +129,7 @@
void metaEvent(byte type, byte *data, uint16 length) {}
void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { }
- uint32 getBaseTempo(void);
+ uint32 getBaseTempo();
//Channel allocation functions
MidiChannel *allocateChannel() { return 0; }
Modified: scummvm/trunk/engines/kyra/sound_midi.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_midi.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/kyra/sound_midi.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -51,7 +51,7 @@
void metaEvent(byte type, byte *data, uint16 length);
void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { _output->setTimerCallback(timerParam, timerProc); }
- uint32 getBaseTempo(void) { return _output->getBaseTempo(); }
+ uint32 getBaseTempo() { return _output->getBaseTempo(); }
// DUMMY
int open() { return 0; }
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -3958,7 +3958,7 @@
_driver->send(b);
}
-uint32 SoundTowns::getBaseTempo(void) {
+uint32 SoundTowns::getBaseTempo() {
return _driver ? _driver->getBaseTempo() : 0;
}
Modified: scummvm/trunk/engines/lure/sound.h
===================================================================
--- scummvm/trunk/engines/lure/sound.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/lure/sound.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -89,7 +89,7 @@
void metaEvent(byte type, byte *data, uint16 length);
void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { }
- uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; }
+ uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; }
//Channel allocation functions
MidiChannel *allocateChannel() { return 0; }
Modified: scummvm/trunk/engines/m4/console.h
===================================================================
--- scummvm/trunk/engines/m4/console.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/m4/console.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -35,7 +35,7 @@
class Console : public GUI::Debugger {
public:
Console(M4Engine *vm);
- virtual ~Console(void);
+ virtual ~Console();
private:
bool cmdLoadScene(int argc, const char **argv);
Modified: scummvm/trunk/engines/m4/midi.h
===================================================================
--- scummvm/trunk/engines/m4/midi.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/m4/midi.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -60,7 +60,7 @@
void metaEvent(byte type, byte *data, uint16 length);
void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { }
- uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; }
+ uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; }
//Channel allocation functions
MidiChannel *allocateChannel() { return 0; }
Modified: scummvm/trunk/engines/made/music.h
===================================================================
--- scummvm/trunk/engines/made/music.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/made/music.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -72,7 +72,7 @@
void metaEvent(byte type, byte *data, uint16 length);
void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { }
- uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; }
+ uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; }
//Channel allocation functions
MidiChannel *allocateChannel() { return 0; }
Modified: scummvm/trunk/engines/made/redreader.cpp
===================================================================
--- scummvm/trunk/engines/made/redreader.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/made/redreader.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -239,7 +239,7 @@
}
}
-unsigned int LzhDecompressor::decode_c(void) {
+unsigned int LzhDecompressor::decode_c() {
uint j, mask;
if (_blocksize == 0) {
_blocksize = getbits(16);
Modified: scummvm/trunk/engines/made/redreader.h
===================================================================
--- scummvm/trunk/engines/made/redreader.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/made/redreader.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -86,11 +86,11 @@
void fillbuf(int count);
uint getbits(int count);
- void init_getbits(void);
- void decode_start(void);
+ void init_getbits();
+ void decode_start();
void decode(uint count, byte text[]);
- void huf_decode_start(void);
- unsigned int decode_c(void);
+ void huf_decode_start();
+ unsigned int decode_c();
unsigned int decode_p();
void read_pt_len(int nn, int nbit, int i_special);
void read_c_len();
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -241,7 +241,7 @@
Common::Platform getPlatform() const;
protected: // members
- bool detectGame(void);
+ bool detectGame();
private:
const PARALLACTIONGameDescription *_gameDescription;
Modified: scummvm/trunk/engines/queen/music.h
===================================================================
--- scummvm/trunk/engines/queen/music.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/queen/music.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -63,7 +63,7 @@
void metaEvent(byte type, byte *data, uint16 length);
void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { }
- uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; }
+ uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; }
//Channel allocation functions
MidiChannel *allocateChannel() { return 0; }
Modified: scummvm/trunk/engines/saga/actor.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/actor.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -1210,7 +1210,7 @@
drawSpeech();
}
-void Actor::drawSpeech(void) {
+void Actor::drawSpeech() {
if (!isSpeaking() || !_activeSpeech.playing || _vm->_script->_skipSpeeches
|| (!_vm->_subtitlesEnabled && _vm->getGameId() == GID_ITE && !(_vm->getFeatures() & GF_ITE_FLOPPY))
|| (!_vm->_subtitlesEnabled && (_vm->getGameId() == GID_IHNM)))
Modified: scummvm/trunk/engines/saga/animation.cpp
===================================================================
--- scummvm/trunk/engines/saga/animation.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/animation.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -53,7 +53,7 @@
_cutawayAnimations[i] = NULL;
}
-Anim::~Anim(void) {
+Anim::~Anim() {
reset();
#ifdef ENABLE_IHNM
freeCutawayList();
@@ -77,7 +77,7 @@
}
}
-void Anim::freeCutawayList(void) {
+void Anim::freeCutawayList() {
free(_cutawayList);
_cutawayList = NULL;
_cutawayListLength = 0;
@@ -206,14 +206,14 @@
return MAX_ANIMATIONS + cutawaySlot;
}
-void Anim::endCutaway(void) {
+void Anim::endCutaway() {
// This is called by scripts after a cutaway is finished. At this time,
// nothing needs to be done here.
debug(0, "endCutaway()");
}
-void Anim::returnFromCutaway(void) {
+void Anim::returnFromCutaway() {
// This is called by scripts after a cutaway is finished, to return back
// to the scene that the cutaway was called from. It's not called by the
// IHNM intro, as there is no old scene to return to.
@@ -308,7 +308,7 @@
}
}
-void Anim::clearCutaway(void) {
+void Anim::clearCutaway() {
PalEntry *pal;
debug(1, "clearCutaway()");
@@ -383,13 +383,13 @@
playCutaway(vid, fade);
}
-void Anim::endVideo(void) {
+void Anim::endVideo() {
debug(0, "endVideo()");
clearCutaway();
}
-void Anim::returnFromVideo(void) {
+void Anim::returnFromVideo() {
debug(0, "returnFromVideo()");
returnFromCutaway();
Modified: scummvm/trunk/engines/saga/animation.h
===================================================================
--- scummvm/trunk/engines/saga/animation.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/animation.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -109,19 +109,19 @@
class Anim {
public:
Anim(SagaEngine *vm);
- ~Anim(void);
+ ~Anim();
void loadCutawayList(const byte *resourcePointer, size_t resourceLength);
- void freeCutawayList(void);
+ void freeCutawayList();
int playCutaway(int cut, bool fade);
- void endCutaway(void);
- void returnFromCutaway(void);
- void clearCutaway(void);
+ void endCutaway();
+ void returnFromCutaway();
+ void clearCutaway();
void showCutawayBg(int bg);
void startVideo(int vid, bool fade);
- void endVideo(void);
- void returnFromVideo(void);
+ void endVideo();
+ void returnFromVideo();
void load(uint16 animId, const byte *animResourceData, size_t animResourceLength);
void freeId(uint16 animId);
@@ -130,9 +130,9 @@
void setFlag(uint16 animId, uint16 flag);
void clearFlag(uint16 animId, uint16 flag);
void setFrameTime(uint16 animId, int time);
- void reset(void);
- void animInfo(void);
- void cutawayInfo(void);
+ void reset();
+ void animInfo();
+ void cutawayInfo();
void setCycles(uint16 animId, int cycles);
void stop(uint16 animId);
void finish(uint16 animId);
@@ -152,7 +152,7 @@
return (_animations[animId] != NULL);
}
- bool hasCutaway(void) { return _cutawayActive; }
+ bool hasCutaway() { return _cutawayActive; }
void setCutAwayMode(int mode) { _cutAwayMode = mode; }
int cutawayListLength() { return _cutawayListLength; }
int cutawayBgResourceID(int cutaway) { return _cutawayList[cutaway].backgroundResourceId; }
Modified: scummvm/trunk/engines/saga/console.h
===================================================================
--- scummvm/trunk/engines/saga/console.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/console.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -35,7 +35,7 @@
class Console : public GUI::Debugger {
public:
Console(SagaEngine *vm);
- virtual ~Console(void);
+ virtual ~Console();
private:
bool cmdActorWalkTo(int argc, const char **argv);
Modified: scummvm/trunk/engines/saga/events.cpp
===================================================================
--- scummvm/trunk/engines/saga/events.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/events.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -47,7 +47,7 @@
debug(8, "Initializing event subsystem...");
}
-Events::~Events(void) {
+Events::~Events() {
debug(8, "Shutting down event subsystem...");
freeList();
}
Modified: scummvm/trunk/engines/saga/events.h
===================================================================
--- scummvm/trunk/engines/saga/events.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/events.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -162,7 +162,7 @@
class Events {
public:
Events(SagaEngine *vm);
- ~Events(void);
+ ~Events();
int handleEvents(long msec);
int clearList(bool playQueuedMusic = true);
int freeList();
Modified: scummvm/trunk/engines/saga/font.cpp
===================================================================
--- scummvm/trunk/engines/saga/font.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/font.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -51,7 +51,7 @@
_fontMapping = 0;
}
-Font::~Font(void) {
+Font::~Font() {
debug(8, "Font::~Font(): Freeing fonts.");
int i;
Modified: scummvm/trunk/engines/saga/font.h
===================================================================
--- scummvm/trunk/engines/saga/font.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/font.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -130,7 +130,7 @@
class Font {
public:
Font(SagaEngine *vm);
- ~Font(void);
+ ~Font();
int getStringWidth(KnownFont font, const char *text, size_t count, FontEffectFlags flags) {
return getStringWidth(knownFont2FontIdx(font), text, count, flags);
}
Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/interface.cpp 2009-11-02 21:54:57 UTC (rev 45616)
@@ -344,7 +344,7 @@
_vm->getTimerManager()->installTimerProc(&saveReminderCallback, TIMETOSAVE, this);
}
-Interface::~Interface(void) {
+Interface::~Interface() {
free(_inventory);
free(_mainPanel.image);
@@ -2414,13 +2414,13 @@
// Converse stuff
-void Interface::converseInit(void) {
+void Interface::converseInit() {
for (int i = 0; i < CONVERSE_MAX_TEXTS; i++)
_converseText[i].text = NULL;
converseClear();
}
-void Interface::converseClear(void) {
+void Interface::converseClear() {
for (int i = 0; i < CONVERSE_MAX_TEXTS; i++) {
if (_converseText[i].text != NULL) {
free(_converseText[i].text);
Modified: scummvm/trunk/engines/saga/interface.h
===================================================================
--- scummvm/trunk/engines/saga/interface.h 2009-11-02 21:42:21 UTC (rev 45615)
+++ scummvm/trunk/engines/saga/interface.h 2009-11-02 21:54:57 UTC (rev 45616)
@@ -183,7 +183,7 @@
class Interface {
public:
Interface(SagaEngine *vm);
- ~Interface(void);
+ ~Interface();
int activate();
int deactivate();
@@ -196,7 +196,7 @@
}
bool isActive() { return _active; }
void setMode(int mode);
- int getMode(void) const { return _panelMode; }
+ int getMode() const { return _panelMode; }
void setFadeMode(int fadeMode) {
_fadeMode = fadeMode;
draw();
@@ -356,8 +356,8 @@
void processStatusTextInput(Common::KeyState keystate);
public:
- void converseInit(void);
- void converseClear(void);
+ void converseInit();
+ void converseClear();
bool converseAddText(const char *text, int strId, int replyId, byte replyFlags, int replyBit);
void converseDisplayText();
void converseSetTextLines(int row);
Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp 2009-11-02 21:42:21 UTC (rev 45615)
@@ Diff output truncated at 100000 characters. @@
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