diff options
Diffstat (limited to 'engines/tinsel')
70 files changed, 390 insertions, 390 deletions
diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp index 284e166899..efcefb442c 100644 --- a/engines/tinsel/actors.cpp +++ b/engines/tinsel/actors.cpp @@ -215,7 +215,7 @@ void SetLeadId(int leadID) { /** * No comment. */ -int GetLeadId(void) { +int GetLeadId() { return LeadActorId; } @@ -471,7 +471,7 @@ void StartTaggedActors(SCNHANDLE ah, int numActors, bool bRunScript) { /** * Called between scenes, zeroises all actors. */ -void DropActors(void) { +void DropActors() { for (int i = 0; i < NumActors; i++) { if (TinselV2) { @@ -614,7 +614,7 @@ SCNHANDLE GetActorTag(int ano) { * NextTagged Actor is repeatedly called until the caller gets fed up * or there are no more tagged actors to look at. */ -void FirstTaggedActor(void) { +void FirstTaggedActor() { ti = 0; } @@ -623,7 +623,7 @@ void FirstTaggedActor(void) { * NextTagged Actor is repeatedly called until the caller gets fed up * or there are no more tagged actors to look at. */ -int NextTaggedActor(void) { +int NextTaggedActor() { PMOVER pActor; bool hid; @@ -1406,7 +1406,7 @@ void RestoreActorZ(byte *saveActorZ) { memcpy(zFactors, saveActorZ, NumActors); } -void setactorson(void) { +void setactorson() { bActorsOn = true; } @@ -1567,7 +1567,7 @@ bool InHotSpot(int ano, int curX, int curY) { /** * Front Tagged Actor */ -int FrontTaggedActor(void) { +int FrontTaggedActor() { int i; for (i = 0; i < numTaggedActors; i++) { diff --git a/engines/tinsel/actors.h b/engines/tinsel/actors.h index 0cf77e8be1..fbad5d9955 100644 --- a/engines/tinsel/actors.h +++ b/engines/tinsel/actors.h @@ -48,12 +48,12 @@ struct OBJECT; /*----------------------------------------------------------------------*/ void RegisterActors(int num); -void FreeActors(void); +void FreeActors(); void SetLeadId(int rid); -int GetLeadId(void); +int GetLeadId(); bool ActorIsGhost(int actor); void StartTaggedActors(SCNHANDLE ah, int numActors, bool bRunScript); -void DropActors(void); // No actor reels running +void DropActors(); // No actor reels running void DisableActor(int actor); void EnableActor(int actor); void Tag_Actor(int ano, SCNHANDLE tagtext, int tp); @@ -100,8 +100,8 @@ int GetActorZpos(int ano, int column); void IncLoopCount(int ano); int GetLoopCount(int ano); SCNHANDLE GetActorTag(int ano); -void FirstTaggedActor(void); -int NextTaggedActor(void); +void FirstTaggedActor(); +int NextTaggedActor(); int NextTaggedActor(int previous); int AsetZPos(OBJECT *pObj, int y, int32 zFactor); void SetMoverZ(MOVER *pMover, int y, int32 zFactor); @@ -113,7 +113,7 @@ void SetActorRGB(int ano, COLORREF colour); void SetActorZfactor(int ano, uint32 zFactor); uint32 GetActorZfactor(int ano); -void setactorson(void); +void setactorson(); void ActorsLife(int id, bool bAlive); @@ -128,7 +128,7 @@ bool ActorIsPointedTo(int actor); void SetActorTagWanted(int actor, bool bTagWanted, bool bCursor, SCNHANDLE hOverrideTag); bool ActorTagIsWanted(int actor); bool InHotSpot(int ano, int curX, int curY); -int FrontTaggedActor(void); +int FrontTaggedActor(); void GetActorTagPos(int actor, int *pTagX, int *pTagY, bool bAbsolute); bool IsTaggedActor(int actor); void StoreActorPresFilm(int ano, SCNHANDLE hFilm, int x, int y); diff --git a/engines/tinsel/background.cpp b/engines/tinsel/background.cpp index 740b6204ea..abfb9692a9 100644 --- a/engines/tinsel/background.cpp +++ b/engines/tinsel/background.cpp @@ -175,7 +175,7 @@ OBJECT *GetPlayfieldList(int which) { * to scroll each playfield before it is drawn. */ -void DrawBackgnd(void) { +void DrawBackgnd() { int i; // playfield counter PLAYFIELD *pPlay; // playfield pointer int prevX, prevY; // save interger part of position @@ -255,7 +255,7 @@ void DrawBackgnd(void) { ResetClipRect(); } -void ForceEntireRedraw(void) { +void ForceEntireRedraw() { bEntireRedraw = true; } diff --git a/engines/tinsel/background.h b/engines/tinsel/background.h index e6074f7bb4..747e51a8f1 100644 --- a/engines/tinsel/background.h +++ b/engines/tinsel/background.h @@ -81,7 +81,7 @@ void InitBackground( // called to initialise a background void StartupBackground(CORO_PARAM, SCNHANDLE hFilm); -void StopBgndScrolling(void); // Stops all background playfields from scrolling +void StopBgndScrolling(); // Stops all background playfields from scrolling void PlayfieldSetPos( // Sets the xy position of the specified playfield in the current background int which, // which playfield @@ -102,19 +102,19 @@ OBJECT *GetPlayfieldList( // Returns the display list for the specified playfiel void KillPlayfieldList( // Kills all the objects on the display list for the specified playfield int which); // which playfield -void DrawBackgnd(void); // Draws all playfields for the current background +void DrawBackgnd(); // Draws all playfields for the current background -void RedrawBackgnd(void); // Completely redraws all the playfield object lists for the current background +void RedrawBackgnd(); // Completely redraws all the playfield object lists for the current background OBJECT *GetBgObject(); -SCNHANDLE BgPal(void); +SCNHANDLE BgPal(); -void ForceEntireRedraw(void); +void ForceEntireRedraw(); -int BgWidth(void); +int BgWidth(); -int BgHeight(void); +int BgHeight(); } // End of namespace Tinsel diff --git a/engines/tinsel/bg.cpp b/engines/tinsel/bg.cpp index 0125a681fd..efd4b644cf 100644 --- a/engines/tinsel/bg.cpp +++ b/engines/tinsel/bg.cpp @@ -66,7 +66,7 @@ OBJECT *GetBgObject() { /** * BackPal */ -SCNHANDLE BgPal(void) { +SCNHANDLE BgPal() { return hBgPal; } @@ -80,7 +80,7 @@ void SetDoFadeIn(bool tf) { /** * Called before scene change. */ -void DropBackground(void) { +void DropBackground() { pBG[0] = NULL; // No background if (!TinselV2) @@ -90,7 +90,7 @@ void DropBackground(void) { /** * Return the width of the current background. */ -int BgWidth(void) { +int BgWidth() { assert(pBG[0]); return MultiRightmost(pBG[0]) + 1; } @@ -98,7 +98,7 @@ int BgWidth(void) { /** * Return the height of the current background. */ -int BgHeight(void) { +int BgHeight() { assert(pBG[0]); return MultiLowest(pBG[0]) + 1; } @@ -275,7 +275,7 @@ void StartupBackground(CORO_PARAM, SCNHANDLE hFilm) { /** * Return the current scene handle. */ -SCNHANDLE GetBgroundHandle(void) { +SCNHANDLE GetBgroundHandle() { return hBackground; } diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index 6f5358760a..e89f1f091f 100644 --- a/engines/tinsel/bmv.cpp +++ b/engines/tinsel/bmv.cpp @@ -470,7 +470,7 @@ void BMVPlayer::MovieAudio(int audioOffset, int blobs) { |-------------------------------------------------------| \*-----------------------------------------------------*/ -void BMVPlayer::FettleMovieText(void) { +void BMVPlayer::FettleMovieText() { int i; bIsText = false; @@ -702,7 +702,7 @@ void BMVPlayer::LoadSlots(int number) { /** * Called from the foreground when starting playback of a movie. */ -void BMVPlayer::InitialiseBMV(void) { +void BMVPlayer::InitialiseBMV() { if (!stream.open(szMovieFile)) error(CANNOT_FIND_FILE, szMovieFile); @@ -751,7 +751,7 @@ void BMVPlayer::InitialiseBMV(void) { /** * Called from the foreground when ending playback of a movie. */ -void BMVPlayer::FinishBMV(void) { +void BMVPlayer::FinishBMV() { int i; // Notify the sound channel @@ -791,7 +791,7 @@ void BMVPlayer::FinishBMV(void) { /** * MaintainBuffer() */ -bool BMVPlayer::MaintainBuffer(void) { +bool BMVPlayer::MaintainBuffer() { int nextOffset; // No action if the file is all read @@ -880,7 +880,7 @@ bool BMVPlayer::MaintainBuffer(void) { /** * DoBMVFrame */ -bool BMVPlayer::DoBMVFrame(void) { +bool BMVPlayer::DoBMVFrame() { unsigned char *data; int graphOffset, length; signed short xscr; @@ -990,7 +990,7 @@ bool BMVPlayer::DoBMVFrame(void) { /** * DoSoundFrame */ -bool BMVPlayer::DoSoundFrame(void) { +bool BMVPlayer::DoSoundFrame() { unsigned char *data; int graphOffset; @@ -1064,7 +1064,7 @@ bool BMVPlayer::DoSoundFrame(void) { /** * CopyMovieToScreen */ -void BMVPlayer::CopyMovieToScreen(void) { +void BMVPlayer::CopyMovieToScreen() { // Not if not up and running yet! if (!screenBuffer || (currentFrame == 0)) { ForceEntireRedraw(); @@ -1090,7 +1090,7 @@ void BMVPlayer::CopyMovieToScreen(void) { /** * LookAtBuffers */ -void BMVPlayer::LookAtBuffers(void) { +void BMVPlayer::LookAtBuffers() { // FIXME: What's the point of this function??? static int junk; int i; @@ -1104,7 +1104,7 @@ void BMVPlayer::LookAtBuffers(void) { /** * Handles playback of any active movie. Called from the foreground 24 times a second. */ -void BMVPlayer::FettleBMV(void) { +void BMVPlayer::FettleBMV() { int refFrame; // Tick counter needs to be incrementing at a 24Hz rate @@ -1196,14 +1196,14 @@ void BMVPlayer::FettleBMV(void) { /** * Returns true if a movie is playing. */ -bool BMVPlayer::MoviePlaying(void) { +bool BMVPlayer::MoviePlaying() { return bMovieOn; } /** * Returns the audio lag in ms */ -int32 BMVPlayer::MovieAudioLag(void) { +int32 BMVPlayer::MovieAudioLag() { if (!bMovieOn || !audioStream) return 0; @@ -1212,11 +1212,11 @@ int32 BMVPlayer::MovieAudioLag(void) { return (playLength - (((int32) _vm->_mixer->getSoundElapsedTime(audioHandle)) << 10)) >> 10; } -uint32 BMVPlayer::NextMovieTime(void) { +uint32 BMVPlayer::NextMovieTime() { return nextMovieTime; } -void BMVPlayer::AbortMovie(void) { +void BMVPlayer::AbortMovie() { bAbort = true; } diff --git a/engines/tinsel/bmv.h b/engines/tinsel/bmv.h index 7891075315..a4e70a9efc 100644 --- a/engines/tinsel/bmv.h +++ b/engines/tinsel/bmv.h @@ -122,16 +122,16 @@ public: void PlayBMV(CORO_PARAM, SCNHANDLE hFileStem, int myEscape); void FinishBMV(); - void CopyMovieToScreen(void); - void FettleBMV(void); + void CopyMovieToScreen(); + void FettleBMV(); - bool MoviePlaying(void); + bool MoviePlaying(); - int32 MovieAudioLag(void); + int32 MovieAudioLag(); - uint32 NextMovieTime(void); + uint32 NextMovieTime(); - void AbortMovie(void); + void AbortMovie(); private: void InitBMV(byte *memoryBuffer); @@ -141,17 +141,17 @@ private: void StartMovieSound(); void FinishMovieSound(); void MovieAudio(int audioOffset, int blobs); - void FettleMovieText(void); + void FettleMovieText(); void BmvDrawText(bool bDraw); void MovieText(CORO_PARAM, int stringId, int x, int y, int fontId, COLORREF *pTalkColour, int duration); int MovieCommand(char cmd, int commandOffset); int FollowingPacket(int thisPacket, bool bReallyImportant); void LoadSlots(int number); - void InitialiseBMV(void); - bool MaintainBuffer(void); - bool DoBMVFrame(void); - bool DoSoundFrame(void); - void LookAtBuffers(void); + void InitialiseBMV(); + bool MaintainBuffer(); + bool DoBMVFrame(); + bool DoSoundFrame(); + void LookAtBuffers(); }; diff --git a/engines/tinsel/cliprect.cpp b/engines/tinsel/cliprect.cpp index 2ec9907149..69a71b874f 100644 --- a/engines/tinsel/cliprect.cpp +++ b/engines/tinsel/cliprect.cpp @@ -37,7 +37,7 @@ static RectList s_rectList; /** * Resets the clipping rectangle allocator. */ -void ResetClipRect(void) { +void ResetClipRect() { s_rectList.clear(); } diff --git a/engines/tinsel/config.cpp b/engines/tinsel/config.cpp index 29c6823436..86ba213398 100644 --- a/engines/tinsel/config.cpp +++ b/engines/tinsel/config.cpp @@ -55,7 +55,7 @@ int bAmerica = 0; /** * Write settings to config manager and flush the config file to disk. */ -void WriteConfig(void) { +void WriteConfig() { ConfMan.setInt("dclick_speed", dclickSpeed); ConfMan.setInt("music_volume", volMusic); ConfMan.setInt("sfx_volume", volSound); @@ -94,7 +94,7 @@ void WriteConfig(void) { /** * Read configuration settings from the config file into memory */ -void ReadConfig(void) { +void ReadConfig() { if (ConfMan.hasKey("dclick_speed")) dclickSpeed = ConfMan.getInt("dclick_speed"); diff --git a/engines/tinsel/config.h b/engines/tinsel/config.h index 85d5ca60e0..67655c58fc 100644 --- a/engines/tinsel/config.h +++ b/engines/tinsel/config.h @@ -46,8 +46,8 @@ extern int bSwapButtons; extern LANGUAGE g_language; extern int bAmerica; -void WriteConfig(void); -void ReadConfig(void); +void WriteConfig(); +void ReadConfig(); extern bool isJapanMode(); diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp index 15f8f05e07..dd5f024815 100644 --- a/engines/tinsel/cursor.cpp +++ b/engines/tinsel/cursor.cpp @@ -104,7 +104,7 @@ static int lastCursorX = 0, lastCursorY = 0; //----------------- FORWARD REFERENCES -------------------- -static void DoCursorMove(void); +static void DoCursorMove(); /** * Initialise and insert a cursor trail object, set its Z-pos, and hide @@ -232,7 +232,7 @@ void GetCursorXY(int *x, int *y, bool absolute) { * Called from TINLIB.C to restore cursor after hiding it. * Called from INVENTRY.C to restore cursor after customising it. */ -void RestoreMainCursor(void) { +void RestoreMainCursor() { const FILM *pfilm; if (McurObj != NULL) { @@ -256,7 +256,7 @@ void SetTempCursor(SCNHANDLE pScript) { /** * Hide the cursor. */ -void DwHideCursor(void) { +void DwHideCursor() { int i; bHiddenCursor = true; @@ -277,14 +277,14 @@ void DwHideCursor(void) { /** * Unhide the cursor. */ -void UnHideCursor(void) { +void UnHideCursor() { bHiddenCursor = false; } /** * Freeze the cursor. */ -void FreezeCursor(void) { +void FreezeCursor() { bFrozenCursor = true; } @@ -298,7 +298,7 @@ void DoFreezeCursor(bool bFreeze) { /** * HideCursorTrails */ -void HideCursorTrails(void) { +void HideCursorTrails() { int i; bTempNoTrailers = true; @@ -314,7 +314,7 @@ void HideCursorTrails(void) { /** * UnHideCursorTrails */ -void UnHideCursorTrails(void) { +void UnHideCursorTrails() { bTempNoTrailers = false; } @@ -356,7 +356,7 @@ IMAGE *GetImageFromFilm(SCNHANDLE hFilm, int reel, const FREEL **ppfr, const MUL /** * Delete auxillary cursor. Restore animation offsets in the image. */ -void DelAuxCursor(void) { +void DelAuxCursor() { if (AcurObj != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), AcurObj); AcurObj = NULL; @@ -402,7 +402,7 @@ void SetAuxCursor(SCNHANDLE hFilm) { /** * MoveCursor */ -static void DoCursorMove(void) { +static void DoCursorMove() { int startX, startY; Common::Point ptMouse; frac_t newX, newY; @@ -473,7 +473,7 @@ static void DoCursorMove(void) { /** * Initialise cursor object. */ -static void InitCurObj(void) { +static void InitCurObj() { const FILM *pFilm; const FREEL *pfr; const MULTI_INIT *pmi; @@ -503,7 +503,7 @@ static void InitCurObj(void) { /** * Initialise the cursor position. */ -static void InitCurPos(void) { +static void InitCurPos() { Common::Point ptMouse = _vm->getMousePosition(); lastCursorX = ptMouse.x; lastCursorY = ptMouse.y; @@ -629,7 +629,7 @@ void DwInitCursor(SCNHANDLE bfilm) { /** * DropCursor is called when a scene is closing down. */ -void DropCursor(void) { +void DropCursor() { if (TinselV2) { if (AcurObj) MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), AcurObj); @@ -656,7 +656,7 @@ void DropCursor(void) { /** * RestartCursor is called when a new scene is starting up. */ -void RestartCursor(void) { +void RestartCursor() { restart = 0x8000; // Get the main cursor to re-initialise } @@ -664,7 +664,7 @@ void RestartCursor(void) { * Called when restarting the game, ensures correct re-start with NULL * pointers etc. */ -void RebootCursor(void) { +void RebootCursor() { McurObj = AcurObj = NULL; for (int i = 0; i < MAX_TRAILERS; i++) ntrailData[i].trailObj = NULL; @@ -677,14 +677,14 @@ void RebootCursor(void) { restart = 0; } -void StartCursorFollowed(void) { +void StartCursorFollowed() { DelAuxCursor(); if (!SysVar(SV_ENABLEPRINTCURSOR)) bTempHide = true; } -void EndCursorFollowed(void) { +void EndCursorFollowed() { InventoryIconCursor(false); // May be holding something bTempHide = false; } diff --git a/engines/tinsel/cursor.h b/engines/tinsel/cursor.h index b3f7203f2b..71e846297c 100644 --- a/engines/tinsel/cursor.h +++ b/engines/tinsel/cursor.h @@ -38,22 +38,22 @@ void GetCursorXY(int *x, int *y, bool absolute); bool GetCursorXYNoWait(int *x, int *y, bool absolute); bool isCursorShown(); -void RestoreMainCursor(void); +void RestoreMainCursor(); void SetTempCursor(SCNHANDLE pScript); -void DwHideCursor(void); -void UnHideCursor(void); -void FreezeCursor(void); +void DwHideCursor(); +void UnHideCursor(); +void FreezeCursor(); void DoFreezeCursor(bool bFreeze); -void HideCursorTrails(void); -void UnHideCursorTrails(void); -void DelAuxCursor(void); +void HideCursorTrails(); +void UnHideCursorTrails(); +void DelAuxCursor(); void SetAuxCursor(SCNHANDLE hFilm); void DwInitCursor(SCNHANDLE bfilm); -void DropCursor(void); -void RestartCursor(void); -void RebootCursor(void); -void StartCursorFollowed(void); -void EndCursorFollowed(void); +void DropCursor(); +void RestartCursor(); +void RebootCursor(); +void StartCursorFollowed(); +void EndCursorFollowed(); } // End of namespace Tinsel diff --git a/engines/tinsel/debugger.cpp b/engines/tinsel/debugger.cpp index b3cb2d1b92..f422c88e94 100644 --- a/engines/tinsel/debugger.cpp +++ b/engines/tinsel/debugger.cpp @@ -38,11 +38,11 @@ namespace Tinsel { //----------------- EXTERNAL FUNCTIONS --------------------- // In PDISPLAY.CPP -extern void TogglePathDisplay(void); +extern void TogglePathDisplay(); // In tinsel.cpp extern void SetNewScene(SCNHANDLE scene, int entrance, int transition); // In scene.cpp -extern SCNHANDLE GetSceneHandle(void); +extern SCNHANDLE GetSceneHandle(); //----------------- SUPPORT FUNCTIONS --------------------- diff --git a/engines/tinsel/debugger.h b/engines/tinsel/debugger.h index 219bc71224..e3e7e7cd48 100644 --- a/engines/tinsel/debugger.h +++ b/engines/tinsel/debugger.h @@ -41,7 +41,7 @@ protected: bool cmd_string(int argc, const char **argv); public: Console(); - virtual ~Console(void); + virtual ~Console(); }; } // End of namespace Tinsel diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp index 1b318e69c2..ca760db0f5 100644 --- a/engines/tinsel/dialogs.cpp +++ b/engines/tinsel/dialogs.cpp @@ -77,10 +77,10 @@ extern int volMaster; //----------------- EXTERNAL FUNCTIONS --------------------- // Tag functions in PDISPLAY.C -extern void EnableTags(void); -extern void DisableTags(void); +extern void EnableTags(); +extern void DisableTags(); extern void DisablePointing(CORO_PARAM); -extern void EnablePointing(void); +extern void EnablePointing(); //----------------- LOCAL DEFINES -------------------- @@ -1054,7 +1054,7 @@ static void ConfActionSpecial(int i); /*-------------------------------------------------------------------------*/ -bool LanguageChange(void) { +bool LanguageChange() { LANGUAGE nLang = g_language; if (_vm->getFeatures() & GF_USE_3FLAGS) { @@ -1088,7 +1088,7 @@ bool LanguageChange(void) { * Read in the scene hopper data file and set the * pointers to the data and scene count. */ -static void PrimeSceneHopper(void) { +static void PrimeSceneHopper() { Common::File f; char *pBuffer; uint32 vSize; @@ -1166,11 +1166,11 @@ static void FirstScene(int first) { cd.extraBase = first; } -static void RememberChosenScene(void) { +static void RememberChosenScene() { bRemember = true; } -static void SetChosenScene(void) { +static void SetChosenScene() { lastChosenScene = cd.selBox + cd.extraBase; pChosenScene = &pHopper[cd.selBox + cd.extraBase]; } @@ -1202,7 +1202,7 @@ static void FirstEntry(int first) { cd.extraBase = first; } -void HopAction(void) { +void HopAction() { PHOPENTRY pEntry = pEntries + FROM_LE_32(pChosenScene->entryIndex) + cd.selBox + cd.extraBase; uint32 hScene = FROM_LE_32(pChosenScene->hScene); @@ -1226,7 +1226,7 @@ void HopAction(void) { /** * Delete all the objects in iconArray[] */ -static void DumpIconArray(void) { +static void DumpIconArray() { for (int i = 0; i < MAX_ICONS; i++) { if (iconArray[i] != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[i]); @@ -1238,7 +1238,7 @@ static void DumpIconArray(void) { /** * Delete all the objects in DobjArray[] */ -static void DumpDobjArray(void) { +static void DumpDobjArray() { for (int i = 0; i < MAX_WCOMP; i++) { if (DobjArray[i] != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), DobjArray[i]); @@ -1250,7 +1250,7 @@ static void DumpDobjArray(void) { /** * Delete all the objects in objArray[] */ -static void DumpObjArray(void) { +static void DumpObjArray() { for (int i = 0; i < MAX_WCOMP; i++) { if (objArray[i] != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), objArray[i]); @@ -1322,7 +1322,7 @@ bool IsInInventory(int object, int invnum) { /** * Returns which item is held (INV_NOICON (-1) if none) */ -int WhichItemHeld(void) { +int WhichItemHeld() { return HeldItem; } @@ -1349,11 +1349,11 @@ void InventoryIconCursor(bool bNewItem) { /** * Returns true if the inventory is active. */ -bool InventoryActive(void) { +bool InventoryActive() { return (InventoryState == ACTIVE_INV); } -int WhichInventoryOpen(void) { +int WhichInventoryOpen() { if (InventoryState != ACTIVE_INV) return 0; else @@ -1496,7 +1496,7 @@ void FirstFile(int first) { * Save the game using filename from selected slot & current description. */ -void InvSaveGame(void) { +void InvSaveGame() { if (cd.selBox != NOBOX) { #ifndef JAPAN sedit[strlen(sedit)-1] = 0; // Don't include the cursor! @@ -1508,7 +1508,7 @@ void InvSaveGame(void) { /** * Load the selected saved game. */ -void InvLoadGame(void) { +void InvLoadGame() { int rGame; if (cd.selBox != NOBOX && (cd.selBox+cd.extraBase < cd.numSaved)) { @@ -2494,7 +2494,7 @@ void InvLabels(bool InBody, int aniX, int aniY) { * It seems to set up slideStuff[], an array of possible first-displayed * icons set against the matching y-positions of the slider. */ -void AdjustTop(void) { +void AdjustTop() { int tMissing, bMissing, nMissing; int nsliderYpos; int rowsWanted; @@ -2580,7 +2580,7 @@ OBJECT *AddInvObject(int num, const FREEL **pfreel, const FILM **pfilm) { /** * Create display objects for the displayed icons in an inventory window. */ -void FillInInventory(void) { +void FillInInventory() { int Index; // Index into contents[] int n = 0; // index into iconArray[] int xpos, ypos; @@ -3115,7 +3115,7 @@ void ConstructInventory(InventoryType filling) { OBJECT **retObj; const FILM *pfilm; - extern bool RePosition(void); // Forward reference + extern bool RePosition(); // Forward reference // Select the object array to use if (filling == FULL || filling == CONF) { retObj = objArray; // Standard window @@ -3357,7 +3357,7 @@ void ConstructInventory(InventoryType filling) { * position of the Translucent object is within limits. If it isn't, * adjusts the x/y position of the current inventory and returns true. */ -bool RePosition(void) { +bool RePosition() { int p; bool bMoveitMoveit = false; @@ -3641,11 +3641,11 @@ void ConvPoly(HPOLYGON hPoly) { thisConvPoly = hPoly; } -int GetIcon(void) { +int GetIcon() { return thisIcon; } -void CloseDownConv(void) { +void CloseDownConv() { if (InventoryState == ACTIVE_INV && ino == INV_CONV) { KillInventory(); } @@ -3805,7 +3805,7 @@ void HideConversation(bool bHide) { } } -bool ConvIsHidden(void) { +bool ConvIsHidden() { return InventoryHidden; } @@ -4028,7 +4028,7 @@ void OpenMenu(CONFTYPE menuType) { * Close down an inventory window. */ -void KillInventory(void) { +void KillInventory() { if (objArray[0] != NULL) { DumpObjArray(); DumpDobjArray(); @@ -4066,7 +4066,7 @@ void KillInventory(void) { g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); // Hide VK after save dialog closes } -void CloseInventory(void) { +void CloseInventory() { // If not active, ignore this if (InventoryState != ACTIVE_INV) return; @@ -4464,7 +4464,7 @@ static void SlideMSlider(int x, SSFN fn) { /** * Called from ChangeingSize() during re-sizing. */ -void GettingTaller(void) { +void GettingTaller() { if (SuppV) { Ychange += SuppV; if (Ycompensate == 'T') @@ -4488,7 +4488,7 @@ void GettingTaller(void) { /** * Called from ChangeingSize() during re-sizing. */ -void GettingShorter(void) { +void GettingShorter() { int StartNvi = InvD[ino].NoofVicons; int StartUv = SuppV; @@ -4513,7 +4513,7 @@ void GettingShorter(void) { /** * Called from ChangeingSize() during re-sizing. */ -void GettingWider(void) { +void GettingWider() { int StartNhi = InvD[ino].NoofHicons; int StartUh = SuppH; @@ -4536,7 +4536,7 @@ void GettingWider(void) { /** * Called from ChangeingSize() during re-sizing. */ -void GettingNarrower(void) { +void GettingNarrower() { int StartNhi = InvD[ino].NoofHicons; int StartUh = SuppH; @@ -4562,7 +4562,7 @@ void GettingNarrower(void) { /** * Called from Xmovement()/Ymovement() during re-sizing. */ -void ChangeingSize(void) { +void ChangeingSize() { /* Make it taller or shorter if necessary. */ if (Ychange > 0) GettingTaller(); @@ -4681,7 +4681,7 @@ void Ymovement(int y) { /** * Called when a drag is commencing. */ -void InvDragStart(void) { +void InvDragStart() { int curX, curY; // cursor's animation position GetCursorXY(&curX, &curY, false); @@ -4797,7 +4797,7 @@ void InvDragStart(void) { /** * Called when a drag is over. */ -void InvDragEnd(void) { +void InvDragEnd() { int curX, curY; // cursor's animation position GetCursorXY(&curX, &curY, false); @@ -4835,7 +4835,7 @@ void InvDragEnd(void) { Xchange = Ychange = 0; // Probably no need, but does no harm! } -static void MenuPageDown(void) { +static void MenuPageDown() { if (cd.box == loadBox || cd.box == saveBox) { if (cd.extraBase < MAX_SAVED_FILES-NUM_RGROUP_BOXES) { FirstFile(cd.extraBase+(NUM_RGROUP_BOXES - 1)); @@ -4864,7 +4864,7 @@ static void MenuPageDown(void) { } } -static void MenuPageUp(void) { +static void MenuPageUp() { if (cd.extraBase > 0) { if (cd.box == loadBox || cd.box == saveBox) FirstFile(cd.extraBase-(NUM_RGROUP_BOXES - 1)); @@ -5214,7 +5214,7 @@ static void InvWalkTo(const Common::Point &coOrds) { } } -void InvAction(void) { +void InvAction() { int index; INV_OBJECT *invObj; int aniX, aniY; @@ -5735,15 +5735,15 @@ void InvSetSize(int invno, int MinWidth, int MinHeight, /**************************************************************************/ -bool IsTopWindow(void) { +bool IsTopWindow() { return (InventoryState == BOGUS_INV); } -bool MenuActive(void) { +bool MenuActive() { return (InventoryState == ACTIVE_INV && ino == INV_CONF); } -bool IsConvWindow(void) { +bool IsConvWindow() { return (InventoryState == ACTIVE_INV && ino == INV_CONV); } diff --git a/engines/tinsel/dialogs.h b/engines/tinsel/dialogs.h index 9834d6ce57..a256ed73e8 100644 --- a/engines/tinsel/dialogs.h +++ b/engines/tinsel/dialogs.h @@ -86,7 +86,7 @@ void ButtonToInventory(PLR_EVENT be); void KeyToInventory(PLR_EVENT ke); -int WhichItemHeld(void); +int WhichItemHeld(); void HoldItem(int item, bool bKeepFilm = false); void DropItem(int item); @@ -104,16 +104,16 @@ void idec_inv1(SCNHANDLE text, int MaxContents, int MinWidth, int MinHeight, void idec_inv2(SCNHANDLE text, int MaxContents, int MinWidth, int MinHeight, int StartWidth, int StartHeight, int MaxWidth, int MaxHeight); -bool InventoryActive(void); +bool InventoryActive(); void PermaConvIcon(int icon, bool bEnd = false); void convPos(int bpos); void ConvPoly(HPOLYGON hp); -int GetIcon(void); -void CloseDownConv(void); +int GetIcon(); +void CloseDownConv(); void HideConversation(bool hide); -bool ConvIsHidden(void); +bool ConvIsHidden(); enum { NOOBJECT = -1, @@ -146,7 +146,7 @@ int InventoryPos(int num); bool IsInInventory(int object, int invnum); -void KillInventory(void); +void KillInventory(); void syncInvInfo(Common::Serializer &s); @@ -155,11 +155,11 @@ void InvSetLimit(int invno, int n); void InvSetSize(int invno, int MinWidth, int MinHeight, int StartWidth, int StartHeight, int MaxWidth, int MaxHeight); -int WhichInventoryOpen(void); +int WhichInventoryOpen(); -bool IsTopWindow(void); -bool MenuActive(void); -bool IsConvWindow(void); +bool IsTopWindow(); +bool MenuActive(); +bool IsConvWindow(); void SetObjectFilm(int object, SCNHANDLE hFilm); diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp index b611e386b1..efc7a2046d 100644 --- a/engines/tinsel/drives.cpp +++ b/engines/tinsel/drives.cpp @@ -63,7 +63,7 @@ void CdCD(CORO_PARAM) { CORO_END_CODE; } -int GetCurrentCD(void) { +int GetCurrentCD() { // count from 1 return (currentCD - '1' + 1); } @@ -97,7 +97,7 @@ int GetCD(int flags) { static uint32 lastTime = 0; extern LANGUAGE sampleLanguage; -void DoCdChange(void) { +void DoCdChange() { if (bChangingCD && (g_system->getMillis() > (lastTime + 1000))) { lastTime = g_system->getMillis(); _vm->_sound->closeSampleStream(); @@ -129,7 +129,7 @@ void SetNextCD(int cdNumber) { nextCD = (char)(cdNumber + '1' - 1); } -bool GotoCD(void) { +bool GotoCD() { // WORKAROUND: Somehow, CdDoChange() is called twice... Hopefully, this guard helps if (currentCD == nextCD) return false; diff --git a/engines/tinsel/drives.h b/engines/tinsel/drives.h index 51f9b0ca92..d2c161fa75 100644 --- a/engines/tinsel/drives.h +++ b/engines/tinsel/drives.h @@ -47,11 +47,11 @@ namespace Tinsel { extern char currentCD; -void DoCdChange(void); +void DoCdChange(); void CdCD(CORO_PARAM); -int GetCurrentCD(void); +int GetCurrentCD(); void SetCD(int flags); @@ -59,7 +59,7 @@ int GetCD(int flags); void SetNextCD(int cdNumber); -bool GotoCD(void); +bool GotoCD(); class TinselFile: public Common::File { private: diff --git a/engines/tinsel/events.cpp b/engines/tinsel/events.cpp index 55841e369d..8a9c4833a8 100644 --- a/engines/tinsel/events.cpp +++ b/engines/tinsel/events.cpp @@ -52,8 +52,8 @@ namespace Tinsel { //----------------- EXTERNAL FUNCTIONS --------------------- // in PDISPLAY.C -extern int GetTaggedActor(void); -extern HPOLYGON GetTaggedPoly(void); +extern int GetTaggedActor(); +extern HPOLYGON GetTaggedPoly(); //----------------- EXTERNAL GLOBAL DATA --------------------- @@ -78,12 +78,12 @@ static bool bProvNotProcessed = false; * Gets called before each schedule, only 1 user action per schedule * is allowed. */ -void ResetEcount(void) { +void ResetEcount() { eCount = 0; } -void IncUserEvents(void) { +void IncUserEvents() { userEvents++; lastUserEvent = DwGetCurrentTime(); } @@ -120,7 +120,7 @@ void AllowDclick(CORO_PARAM, PLR_EVENT be) { /** * Re-enables user control */ -void ControlOn(void) { +void ControlOn() { if (!TinselV2) { Control(CONTROL_ON); return; @@ -150,7 +150,7 @@ void ControlOn(void) { /** * Takes control from the user */ -void ControlOff(void) { +void ControlOff() { if (!TinselV2) { Control(CONTROL_ON); return; @@ -176,7 +176,7 @@ void ControlOff(void) { /** * Prevent tags and cursor re-appearing */ -void ControlStartOff(void) { +void ControlStartOff() { if (!TinselV2) { Control(CONTROL_STARTOFF); return; @@ -211,7 +211,7 @@ bool GetControl(int param) { return false; } -bool GetControl(void) { +bool GetControl() { if (controlState == CONTROL_ON) { ControlOff(); return true; @@ -219,7 +219,7 @@ bool GetControl(void) { return false; } -bool ControlIsOn(void) { +bool ControlIsOn() { if (TinselV2) return (controlState == CONTROL_ON); @@ -484,14 +484,14 @@ void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds) { /** * For ESCapable Glitter sequences */ -int GetEscEvents(void) { +int GetEscEvents() { return escEvents; } /** * For cutting short talk()s etc. */ -int GetLeftEvents(void) { +int GetLeftEvents() { return leftEvents; } @@ -506,15 +506,15 @@ bool LeftEventChange(int myleftEvent) { /** * For waitkey() Glitter function */ -int getUserEvents(void) { +int getUserEvents() { return userEvents; } -uint32 getUserEventTime(void) { +uint32 getUserEventTime() { return DwGetCurrentTime() - lastUserEvent; } -void resetUserEventTime(void) { +void resetUserEventTime() { lastUserEvent = DwGetCurrentTime(); } @@ -653,14 +653,14 @@ void effRunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, int actor) { * If provisional event was processed, calling this prevents the * subsequent 'real' event. */ -void ProcessedProvisional(void) { +void ProcessedProvisional() { bProvNotProcessed = false; } /** * Resets the bProvNotProcessed flag */ -void ProvNotProcessed(void) { +void ProvNotProcessed() { bProvNotProcessed = true; } diff --git a/engines/tinsel/events.h b/engines/tinsel/events.h index 38fbb69715..c585365d4f 100644 --- a/engines/tinsel/events.h +++ b/engines/tinsel/events.h @@ -105,11 +105,11 @@ const TINSEL1_EVENT TINSEL1_EVENT_MAP[] = { void AllowDclick(CORO_PARAM, PLR_EVENT be); bool GetControl(int param); -bool GetControl(void); -bool ControlIsOn(void); -void ControlOn(void); -void ControlOff(void); -void ControlStartOff(void); +bool GetControl(); +bool ControlIsOn(); +void ControlOn(); +void ControlOff(); +void ControlStartOff(); void RunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, PLR_EVENT be, bool tc); void effRunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, int actor); @@ -118,16 +118,16 @@ void ProcessButEvent(PLR_EVENT be); void ProcessKeyEvent(PLR_EVENT ke); -int GetEscEvents(void); -int GetLeftEvents(void); +int GetEscEvents(); +int GetLeftEvents(); bool LeftEventChange(int myleftEvent); -int getUserEvents(void); +int getUserEvents(); -uint32 getUserEventTime(void); -void resetUserEventTime(void); +uint32 getUserEventTime(); +void resetUserEventTime(); -void ResetEcount(void); +void ResetEcount(); void PolygonEvent(CORO_PARAM, HPOLYGON hPoly, TINSEL_EVENT tEvent, int actor, bool bWait, int myEscape, bool *result = NULL); @@ -135,8 +135,8 @@ void PolygonEvent(CORO_PARAM, HPOLYGON hPoly, TINSEL_EVENT tEvent, int actor, bo void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds); -void ProcessedProvisional(void); -void ProvNotProcessed(void); +void ProcessedProvisional(); +void ProvNotProcessed(); bool GetProvNotProcessed(); } // End of namespace Tinsel diff --git a/engines/tinsel/faders.cpp b/engines/tinsel/faders.cpp index 1500a56c6d..de04e4a33e 100644 --- a/engines/tinsel/faders.cpp +++ b/engines/tinsel/faders.cpp @@ -234,7 +234,7 @@ void FadeInFast(SCNHANDLE noFadeTable[]) { Fader(fadein, noFadeTable); } -void PokeInTagColour(void) { +void PokeInTagColour() { if (SysVar(SV_TAGCOLOUR)) { static COLORREF c = GetActorRGB(-1); UpdateDACqueue(SysVar(SV_TAGCOLOUR), 1, &c); diff --git a/engines/tinsel/faders.h b/engines/tinsel/faders.h index b6993039c4..e77bff2661 100644 --- a/engines/tinsel/faders.h +++ b/engines/tinsel/faders.h @@ -50,7 +50,7 @@ void FadeOutMedium(SCNHANDLE noFadeTable[]); void FadeOutFast(SCNHANDLE noFadeTable[]); void FadeInMedium(SCNHANDLE noFadeTable[]); void FadeInFast(SCNHANDLE noFadeTable[]); -void PokeInTagColour(void); +void PokeInTagColour(); } // End of namespace Tinsel diff --git a/engines/tinsel/font.cpp b/engines/tinsel/font.cpp index 10427b6e3b..ae7da65473 100644 --- a/engines/tinsel/font.cpp +++ b/engines/tinsel/font.cpp @@ -85,7 +85,7 @@ void SetTempTalkFontHandle(SCNHANDLE hFont) { hTalkFont = hFont; } -void ResetFontHandles(void) { +void ResetFontHandles() { hTagFont = hRegularTagFont; hTalkFont = hRegularTalkFont; } diff --git a/engines/tinsel/font.h b/engines/tinsel/font.h index e6e202fe6f..e5f5ece201 100644 --- a/engines/tinsel/font.h +++ b/engines/tinsel/font.h @@ -35,11 +35,11 @@ namespace Tinsel { #define TBUFSZ 512 -char *TextBufferAddr(void); +char *TextBufferAddr(); -SCNHANDLE GetTagFontHandle(void); +SCNHANDLE GetTagFontHandle(); -SCNHANDLE GetTalkFontHandle(void); +SCNHANDLE GetTalkFontHandle(); void SetTagFontHandle(SCNHANDLE hFont); @@ -49,7 +49,7 @@ void SetTempTagFontHandle(SCNHANDLE hFont); void SetTempTalkFontHandle(SCNHANDLE hFont); -void ResetFontHandles(void); +void ResetFontHandles(); void FettleFontPal(SCNHANDLE fontPal); diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index 8c88608fa9..82d77a2904 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -93,7 +93,7 @@ static void LoadFile(MEMHANDLE *pH); // load a memory block as a file * Loads the graphics handle table index file and preloads all the * permanent graphics etc. */ -void SetupHandleTable(void) { +void SetupHandleTable() { bool t2Flag = (TinselVersion == TINSEL_V2); int RECORD_SIZE = t2Flag ? 24 : 20; @@ -174,7 +174,7 @@ void SetupHandleTable(void) { } } -void FreeHandleTable(void) { +void FreeHandleTable() { if (handleTable) { free(handleTable); handleTable = NULL; @@ -186,7 +186,7 @@ void FreeHandleTable(void) { /** * Loads a memory block as a file. */ -void OpenCDGraphFile(void) { +void OpenCDGraphFile() { if (cdGraphStream.isOpen()) cdGraphStream.close(); diff --git a/engines/tinsel/handle.h b/engines/tinsel/handle.h index 4665124e5a..c3c303a1e9 100644 --- a/engines/tinsel/handle.h +++ b/engines/tinsel/handle.h @@ -38,8 +38,8 @@ namespace Tinsel { /** * Loads the graphics handle table index file and preloads all the permanent graphics etc. */ -void SetupHandleTable(void); -void FreeHandleTable(void); +void SetupHandleTable(); +void FreeHandleTable(); byte *LockMem(SCNHANDLE offset); diff --git a/engines/tinsel/heapmem.cpp b/engines/tinsel/heapmem.cpp index 66a30d9b0b..fa05c3717b 100644 --- a/engines/tinsel/heapmem.cpp +++ b/engines/tinsel/heapmem.cpp @@ -70,7 +70,7 @@ MEM_NODE s_fixedMnodesList[5]; static MEM_NODE heapSentinel; // -static MEM_NODE *AllocMemNode(void); +static MEM_NODE *AllocMemNode(); #ifdef DEBUG static void MemoryStats() { @@ -155,7 +155,7 @@ void MemoryDeinit() { /** * Allocate a mnode from the free list. */ -static MEM_NODE *AllocMemNode(void) { +static MEM_NODE *AllocMemNode() { // get the first free mnode MEM_NODE *pMemNode = pFreeMemNodes; diff --git a/engines/tinsel/mareels.cpp b/engines/tinsel/mareels.cpp index e0419cc1ec..33e96ece58 100644 --- a/engines/tinsel/mareels.cpp +++ b/engines/tinsel/mareels.cpp @@ -169,7 +169,7 @@ SCNHANDLE ScalingReel(int ano, int scale1, int scale2, DIRECTION reel) { /** * RebootScalingReels */ -void RebootScalingReels(void) { +void RebootScalingReels() { scrEntries = 0; memset(SCIdata, 0, sizeof(SCIdata)); } @@ -177,7 +177,7 @@ void RebootScalingReels(void) { /** * Discourage them from being ditched. */ -void TouchMoverReels(void) { +void TouchMoverReels() { PMOVER pMover; int scale; diff --git a/engines/tinsel/mareels.h b/engines/tinsel/mareels.h index 8421fa2ff4..c31ceafbf4 100644 --- a/engines/tinsel/mareels.h +++ b/engines/tinsel/mareels.h @@ -47,9 +47,9 @@ void SetScalingReels(int actor, int scale, int direction, SCNHANDLE ScalingReel(int ano, int scale1, int scale2, DIRECTION reel); -void RebootScalingReels(void); +void RebootScalingReels(); -void TouchMoverReels(void); +void TouchMoverReels(); } // End of namespace Tinsel diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp index 84caa5082d..f854dba2fd 100644 --- a/engines/tinsel/move.cpp +++ b/engines/tinsel/move.cpp @@ -1709,11 +1709,11 @@ void SetDefaultRefer(int32 defRefer) { DefaultRefer = defRefer; } -int GetLastLeadXdest(void) { +int GetLastLeadXdest() { return lastLeadXdest; } -int GetLastLeadYdest(void) { +int GetLastLeadYdest() { return lastLeadYdest; } diff --git a/engines/tinsel/move.h b/engines/tinsel/move.h index 86100fae8e..027a89f67e 100644 --- a/engines/tinsel/move.h +++ b/engines/tinsel/move.h @@ -40,8 +40,8 @@ void SSetActorDest(MOVER *pActor); void DoMoveActor(MOVER *pMover); void SetDefaultRefer(int32 defRefer); -int GetLastLeadXdest(void); -int GetLastLeadYdest(void); +int GetLastLeadXdest(); +int GetLastLeadYdest(); DIRECTION GetDirection(int fromx, int fromy, int tox, int toy, DIRECTION lastreel, HPOLYGON hPath, YBIAS yBias = YB_X2); diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 568bbbd637..7bce8a3bd6 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -289,7 +289,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { /** * Returns TRUE if a Midi tune is currently playing. */ -bool MidiPlaying(void) { +bool MidiPlaying() { if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) { if (AudioCD.isPlaying()) return true; @@ -300,7 +300,7 @@ bool MidiPlaying(void) { /** * Stops any currently playing midi. */ -bool StopMidi(void) { +bool StopMidi() { currentMidi = 0; currentLoop = false; @@ -352,7 +352,7 @@ void SetMidiVolume(int vol) { /** * Opens and inits all MIDI sequence files. */ -void OpenMidiFiles(void) { +void OpenMidiFiles() { Common::File midiStream; // Demo version has no midi file diff --git a/engines/tinsel/music.h b/engines/tinsel/music.h index 1909430c32..069c03c979 100644 --- a/engines/tinsel/music.h +++ b/engines/tinsel/music.h @@ -40,9 +40,9 @@ bool PlayMidiSequence( // Plays the specified MIDI sequence through the sound d uint32 dwFileOffset, // handle of MIDI sequence data bool bLoop); // Whether to loop the sequence -bool MidiPlaying(void); // Returns TRUE if a Midi tune is currently playing +bool MidiPlaying(); // Returns TRUE if a Midi tune is currently playing -bool StopMidi(void); // Stops any currently playing midi +bool StopMidi(); // Stops any currently playing midi void SetMidiVolume( // Sets the volume of the MIDI music. Returns the old volume int vol); // new volume - 0..MAXMIDIVOL @@ -90,7 +90,7 @@ public: // The original sets the "sequence timing" to 109 Hz, whatever that // means. The default is 120. - uint32 getBaseTempo(void) { return _driver ? (109 * _driver->getBaseTempo()) / 120 : 0; } + uint32 getBaseTempo() { return _driver ? (109 * _driver->getBaseTempo()) / 120 : 0; } //Channel allocation functions MidiChannel *allocateChannel() { return 0; } diff --git a/engines/tinsel/object.cpp b/engines/tinsel/object.cpp index a308745743..9de8202795 100644 --- a/engines/tinsel/object.cpp +++ b/engines/tinsel/object.cpp @@ -48,7 +48,7 @@ static int numObj = 0; static int maxObj = 0; #endif -void FreeObjectList(void) { +void FreeObjectList() { if (objectList) { free(objectList); objectList = NULL; @@ -59,7 +59,7 @@ void FreeObjectList(void) { * Kills all objects and places them on the free list. */ -void KillAllObjects(void) { +void KillAllObjects() { int i; #ifdef DEBUG @@ -95,7 +95,7 @@ void KillAllObjects(void) { * Shows the maximum number of objects used at once. */ -void ObjectStats(void) { +void ObjectStats() { printf("%i objects of %i used.\n", maxObj, NUM_OBJECTS); } #endif @@ -103,7 +103,7 @@ void ObjectStats(void) { /** * Allocate a object from the free list. */ -OBJECT *AllocObject(void) { +OBJECT *AllocObject() { OBJECT *pObj = pFreeObjects; // get a free object // check for no free objects diff --git a/engines/tinsel/object.h b/engines/tinsel/object.h index 88854502e7..5725445b62 100644 --- a/engines/tinsel/object.h +++ b/engines/tinsel/object.h @@ -117,15 +117,15 @@ struct OBJ_INIT { |* Object Function Prototypes *| \*----------------------------------------------------------------------*/ -void KillAllObjects(void); // kill all objects and place them on free list +void KillAllObjects(); // kill all objects and place them on free list -void FreeObjectList(void); // free the object list +void FreeObjectList(); // free the object list #ifdef DEBUG -void ObjectStats(void); // Shows the maximum number of objects used at once +void ObjectStats(); // Shows the maximum number of objects used at once #endif -OBJECT *AllocObject(void); // allocate a object from the free list +OBJECT *AllocObject(); // allocate a object from the free list void FreeObject( // place a object back on the free list OBJECT *pFreeObj); // object to free diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp index a6e0a81406..1e139ccb3f 100644 --- a/engines/tinsel/palette.cpp +++ b/engines/tinsel/palette.cpp @@ -130,7 +130,7 @@ void psxPaletteMapper(PALQ *originalPal, uint8 *psxClut, byte *mapperTable) { /** * Transfer palettes in the palette Q to Video DAC. */ -void PalettesToVideoDAC(void) { +void PalettesToVideoDAC() { PALQ *pPalQ; // palette Q iterator VIDEO_DAC_Q *pDACtail = vidDACdata; // set tail pointer @@ -180,7 +180,7 @@ void PalettesToVideoDAC(void) { /** * Commpletely reset the palette allocator. */ -void ResetPalAllocator(void) { +void ResetPalAllocator() { #ifdef DEBUG // clear number of palettes in use numPals = 0; @@ -197,7 +197,7 @@ void ResetPalAllocator(void) { /** * Shows the maximum number of palettes used at once. */ -void PaletteStats(void) { +void PaletteStats() { printf("%i palettes of %i used.\n", maxPals, NUM_PALETTES); printf("%i DAC queue entries of %i used.\n", maxDACQ, VDACQLENGTH); } @@ -494,7 +494,7 @@ void FadingPalette(PPALQ pPalQ, bool bFading) { * All fading processes have just been killed, so none of the * palettes are fading. */ -void NoFadingPalettes(void) { +void NoFadingPalettes() { PPALQ pPalQ; for (pPalQ = palAllocData; pPalQ <= palAllocData + NUM_PALETTES - 1; pPalQ++) { @@ -614,11 +614,11 @@ void DimPartPalette(SCNHANDLE hDimPal, int startColour, int length, int brightne } } -int TranslucentColour(void) { +int TranslucentColour() { return translucentIndex; } -int HighlightColour(void) { +int HighlightColour() { static COLORREF cRef; cRef = (COLORREF)SysVar(SYS_HighlightRGB); @@ -627,7 +627,7 @@ int HighlightColour(void) { return talkIndex; } -int TalkColour(void) { +int TalkColour() { return TinselV2 ? talkIndex : TALKFONT_COL; } @@ -635,7 +635,7 @@ void SetTalkColourRef(COLORREF colRef) { talkColRef = colRef; } -COLORREF GetTalkColourRef(void) { +COLORREF GetTalkColourRef() { return talkColRef; } @@ -643,7 +643,7 @@ void SetTagColorRef(COLORREF colRef) { tagColRef = colRef; } -COLORREF GetTagColorRef(void) { +COLORREF GetTagColorRef() { return tagColRef; } diff --git a/engines/tinsel/palette.h b/engines/tinsel/palette.h index 1fb34a0782..e4cee3e301 100644 --- a/engines/tinsel/palette.h +++ b/engines/tinsel/palette.h @@ -103,15 +103,15 @@ typedef PALQ *PPALQ; |* Palette Manager Function Prototypes *| \*----------------------------------------------------------------------*/ -void ResetPalAllocator(void); // wipe out all palettes +void ResetPalAllocator(); // wipe out all palettes #ifdef DEBUG -void PaletteStats(void); // Shows the maximum number of palettes used at once +void PaletteStats(); // Shows the maximum number of palettes used at once #endif void psxPaletteMapper(PALQ *originalPal, uint8 *psxClut, byte *mapperTable); // Maps PSX CLUTs to original palette in resource file -void PalettesToVideoDAC(void); // Update the video DAC with palettes currently the the DAC queue +void PalettesToVideoDAC(); // Update the video DAC with palettes currently the the DAC queue void UpdateDACqueueHandle( int posInDAC, // position in video DAC @@ -139,7 +139,7 @@ void SwapPalette( // swaps palettes at the specified palette queue position PALQ *GetNextPalette( // returns the next palette in the queue PALQ *pStrtPal); // queue position to start from - when NULL will start from beginning of queue -COLORREF GetBgndColour(void); // returns current background colour +COLORREF GetBgndColour(); // returns current background colour void SetBgndColour( // sets current background colour COLORREF colour); // colour to set the background to @@ -150,7 +150,7 @@ void CreateTranslucentPalette(SCNHANDLE BackPal); void CreateGhostPalette(SCNHANDLE hPalette); -void NoFadingPalettes(void); // All fading processes have just been killed +void NoFadingPalettes(); // All fading processes have just been killed void DimPartPalette( SCNHANDLE hPal, @@ -159,21 +159,21 @@ void DimPartPalette( int brightness); // 0 = black, 10 == 100% -int TranslucentColour(void); +int TranslucentColour(); #define BoxColour TranslucentColour -int HighlightColour(void); +int HighlightColour(); -int TalkColour(void); +int TalkColour(); void SetTalkColourRef(COLORREF colRef); -COLORREF GetTalkColourRef(void); +COLORREF GetTalkColourRef(); void SetTagColorRef(COLORREF colRef); -COLORREF GetTagColorRef(void); +COLORREF GetTagColorRef(); void SetTalkTextOffset(int offset); diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp index aa8d4c1442..29f1753249 100644 --- a/engines/tinsel/pcode.cpp +++ b/engines/tinsel/pcode.cpp @@ -279,7 +279,7 @@ void FreeInterpretContextPr(PROCESS *pProc) { /** * Free all interpret contexts except for the master script's */ -void FreeMostInterpretContexts(void) { +void FreeMostInterpretContexts() { INT_CONTEXT *pic; int i; @@ -294,7 +294,7 @@ void FreeMostInterpretContexts(void) { /** * Free the master script's interpret context. */ -void FreeMasterInterpretContext(void) { +void FreeMasterInterpretContext() { INT_CONTEXT *pic; int i; @@ -413,7 +413,7 @@ void RegisterGlobals(int num) { } } -void FreeGlobals(void) { +void FreeGlobals() { free(pGlobals); pGlobals = NULL; @@ -807,7 +807,7 @@ void AttachInterpret(INT_CONTEXT *pic, PROCESS *pProc) { /** * Generate a number that isn't being used. */ -static uint32 UniqueWaitNumber(void) { +static uint32 UniqueWaitNumber() { uint32 retval; int i; @@ -885,7 +885,7 @@ void WaitInterpret(CORO_PARAM, PPROCESS pWaitProc, bool *result) { /** * CheckOutWaiters */ -void CheckOutWaiters(void) { +void CheckOutWaiters() { int i, j; // Check all waited for have someone waiting diff --git a/engines/tinsel/pcode.h b/engines/tinsel/pcode.h index 81feb5c241..e01727ee35 100644 --- a/engines/tinsel/pcode.h +++ b/engines/tinsel/pcode.h @@ -118,13 +118,13 @@ INT_CONTEXT *InitInterpretContext( INT_CONTEXT *RestoreInterpretContext(INT_CONTEXT *ric); -void FreeMostInterpretContexts(void); -void FreeMasterInterpretContext(void); +void FreeMostInterpretContexts(); +void FreeMasterInterpretContext(); void SaveInterpretContexts(INT_CONTEXT *sICInfo); void RegisterGlobals(int num); -void FreeGlobals(void); +void FreeGlobals(); void AttachInterpret(INT_CONTEXT *pic, PROCESS *pProc); diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp index 25e3ec0a5e..7a092f25f7 100644 --- a/engines/tinsel/pdisplay.cpp +++ b/engines/tinsel/pdisplay.cpp @@ -288,7 +288,7 @@ void DisablePointing(CORO_PARAM) { /** * EnablePointing() */ -void EnablePointing(void) { +void EnablePointing() { bPointingActive = true; } @@ -304,7 +304,7 @@ static void SaveTaggedActor(int ano) { * Tag process keeps us updated as to which tagged actor is currently tagged * (if one is). Tag process asks us for this information, as does ProcessUserEvent(). */ -int GetTaggedActor(void) { +int GetTaggedActor() { return TaggedActor; } @@ -316,7 +316,7 @@ static void SaveTaggedPoly(HPOLYGON hp) { hTaggedPolygon = hp; } -HPOLYGON GetTaggedPoly(void) { +HPOLYGON GetTaggedPoly() { return hTaggedPolygon; } @@ -817,15 +817,15 @@ void PointProcess(CORO_PARAM, const void *) { CORO_END_CODE; } -void DisableTags(void) { +void DisableTags() { bTagsActive = false; } -void EnableTags(void) { +void EnableTags() { bTagsActive = true; } -bool DisableTagsIfEnabled(void) { +bool DisableTagsIfEnabled() { if (bTagsActive) { DisableTags(); return true; @@ -838,12 +838,12 @@ bool DisableTagsIfEnabled(void) { * Causes CursorPositionProcess() to display, or not, the path that the * cursor is in. */ -void TogglePathDisplay(void) { +void TogglePathDisplay() { DispPath ^= 1; // Toggle path display (XOR with true) } -void setshowstring(void) { +void setshowstring() { bShowString = true; } diff --git a/engines/tinsel/pdisplay.h b/engines/tinsel/pdisplay.h index d2efc23f96..f720da639d 100644 --- a/engines/tinsel/pdisplay.h +++ b/engines/tinsel/pdisplay.h @@ -29,8 +29,8 @@ namespace Tinsel { -void EnableTags(void); -void DisableTags(void); +void EnableTags(); +void DisableTags(); } // End of namespace Tinsel diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp index ae40c11ae9..54281c9d7a 100644 --- a/engines/tinsel/play.cpp +++ b/engines/tinsel/play.cpp @@ -164,7 +164,7 @@ static int RegisterSoundReel(SCNHANDLE hFilm, int column, int actorCol) { return i; } -void NoSoundReels(void) { +void NoSoundReels() { memset(soundReels, 0, sizeof(soundReels)); soundReelWait = 0; } @@ -393,7 +393,7 @@ static void ResSoundReel(CORO_PARAM, const void *) { CORO_END_CODE; } -static void SoundReelWaitCheck(void) { +static void SoundReelWaitCheck() { if (--soundReelWait == 0) { for (int i = 0; i < MAX_SOUNDREELS; i++) { if (soundReels[i].hFilm) { diff --git a/engines/tinsel/play.h b/engines/tinsel/play.h index aa622e835e..2e981b1e2e 100644 --- a/engines/tinsel/play.h +++ b/engines/tinsel/play.h @@ -55,7 +55,7 @@ void RestoreActorReels(SCNHANDLE hFilm, int actor, int x, int y); void PokeInPalette(const MULTI_INIT *pmi); -void NoSoundReels(void); +void NoSoundReels(); void SaveSoundReels(PSOUNDREELS psr); void RestoreSoundReels(PSOUNDREELS psr); diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp index 36723b3265..7fc7fcd218 100644 --- a/engines/tinsel/polygons.cpp +++ b/engines/tinsel/polygons.cpp @@ -1169,7 +1169,7 @@ static int currentEScene = 0; bool deadPolys[MAX_POLY]; // Currently just for dead blocks -void RebootDeadTags(void) { +void RebootDeadTags() { nextfreeT = numScenesT = 0; nextfreeE = numScenesE = 0; @@ -1258,7 +1258,7 @@ static HPOLYGON FindPolygon(PTYPE type, int id) { return NOPOLY; } -HPOLYGON FirstPathPoly(void) { +HPOLYGON FirstPathPoly() { for (int i = 0; i < noofPolys; i++) { if (Polys[i]->polyType == PATH) return i; @@ -1745,7 +1745,7 @@ static void InitTag(const Poly &ptp, int pno, bool bRestart) { /** * Called at the restart of a scene, nobbles polygons which are dead. */ -static void KillDeadPolygons(void) { +static void KillDeadPolygons() { int i; for (i = 0; i < MAX_POLY; i++) { @@ -2072,7 +2072,7 @@ void GetPolyMidBottom( HPOLYGON hp, int *pX, int *pY) { *pX = (Polys[hp]->pleft + Polys[hp]->pright)/2 + volatileStuff[hp].xoff; } -int PathCount(void) { +int PathCount() { int i, count; for (i = 0, count = 0; i < noofPolys; i++) { diff --git a/engines/tinsel/polygons.h b/engines/tinsel/polygons.h index 23beb76d6c..4be1dabf98 100644 --- a/engines/tinsel/polygons.h +++ b/engines/tinsel/polygons.h @@ -98,7 +98,7 @@ SCNHANDLE GetPolyScript(HPOLYGON p); REEL GetPolyReelType(HPOLYGON p); int32 GetPolyZfactor(HPOLYGON p); int numNodes(HPOLYGON pp); -void RebootDeadTags(void); +void RebootDeadTags(); void DisableBlock(int block); void EnableBlock(int block); void DisableEffect(int effect); @@ -112,10 +112,10 @@ void DisableTag(CORO_PARAM, int tag); void EnableTag(CORO_PARAM, int tag); void DisableExit(int exitno); void EnableExit(int exitno); -HPOLYGON FirstPathPoly(void); +HPOLYGON FirstPathPoly(); HPOLYGON GetPolyHandle(int i); void InitPolygons(SCNHANDLE ph, int numPoly, bool bRestart); -void DropPolygons(void); +void DropPolygons(); void SaveDeadPolys(bool *sdp); @@ -150,7 +150,7 @@ bool PolyTagFollowsCursor(HPOLYGON hp); SCNHANDLE GetPolyTagHandle(HPOLYGON hp); bool IsTagPolygon(int tagno); void GetPolyMidBottom(HPOLYGON hp, int *pX, int *pY); -int PathCount(void); +int PathCount(); void MovePolygon(PTYPE ptype, int id, int x, int y); void MovePolygonTo(PTYPE ptype, int id, int x, int y); diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp index 21cbb76127..cfffe88587 100644 --- a/engines/tinsel/rince.cpp +++ b/engines/tinsel/rince.cpp @@ -116,7 +116,7 @@ void MoverBrightness(PMOVER pMover, int brightness) { /** * RebootMovers */ -void RebootMovers(void) { +void RebootMovers() { memset(Movers, 0, sizeof(Movers)); } @@ -392,7 +392,7 @@ static void InitMover(PMOVER pMover) { * Get it into our heads that there's nothing doing. * Called at the end of a scene. */ -void DropMovers(void) { +void DropMovers() { for (int i = 0; i < MAX_MOVERS; i++) InitMover(&Movers[i]); } diff --git a/engines/tinsel/rince.h b/engines/tinsel/rince.h index aa6f16d795..57eac00fa4 100644 --- a/engines/tinsel/rince.h +++ b/engines/tinsel/rince.h @@ -161,7 +161,7 @@ bool MoverIsSWalking(PMOVER pMover); bool MoverMoving(PMOVER pMover); int GetWalkNumber(PMOVER pMover); void UnHideMover(PMOVER pMover); -void DropMovers(void); +void DropMovers(); void PositionMover(PMOVER pMover, int x, int y); void GetMoverPosition(PMOVER pMover, int *aniX, int *aniY); @@ -181,7 +181,7 @@ void SetMoverWalkReel(PMOVER pMover, DIRECTION reel, int scale, bool force); PMOVER InMoverBlock(PMOVER pMover, int x, int y); -void RebootMovers(void); +void RebootMovers(); bool IsMAinEffectPoly(int index); void SetMoverInEffect(int index, bool tf); diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp index e265c434ef..0e529cb3cc 100644 --- a/engines/tinsel/saveload.cpp +++ b/engines/tinsel/saveload.cpp @@ -78,7 +78,7 @@ SRSTATE SRstate = SR_IDLE; extern void syncSCdata(Common::Serializer &s); // in DOS_MAIN.C -//char HardDriveLetter(void); +//char HardDriveLetter(); // in PCODE.C extern void syncGlobInfo(Common::Serializer &s); @@ -273,7 +273,7 @@ static void syncSavedData(Common::Serializer &s, SAVED_DATA &sd) { * Called when saving a game to a new file. * Generates a new, unique, filename. */ -static char *NewName(void) { +static char *NewName() { static char result[FNAMELEN]; int i; int ano = 1; // Allocated number @@ -379,7 +379,7 @@ int getList(Common::SaveFileManager *saveFileMan, const Common::String &target) return numSfiles; } -int getList(void) { +int getList() { // No change since last call? // TODO/FIXME: Just always reload this data? Be careful about slow downs!!! if (!NeedLoad) @@ -482,7 +482,7 @@ static bool DoRestore() { /** * DoSave */ -static void DoSave(void) { +static void DoSave() { Common::OutSaveFile *f; const char *fname; @@ -537,7 +537,7 @@ save_failure: /** * ProcessSRQueue */ -void ProcessSRQueue(void) { +void ProcessSRQueue() { switch (SRstate) { case SR_DORESTORE: // If a load has been done directly from title screens, set a larger value for scene ctr so the @@ -594,7 +594,7 @@ void RequestRestoreGame(int num, SAVED_DATA *sd, int *pSsCount, SAVED_DATA *pSsD * Returns the index of the most recently saved savegame. This will always be * the file at the first index, since the list is sorted by date/time */ -int NewestSavedGame(void) { +int NewestSavedGame() { int numFiles = getList(); return (numFiles == 0) ? -1 : 0; diff --git a/engines/tinsel/savescn.cpp b/engines/tinsel/savescn.cpp index ed845c59f7..cbbfe8572a 100644 --- a/engines/tinsel/savescn.cpp +++ b/engines/tinsel/savescn.cpp @@ -53,7 +53,7 @@ namespace Tinsel { //----------------- EXTERN FUNCTIONS -------------------- // in BG.C -extern SCNHANDLE GetBgroundHandle(void); +extern SCNHANDLE GetBgroundHandle(); extern void SetDoFadeIn(bool tf); // In DOS_DW.C @@ -63,7 +63,7 @@ void RestoreMasterProcess(INT_CONTEXT *pic); void RestoreProcess(INT_CONTEXT *pic); // in SCENE.C -extern SCNHANDLE GetSceneHandle(void); +extern SCNHANDLE GetSceneHandle(); //----------------- LOCAL DEFINES -------------------- @@ -149,7 +149,7 @@ void DoRestoreScene(SAVED_DATA *sd, bool bFadeOut) { RestoreSceneCount = RS_COUNT; // Set restore scene count } -void InitialiseSaveScenes(void) { +void InitialiseSaveScenes() { if (ssData == NULL) { ssData = (SAVED_DATA *)calloc(MAX_NEST, sizeof(SAVED_DATA)); if (ssData == NULL) { @@ -161,7 +161,7 @@ void InitialiseSaveScenes(void) { } } -void FreeSaveScenes(void) { +void FreeSaveScenes() { if (ssData) { free(ssData); ssData = NULL; @@ -243,7 +243,7 @@ static void SortMAProcess(CORO_PARAM, const void *) { //--------------------------------------------------------------------------- -void ResumeInterprets(void) { +void ResumeInterprets() { // Master script only affected on restore game, not restore scene if (!TinselV2 && (rsd == &sgData)) { g_scheduler->killMatchingProcess(PID_MASTER_SCR, -1); diff --git a/engines/tinsel/savescn.h b/engines/tinsel/savescn.h index 21e7dd032b..f0927baae3 100644 --- a/engines/tinsel/savescn.h +++ b/engines/tinsel/savescn.h @@ -98,19 +98,19 @@ enum letype{ }; char *ListEntry(int i, letype which); -int getList(void); -void setNeedLoad(void); +int getList(); +void setNeedLoad(); void RestoreGame(int num); void SaveGame(char *name, char *desc); -void ProcessSRQueue(void); +void ProcessSRQueue(); void RequestSaveGame(char *name, char *desc, SAVED_DATA *sd, int *ssCount, SAVED_DATA *ssData); void RequestRestoreGame(int num, SAVED_DATA *sd, int *ssCount, SAVED_DATA *ssData); -void InitialiseSaveScenes(void); -void FreeSaveScenes(void); +void InitialiseSaveScenes(); +void FreeSaveScenes(); } // End of namespace Tinsel diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp index 2e35ec10c5..33d4e67d70 100644 --- a/engines/tinsel/scene.cpp +++ b/engines/tinsel/scene.cpp @@ -57,7 +57,7 @@ namespace Tinsel { //----------------- EXTERNAL FUNCTIONS --------------------- // in BG.C -extern void DropBackground(void); +extern void DropBackground(); // in EFFECT.C extern void EffectPolyProcess(CORO_PARAM, const void *); @@ -68,7 +68,7 @@ extern void CursorPositionProcess(CORO_PARAM, const void *); #endif extern void TagProcess(CORO_PARAM, const void *); extern void PointProcess(CORO_PARAM, const void *); -extern void EnableTags(void); +extern void EnableTags(); //----------------- LOCAL DEFINES -------------------- @@ -322,7 +322,7 @@ static void LoadScene(SCNHANDLE scene, int entry) { /** * Wrap up the last scene. */ -void EndScene(void) { +void EndScene() { if (SceneHandle != 0) { UnlockScene(SceneHandle); SceneHandle = 0; @@ -366,7 +366,7 @@ void EndScene(void) { /** * */ -void PrimeBackground(void) { +void PrimeBackground() { // structure for playfields static PLAYFIELD playfield[] = { { // FIELD WORLD @@ -409,7 +409,7 @@ void PrimeBackground(void) { * Start up the standard stuff for the next scene. */ -void PrimeScene(void) { +void PrimeScene() { SetNoBlocking(false); SetSysVar(SYS_SceneFxDimFactor, SysVar(SYS_DefaultFxDimFactor)); @@ -456,7 +456,7 @@ void StartNewScene(SCNHANDLE scene, int entry) { * created in each scene. */ -void setshowpos(void) { +void setshowpos() { ShowPosition = true; } #endif @@ -465,7 +465,7 @@ void setshowpos(void) { * Return the current scene handle. */ -SCNHANDLE GetSceneHandle(void) { +SCNHANDLE GetSceneHandle() { return SceneHandle; } @@ -490,7 +490,7 @@ void DoHailScene(SCNHANDLE scene) { /** * WrapScene */ -void WrapScene(void) { +void WrapScene() { SendSceneTinselProcess(CLOSEDOWN); } diff --git a/engines/tinsel/scene.h b/engines/tinsel/scene.h index 4b0029fb5f..e17a6ab7a0 100644 --- a/engines/tinsel/scene.h +++ b/engines/tinsel/scene.h @@ -84,11 +84,11 @@ typedef enum { TRANS_DEF, TRANS_CUT, TRANS_FADE } TRANSITS; void DoHailScene(SCNHANDLE scene); -void WrapScene(void); +void WrapScene(); void StartNewScene(SCNHANDLE scene, int entry); -void EndScene(void); +void EndScene(); void SendSceneTinselProcess(TINSEL_EVENT event); diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp index d39d01117b..c081ff68f0 100644 --- a/engines/tinsel/sched.cpp +++ b/engines/tinsel/sched.cpp @@ -125,7 +125,7 @@ void Scheduler::reset() { /** * Shows the maximum number of process used at once. */ -void Scheduler::printStats(void) { +void Scheduler::printStats() { printf("%i process of %i used.\n", maxProcs, NUM_PROCESS); } #endif @@ -172,7 +172,7 @@ void Scheduler::CheckStack() { /** * Give all active processes a chance to run */ -void Scheduler::schedule(void) { +void Scheduler::schedule() { // start dispatching active process list PROCESS *pNext; PROCESS *pProc = active->pNext; @@ -413,7 +413,7 @@ void Scheduler::killProcess(PROCESS *pKillProc) { /** * Returns a pointer to the currently running process. */ -PROCESS *Scheduler::getCurrentProcess(void) { +PROCESS *Scheduler::getCurrentProcess() { return pCurrent; } @@ -669,7 +669,7 @@ void RestoreGlobalProcess(INT_CONTEXT *pic) { /** * Kill them all (restore game). */ -void KillGlobalProcesses(void) { +void KillGlobalProcesses() { for (uint32 i = 0; i < numGlobalProcess; ++i) { g_scheduler->killMatchingProcess(PID_GPROCESS + i, -1); diff --git a/engines/tinsel/sched.h b/engines/tinsel/sched.h index 8c71127cc9..bfeaa8750a 100644 --- a/engines/tinsel/sched.h +++ b/engines/tinsel/sched.h @@ -140,7 +140,7 @@ void xCallGlobalProcess(uint32 procID); void xKillGlobalProcess(uint32 procID); bool GlobalProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWait, int myEscape); void RestoreGlobalProcess(INT_CONTEXT *pic); -void KillGlobalProcesses(void); +void KillGlobalProcesses(); void FreeGlobalProcesses(); } // End of namespace Tinsel diff --git a/engines/tinsel/scroll.cpp b/engines/tinsel/scroll.cpp index 65980c061b..47c61a897e 100644 --- a/engines/tinsel/scroll.cpp +++ b/engines/tinsel/scroll.cpp @@ -90,14 +90,14 @@ static int scrollPixelsY = SCROLLPIXELS; /** * Reset the ScrollCursor flag */ -void DontScrollCursor(void) { +void DontScrollCursor() { ScrollCursor = false; } /** * Set the ScrollCursor flag */ -void DoScrollCursor(void) { +void DoScrollCursor() { ScrollCursor = true; } @@ -238,7 +238,7 @@ static void NeedScroll(int direction) { /** * Called from scroll process - Scrolls the image as appropriate. */ -static void ScrollImage(void) { +static void ScrollImage() { int OldLoffset = 0, OldToffset = 0; // Used when keeping cursor on a tag int Loffset, Toffset; int curX, curY; @@ -338,7 +338,7 @@ static void ScrollImage(void) { * See if the actor on whom the camera is is approaching an edge. * Request a scroll if he is. */ -static void MonitorScroll(void) { +static void MonitorScroll() { int newx, newy; int Loffset, Toffset; @@ -381,7 +381,7 @@ static void MonitorScroll(void) { oldy = newy; } -static void RestoreScrollDefaults(void) { +static void RestoreScrollDefaults() { sd.xTrigger = SysVar(SV_SCROLL_XTRIGGER); sd.xDistance = SysVar(SV_SCROLL_XDISTANCE); sd.xSpeed = SysVar(SV_SCROLL_XSPEED); @@ -394,7 +394,7 @@ static void RestoreScrollDefaults(void) { /** * Does the obvious - called at the end of a scene. */ -void DropScroll(void) { +void DropScroll() { sd.NumNoH = sd.NumNoV = 0; if (TinselV2) { LeftScroll = DownScroll = 0; // No iterations outstanding @@ -465,7 +465,7 @@ void ScrollFocus(int ano) { /** * Returns the actor which the camera is following */ -int GetScrollFocus(void) { +int GetScrollFocus() { return scrollActor; } @@ -488,7 +488,7 @@ void ScrollTo(int x, int y, int xIter, int yIter) { /** * Kill of any current scroll. */ -void KillScroll(void) { +void KillScroll() { LeftScroll = DownScroll = 0; } @@ -528,7 +528,7 @@ void SetScrollParameters(int xTrigger, int xDistance, int xSpeed, int yTriggerTo } } -bool IsScrolling(void) { +bool IsScrolling() { return (LeftScroll || DownScroll); } diff --git a/engines/tinsel/scroll.h b/engines/tinsel/scroll.h index 2c5f52d9ec..438b049069 100644 --- a/engines/tinsel/scroll.h +++ b/engines/tinsel/scroll.h @@ -65,19 +65,19 @@ struct SCROLLDATA{ }; -void DontScrollCursor(void); -void DoScrollCursor(void); +void DontScrollCursor(); +void DoScrollCursor(); void SetNoScroll(int x1, int y1, int x2, int y2); -void DropScroll(void); +void DropScroll(); void ScrollProcess(CORO_PARAM, const void *); void ScrollFocus(int actor); -int GetScrollFocus(void); +int GetScrollFocus(); void ScrollTo(int x, int y, int xIter, int yIter); -void KillScroll(void); +void KillScroll(); void GetNoScrollData(SCROLLDATA *ssd); void RestoreNoScrollData(SCROLLDATA *ssd); @@ -85,7 +85,7 @@ void RestoreNoScrollData(SCROLLDATA *ssd); void SetScrollParameters(int xTrigger, int xDistance, int xSpeed, int yTriggerTop, int yTriggerBottom, int yDistance, int ySpeed); -bool IsScrolling(void); +bool IsScrolling(); } // End of namespace Tinsel diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 264a9e403e..457b9b54b0 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -422,7 +422,7 @@ bool SoundManager::sampleIsPlaying(int id) { /** * Stops any currently playing sample. */ -void SoundManager::stopAllSamples(void) { +void SoundManager::stopAllSamples() { // stop currently playing sample if (!TinselV2) { @@ -460,7 +460,7 @@ void SoundManager::setSFXVolumes(uint8 volume) { /** * Opens and inits all sound sample files. */ -void SoundManager::openSampleFiles(void) { +void SoundManager::openSampleFiles() { // Floppy and demo versions have no sample files if (_vm->getFeatures() & GF_FLOPPY || _vm->getFeatures() & GF_DEMO) return; @@ -558,7 +558,7 @@ void SoundManager::openSampleFiles(void) { */ } -void SoundManager::closeSampleStream(void) { +void SoundManager::closeSampleStream() { _sampleStream.close(); free(_sampleIndex); _sampleIndex = 0; diff --git a/engines/tinsel/sound.h b/engines/tinsel/sound.h index 4f37108949..36c5af1891 100644 --- a/engines/tinsel/sound.h +++ b/engines/tinsel/sound.h @@ -112,7 +112,7 @@ public: bool playSample(int id, int sub, bool bLooped, int x, int y, int priority, Audio::Mixer::SoundType type, Audio::SoundHandle *handle = 0); - void stopAllSamples(void); // Stops any currently playing sample + void stopAllSamples(); // Stops any currently playing sample void stopSpecSample(int id, int sub = 0); // Stops a specific sample void setSFXVolumes(uint8 volume); @@ -121,8 +121,8 @@ public: bool sampleIsPlaying(int id = -1); // TODO: Internal method, make this protected? - void openSampleFiles(void); - void closeSampleStream(void); + void openSampleFiles(); + void closeSampleStream(); }; } // End of namespace Tinsel diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp index 50eeda4d00..570c30d84c 100644 --- a/engines/tinsel/strres.cpp +++ b/engines/tinsel/strres.cpp @@ -375,18 +375,18 @@ void LanguageFacts(int language, SCNHANDLE hDescription, SCNHANDLE hFlagFilm) { /** * Gets the current subtitles language */ -LANGUAGE TextLanguage(void) { +LANGUAGE TextLanguage() { return textLanguage; } /** * Gets the current voice language */ -LANGUAGE SampleLanguage(void) { +LANGUAGE SampleLanguage() { return sampleLanguage; } -int NumberOfLanguages(void) { +int NumberOfLanguages() { int i, count; for (i = 0, count = 0; i < NUM_LANGUAGES; i++) { diff --git a/engines/tinsel/strres.h b/engines/tinsel/strres.h index baaa498a82..497259584c 100644 --- a/engines/tinsel/strres.h +++ b/engines/tinsel/strres.h @@ -83,14 +83,14 @@ void LanguageFacts(int language, SCNHANDLE hDescription, SCNHANDLE hFlagFilm); /** * Gets the current subtitles language */ -LANGUAGE TextLanguage(void); +LANGUAGE TextLanguage(); /** * Gets the current voice language */ -LANGUAGE SampleLanguage(void); +LANGUAGE SampleLanguage(); -int NumberOfLanguages(void); +int NumberOfLanguages(); LANGUAGE NextLanguage(LANGUAGE thisOne); LANGUAGE PrevLanguage(LANGUAGE thisOne); SCNHANDLE LanguageDesc(LANGUAGE thisOne); diff --git a/engines/tinsel/sysvar.cpp b/engines/tinsel/sysvar.cpp index 41437c069b..a83116433e 100644 --- a/engines/tinsel/sysvar.cpp +++ b/engines/tinsel/sysvar.cpp @@ -38,7 +38,7 @@ typedef enum { DOS_PC, WIN_PC, APPLE_MAC, SONY_PSX, SEGA_SATURN } platform; //----------------- GLOBAL GLOBAL DATA -------------------- -extern int NewestSavedGame(void); +extern int NewestSavedGame(); //----------------- LOCAL GLOBAL DATA -------------------- @@ -194,7 +194,7 @@ SCNHANDLE SysString(int number) { * Gets the no blocking flag. Note that for convenience, the systemVars array * entry is used even for Tinsel 1, which originally used a separate variable. */ -bool GetNoBlocking(void) { +bool GetNoBlocking() { return SysVar(ISV_NO_BLOCKING); } diff --git a/engines/tinsel/sysvar.h b/engines/tinsel/sysvar.h index 0cb830ec91..e407e6ffa3 100644 --- a/engines/tinsel/sysvar.h +++ b/engines/tinsel/sysvar.h @@ -140,7 +140,7 @@ void SetSysString(int number, SCNHANDLE hString); SCNHANDLE SysString(int number); -bool GetNoBlocking(void); +bool GetNoBlocking(); void SetNoBlocking(bool flag); diff --git a/engines/tinsel/timers.cpp b/engines/tinsel/timers.cpp index 8ac715a52b..9c7f709608 100644 --- a/engines/tinsel/timers.cpp +++ b/engines/tinsel/timers.cpp @@ -74,7 +74,7 @@ uint32 DwGetCurrentTime() { * Resets all of the timer slots */ -void RebootTimers(void) { +void RebootTimers() { memset(timers, 0, sizeof(timers)); } @@ -124,7 +124,7 @@ static TIMER *allocateTimer(int num) { /** * Update all timers, as appropriate. */ -void FettleTimers(void) { +void FettleTimers() { for (int i = 0; i < MAX_TIMERS; i++) { if (!timers[i].tno) continue; diff --git a/engines/tinsel/timers.h b/engines/tinsel/timers.h index 5437890790..022604b662 100644 --- a/engines/tinsel/timers.h +++ b/engines/tinsel/timers.h @@ -38,13 +38,13 @@ namespace Tinsel { #define ONE_SECOND 24 -uint32 DwGetCurrentTime(void); +uint32 DwGetCurrentTime(); -void RebootTimers(void); +void RebootTimers(); void syncTimerInfo(Common::Serializer &s); -void FettleTimers(void); +void FettleTimers(); void StartTimer(int num, int sval, bool up, bool frame); diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index ff9a65c2a3..e4711c97e8 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -92,32 +92,32 @@ int clRunMode = 0; extern void ChangePalette(SCNHANDLE hPal); // in PDISPLAY.CPP -extern void EnableTags(void); -extern void DisableTags(void); -bool DisableTagsIfEnabled(void); -extern void setshowstring(void); +extern void EnableTags(); +extern void DisableTags(); +bool DisableTagsIfEnabled(); +extern void setshowstring(); // in SAVELOAD.CPP -extern int NewestSavedGame(void); +extern int NewestSavedGame(); // in SCENE.CPP -extern void setshowpos(void); +extern void setshowpos(); extern int sceneCtr; // in TINSEL.CPP extern void SetCdChangeScene(SCNHANDLE hScene); extern void SetHookScene(SCNHANDLE scene, int entrance, int transition); extern void SetNewScene(SCNHANDLE scene, int entrance, int transition); -extern void UnHookScene(void); -extern void SuspendHook(void); -extern void UnSuspendHook(void); +extern void UnHookScene(); +extern void SuspendHook(); +extern void UnSuspendHook(); #ifdef BODGE // In HANDLE.CPP bool ValidHandle(SCNHANDLE offset); // In SCENE.CPP -SCNHANDLE GetSceneHandle(void); +SCNHANDLE GetSceneHandle(); #endif //----------------- GLOBAL GLOBAL DATA -------------------- @@ -271,12 +271,12 @@ static COLORREF s_talkfontColor = 0; //----------------- FORWARD REFERENCES -------------------- -static int HeldObject(void); +static int HeldObject(); static void PostTag(CORO_PARAM, int tagno, TINSEL_EVENT event, HPOLYGON hp, int myEscape); -void ResetIdleTime(void); +void ResetIdleTime(); static void SendTag(CORO_PARAM, int tagno, TINSEL_EVENT event, HPOLYGON hp, int myEscape, bool *result); static void StandTag(int actor, HPOLYGON hp); -void StopMidiFn(void); +void StopMidiFn(); void StopSample(int sample = -1); static void StopWalk(int actor); static void WaitScroll(CORO_PARAM, int myescEvent); @@ -559,7 +559,7 @@ static int ActorPos(int xory, int actor) { /** * Make all actors alive at the start of each scene. */ -static void ActorsOn(void) { +static void ActorsOn() { setactorson(); } @@ -688,7 +688,7 @@ static void ClearHookScene() { /** * Guess what. */ -static void CloseInventory(void) { +static void CloseInventory() { KillInventory(); } @@ -1025,7 +1025,7 @@ static void DelTopic(int icon) { /** * DimMusic */ -static void DimMusic(void) { +static void DimMusic() { _vm->_pcmMusic->dim(true); } @@ -1045,7 +1045,7 @@ static void Drop(int object) { /** * Delete all objects from inventory 1 and 2. */ -static void DropEverything(void) { +static void DropEverything() { HoldItem(NOOBJECT, false); ClearInventory(INV_1); @@ -1055,7 +1055,7 @@ static void DropEverything(void) { /** * EnableMenu */ -static void EnableMenu(void) { +static void EnableMenu() { bEnableMenu = true; } @@ -1114,14 +1114,14 @@ static void FaceTag(int actor, HPOLYGON hp) { /** * FadeIn */ -static void FadeIn(void) { +static void FadeIn() { FadeInMedium(NULL); } /** * FadeOut */ -static void FadeOut(void) { +static void FadeOut() { FadeOutMedium(NULL); } @@ -1175,7 +1175,7 @@ static void HailScene(SCNHANDLE scene) { /** * Returns TRUE if the game has been restarted, FALSE if not. */ -static bool HasRestarted(void) { +static bool HasRestarted() { return bHasRestarted; } @@ -1189,7 +1189,7 @@ int Have(int object) { /** * Returns which object is currently held. */ -static int HeldObject(void) { +static int HeldObject() { return WhichItemHeld(); } @@ -1253,7 +1253,7 @@ void HookScene(SCNHANDLE scene, int entrance, int transition) { /** * IdleTime */ -static int IdleTime(void) { +static int IdleTime() { // If control is off, system is not idle if (!ControlIsOn()) { // Player doesn't currently have control @@ -1440,7 +1440,7 @@ void NewScene(CORO_PARAM, SCNHANDLE scene, int entrance, int transition) { /** * Disable dynamic blocking for current scene. */ -static void NoBlocking(void) { +static void NoBlocking() { SetNoBlocking(true); } @@ -2371,7 +2371,7 @@ static void PrintTag(HPOLYGON hp, SCNHANDLE text, int actor = 0, bool bCursor = /** * Quits the game */ -static void QuitGame(void) { +static void QuitGame() { StopMidi(); StopSample(); _vm->quitGame(); @@ -2398,14 +2398,14 @@ static int RandomFn(int n1, int n2, int norpt) { /** * ResetIdleTime */ -void ResetIdleTime(void) { +void ResetIdleTime() { resetUserEventTime(); } /** * FnRestartGame */ -void FnRestartGame(void) { +void FnRestartGame() { // TODO: Tinsel 2 comments out the 2 calls, but I'm not sure that this should be done StopMidi(); StopSample(); @@ -2444,14 +2444,14 @@ static void RestoreScene(CORO_PARAM, TRANSITS transition) { /** * Resumes the last game */ -void ResumeLastGame(void) { +void ResumeLastGame() { RestoreGame(NewestSavedGame()); } /** * Returns the current run mode */ -static int RunMode(void) { +static int RunMode() { return clRunMode; } @@ -2503,7 +2503,7 @@ static void ScalingReels(int actor, int scale, int direction, /** * Return the icon that caused the CONVERSE event. */ -static int ScanIcon(void) { +static int ScanIcon() { return GetIcon(); } @@ -2752,14 +2752,14 @@ void ShowEffect(int effect) { /** * Enable display of diagnostic co-ordinates. */ -static void showpos(void) { +static void showpos() { setshowpos(); } /** * Enable display of diagnostic co-ordinates. */ -static void showstring(void) { +static void showstring() { setshowstring(); } #endif @@ -2767,7 +2767,7 @@ static void showstring(void) { /** * Shows the main menu */ -static void ShowMenu(void) { +static void ShowMenu() { OpenMenu(MAIN_MENU); } @@ -2969,7 +2969,7 @@ static void StartTimerFn(int timerno, int start, bool up, int fs) { StartTimer(timerno, start, up, fs); } -void StopMidiFn(void) { +void StopMidiFn() { StopMidi(); // Stop any currently playing midi } @@ -3624,7 +3624,7 @@ static int TimerFn(int timerno) { /** * Return the icon that caused the CONVERSE event. */ -int Topic(void) { +int Topic() { return GetIcon(); } @@ -3681,14 +3681,14 @@ static void TryPlaySample(CORO_PARAM, int sample, bool bComplete, bool escOn, in /** * UnDimMusic */ -static void UnDimMusic(void) { +static void UnDimMusic() { _vm->_pcmMusic->unDim(true); } /** * unhookscene */ -static void UnHookSceneFn(void) { +static void UnHookSceneFn() { UnHookScene(); } @@ -3702,7 +3702,7 @@ static void UnTagActorFn(int actor) { /** * vibrate */ -static void Vibrate(void) { +static void Vibrate() { } /** @@ -4168,28 +4168,28 @@ static void WalkTag(CORO_PARAM, int actor, SCNHANDLE film, HPOLYGON hp, bool esc /** * Returns the X co-ordinateof lead actor's last walk. */ -int WalkXPos(void) { +int WalkXPos() { return GetLastLeadXdest(); } /** * Returns the Y co-ordinateof lead actor's last walk. */ -int WalkYPos(void) { +int WalkYPos() { return GetLastLeadYdest(); } /** * Return which is the current CD, counting from 1. */ -int WhichCd(void) { +int WhichCd() { return GetCurrentCD(); } /** * whichinventory */ -int WhichInventory(void) { +int WhichInventory() { return WhichInventoryOpen(); } diff --git a/engines/tinsel/tinlib.h b/engines/tinsel/tinlib.h index 27d38a9a22..11e59f380d 100644 --- a/engines/tinsel/tinlib.h +++ b/engines/tinsel/tinlib.h @@ -53,9 +53,9 @@ void Control(int param); void HookScene(SCNHANDLE scene, int entrance, int transition); void NewScene(CORO_PARAM, SCNHANDLE scene, int entrance, int transition); void Offset(EXTREME extreme, int x, int y); -void FnRestartGame(void); -void RestoreScene(void); -void ResumeLastGame(void); +void FnRestartGame(); +void RestoreScene(); +void ResumeLastGame(); void SaveScene(CORO_PARAM); void Stand(CORO_PARAM, int actor, int x, int y, SCNHANDLE film); void SetTextPal(COLORREF col); diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 6b71b0c245..8b9a30d517 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -75,7 +75,7 @@ namespace Tinsel { // In BG.CPP extern void SetDoFadeIn(bool tf); -extern void DropBackground(void); +extern void DropBackground(); // In CURSOR.CPP extern void CursorProcess(CORO_PARAM, const void *); @@ -85,7 +85,7 @@ extern void InventoryProcess(CORO_PARAM, const void *); // In SCENE.CPP extern void PrimeBackground(); -extern SCNHANDLE GetSceneHandle(void); +extern SCNHANDLE GetSceneHandle(); //----------------- FORWARD DECLARATIONS --------------------- void SetNewScene(SCNHANDLE scene, int entrance, int transition); @@ -534,7 +534,7 @@ void SetHookScene(SCNHANDLE scene, int entrance, int transition) { /** * Hooked scene is over, trigger a change to the delayed scene */ -void UnHookScene(void) { +void UnHookScene() { assert(DelayedScene.scene != 0); // no scene delayed // The delayed scene can go now @@ -545,11 +545,11 @@ void UnHookScene(void) { DelayedScene.scene = 0; } -void SuspendHook(void) { +void SuspendHook() { bCuttingScene = true; } -void CdHasChanged(void) { +void CdHasChanged() { if (bChangingForRestore) { bChangingForRestore = false; RestoreGame(-2); @@ -578,7 +578,7 @@ void CDChangeForRestore(int cdNumber) { bChangingForRestore = true; } -void UnSuspendHook(void) { +void UnSuspendHook() { bCuttingScene = false; } @@ -703,7 +703,7 @@ void CuttingScene(bool bCutting) { /** * LoadBasicChunks */ -void LoadBasicChunks(void) { +void LoadBasicChunks() { byte *cptr; int numObjects; @@ -1036,7 +1036,7 @@ Common::Error TinselEngine::run() { } -void TinselEngine::NextGameCycle(void) { +void TinselEngine::NextGameCycle() { // Dim Music _pcmMusic->dimIteration(); @@ -1101,7 +1101,7 @@ bool TinselEngine::pollEvent() { /** * Start the processes that continue between scenes. */ -void TinselEngine::CreateConstProcesses(void) { +void TinselEngine::CreateConstProcesses() { // Process to run the master script _scheduler->createProcess(PID_MASTER_SCR, MasterScriptProcess, NULL, 0); @@ -1113,7 +1113,7 @@ void TinselEngine::CreateConstProcesses(void) { /** * Restart the game */ -void TinselEngine::RestartGame(void) { +void TinselEngine::RestartGame() { HoldItem(INV_NOICON); // Holding nothing DropBackground(); // No background @@ -1149,7 +1149,7 @@ void TinselEngine::RestartGame(void) { /** * Init palette and object managers, scheduler, keyboard and mouse. */ -void TinselEngine::RestartDrivers(void) { +void TinselEngine::RestartDrivers() { // init the palette manager ResetPalAllocator(); @@ -1178,7 +1178,7 @@ void TinselEngine::RestartDrivers(void) { /** * Remove keyboard, mouse and joystick drivers. */ -void TinselEngine::ChopDrivers(void) { +void TinselEngine::ChopDrivers() { // remove sound driver StopMidi(); _sound->stopAllSamples(); diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index 8fff4985b8..e396f663c7 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -194,11 +194,11 @@ private: //MidiMusicPlayer *_midiMusic; int _musicVolume; - void NextGameCycle(void); - void CreateConstProcesses(void); - void RestartGame(void); - void RestartDrivers(void); - void ChopDrivers(void); + void NextGameCycle(); + void CreateConstProcesses(); + void RestartGame(); + void RestartDrivers(); + void ChopDrivers(); void ProcessKeyEvent(const Common::Event &event); bool pollEvent(); @@ -222,7 +222,7 @@ public: // Externally available methods void CuttingScene(bool bCutting); void CDChangeForRestore(int cdNumber); -void CdHasChanged(void); +void CdHasChanged(); } // End of namespace Tinsel diff --git a/engines/tinsel/token.cpp b/engines/tinsel/token.cpp index 1c78f462b1..2acf3c073f 100644 --- a/engines/tinsel/token.cpp +++ b/engines/tinsel/token.cpp @@ -120,7 +120,7 @@ bool TestToken(int which) { /** * Call at the start of each scene. */ -void FreeAllTokens(void) { +void FreeAllTokens() { for (int i = 0; i < NUMTOKENS; i++) { tokens[i].proc = NULL; } diff --git a/engines/tinsel/token.h b/engines/tinsel/token.h index 906ce4589d..b750b92ae4 100644 --- a/engines/tinsel/token.h +++ b/engines/tinsel/token.h @@ -48,7 +48,7 @@ void FreeControlToken(); void GetToken(int which); void FreeToken(int which); -void FreeAllTokens(void); +void FreeAllTokens(); bool TestToken(int which); |