diff options
Diffstat (limited to 'engines/cruise')
31 files changed, 212 insertions, 212 deletions
diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp index 344552bf76..81e39600f5 100644 --- a/engines/cruise/actor.cpp +++ b/engines/cruise/actor.cpp @@ -711,7 +711,7 @@ void set_anim(int ovl, int obj, int start, int x, int y, int mat, int state) { /** * 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; diff --git a/engines/cruise/actor.h b/engines/cruise/actor.h index 7e9f3672ad..d55aac1eca 100644 --- a/engines/cruise/actor.h +++ b/engines/cruise/actor.h @@ -68,7 +68,7 @@ struct actorStruct { 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 diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h index eff3e9b92f..f9e7e1e69f 100644 --- a/engines/cruise/cruise.h +++ b/engines/cruise/cruise.h @@ -63,12 +63,12 @@ private: 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 @@ public: virtual void syncSoundSettings(); const CRUISEGameDescription *_gameDescription; - void initAllData(void); + void initAllData(); Common::RandomSource _rnd; }; diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index 6f5bf552fa..2fb242a145 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -441,7 +441,7 @@ uint8 *mainProc14(uint16 overlay, uint16 idx) { return NULL; } -void CruiseEngine::initAllData(void) { +void CruiseEngine::initAllData() { int i; setupFuncArray(); @@ -779,7 +779,7 @@ int findObject(int mouseX, int mouseY, int *outObjOvl, int *outObjIdx) { Common::KeyCode keyboardCode = Common::KEYCODE_INVALID; -void freeStuff2(void) { +void freeStuff2() { warning("implement freeStuff2"); } @@ -1070,7 +1070,7 @@ bool findRelation(int objOvl, int objIdx, int x, int y) { return found; } -int processInventory(void) { +int processInventory() { if (menuTable[1]) { menuElementSubStruct *pMenuElementSub = getSelectedEntryInMenu(menuTable[1]); @@ -1380,7 +1380,7 @@ void callRelation(menuElementSubStruct *pMenuElement, int nObj2) { } } -void closeAllMenu(void) { +void closeAllMenu() { if (menuTable[0]) { freeMenu(menuTable[0]); menuTable[0] = NULL; @@ -1417,7 +1417,7 @@ bool checkInput(int16 *buttonPtr) { extern bool manageEvents(); -int CruiseEngine::processInput(void) { +int CruiseEngine::processInput() { int16 mouseX = 0; int16 mouseY = 0; int16 button = 0; @@ -1788,7 +1788,7 @@ void getMouseStatus(int16 *pMouseVar, int16 *pMouseX, int16 *pMouseButton, int16 } -void CruiseEngine::mainLoop(void) { +void CruiseEngine::mainLoop() { //int32 t_start,t_left; //uint32 t_end; //int32 q=0; /* Dummy */ diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h index ef15b7c923..8657b4bc21 100644 --- a/engines/cruise/cruise_main.h +++ b/engines/cruise/cruise_main.h @@ -94,7 +94,7 @@ ovlData3Struct *scriptFunc1Sub2(int32 scriptNumber, int32 param); 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 removeExtention(const char *name, char *buffer); 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); diff --git a/engines/cruise/decompiler.cpp b/engines/cruise/decompiler.cpp index a7244d3f8a..ba4ade56a7 100644 --- a/engines/cruise/decompiler.cpp +++ b/engines/cruise/decompiler.cpp @@ -234,7 +234,7 @@ void getByteFromDecompScript(char *buffer) { sprintf(buffer, "%d", var); } -char getByteFromDecompScriptReal(void) { +char getByteFromDecompScriptReal() { short int var = currentDecompScript[currentDecompScriptPtr->var4]; currentDecompScriptPtr->var4 = currentDecompScriptPtr->var4 + 1; @@ -257,7 +257,7 @@ void getShortFromDecompScript(char *buffer) { 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 @@ void resolveVarName(char *ovlIdxString, int varType, char *varIdxString, } } -int decompLoadVar(void) { +int decompLoadVar() { switch (currentScriptOpcodeType) { case 0: { char buffer[256]; @@ -416,7 +416,7 @@ int decompLoadVar(void) { } } -int decompSaveVar(void) { +int decompSaveVar() { // int var = popVar(); switch (currentScriptOpcodeType) { @@ -492,7 +492,7 @@ int decompSaveVar(void) { return (0); } -int decompOpcodeType2(void) { +int decompOpcodeType2() { switch (currentScriptOpcodeType) { case 1: { char buffer3[256]; @@ -536,7 +536,7 @@ int decompOpcodeType2(void) { return (0); } -int decompMath(void) { +int decompMath() { char *param1 = popDecomp(); char *param2 = popDecomp(); @@ -588,7 +588,7 @@ int decompMath(void) { return (0); } -int decompBoolCompare(void) { +int decompBoolCompare() { char *param1; char *param2; @@ -601,7 +601,7 @@ int decompBoolCompare(void) { return 0; } -int decompTest(void) { +int decompTest() { unsigned long int oldOffset = currentDecompScriptPtr->var4; short int offset = getShortFromDecompScriptReal(); @@ -659,7 +659,7 @@ int decompTest(void) { return 0; } -int decompCompare(void) { +int decompCompare() { char *param; param = popDecomp(); @@ -684,7 +684,7 @@ int decompCompare(void) { return 0; } -int decompSwapStack(void) { +int decompSwapStack() { char *stack1; char *stack2; char buffer1[4000]; @@ -702,7 +702,7 @@ int decompSwapStack(void) { return 0; } -int decompFunction(void) { +int decompFunction() { currentScriptOpcodeType = getByteFromDecompScriptReal(); // addDecomp("OP_%X", currentScriptOpcodeType); switch (currentScriptOpcodeType) { @@ -1279,18 +1279,18 @@ int decompFunction(void) { 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++) { diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp index bd9b2e2644..3a609cb8d4 100644 --- a/engines/cruise/font.cpp +++ b/engines/cruise/font.cpp @@ -137,7 +137,7 @@ void loadFNT(const char *fileName) { fontFileHandle.close(); } -void initSystem(void) { +void initSystem() { int32 i; itemColor = 15; @@ -168,7 +168,7 @@ void initSystem(void) { loadFNT("system.fnt"); } -void freeSystem(void) { +void freeSystem() { MemFree(_systemFNT); } diff --git a/engines/cruise/font.h b/engines/cruise/font.h index e3f34837af..849c074ac5 100644 --- a/engines/cruise/font.h +++ b/engines/cruise/font.h @@ -51,8 +51,8 @@ struct FontEntry { #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); diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp index 4c1ab63a8a..2d61bed578 100644 --- a/engines/cruise/function.cpp +++ b/engines/cruise/function.cpp @@ -38,7 +38,7 @@ uint32 Period(uint32 hz) { //#define FUNCTION_DEBUG -int16 Op_LoadOverlay(void) { +int16 Op_LoadOverlay() { char *pOverlayName; char overlayName[38] = ""; int overlayLoadResult; @@ -63,7 +63,7 @@ int16 Op_LoadOverlay(void) { return(overlayLoadResult); } -int16 Op_Strcpy(void) { +int16 Op_Strcpy() { char *ptr1 = (char *)popPtr(); char *ptr2 = (char *)popPtr(); @@ -81,7 +81,7 @@ int16 Op_Strcpy(void) { return (0); } -int16 Op_Exec(void) { +int16 Op_Exec() { int scriptIdx; int ovlIdx; uint8 *ptr; @@ -122,7 +122,7 @@ int16 Op_Exec(void) { return (0); } -int16 Op_AddProc(void) { +int16 Op_AddProc() { int pop1 = popVar(); int pop2; int overlay; @@ -154,7 +154,7 @@ int16 Op_AddProc(void) { return (0); } -int16 Op_Narrator(void) { +int16 Op_Narrator() { int pop1 = popVar(); int pop2 = popVar(); @@ -167,7 +167,7 @@ int16 Op_Narrator(void) { return (0); } -int16 Op_GetMouseX(void) { +int16 Op_GetMouseX() { int16 dummy; int16 mouseX; int16 mouseY; @@ -178,7 +178,7 @@ int16 Op_GetMouseX(void) { return (mouseX); } -int16 Op_GetMouseY(void) { +int16 Op_GetMouseY() { int16 dummy; int16 mouseX; int16 mouseY; @@ -189,7 +189,7 @@ int16 Op_GetMouseY(void) { return (mouseY); } -int16 Op_Random(void) { +int16 Op_Random() { int var = popVar(); if (var < 2) { @@ -199,7 +199,7 @@ int16 Op_Random(void) { 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 @@ int16 Op_PlayFX(void) { return (0); } -int16 Op_LoopFX(void) { +int16 Op_LoopFX() { int volume = popVar(); int speed = popVar(); /*int channelNum = */popVar(); @@ -233,7 +233,7 @@ int16 Op_LoopFX(void) { return (0); } -int16 Op_StopFX(void) { +int16 Op_StopFX() { int channelNum = popVar(); if (channelNum == -1) { @@ -248,7 +248,7 @@ int16 Op_StopFX(void) { return 0; } -int16 Op_FreqFX(void) { +int16 Op_FreqFX() { int volume = popVar(); int freq2 = popVar(); int channelNum = popVar(); @@ -263,7 +263,7 @@ int16 Op_FreqFX(void) { return (0); } -int16 Op_FreeCT(void) { +int16 Op_FreeCT() { freeCTP(); return (0); } @@ -291,18 +291,18 @@ void freeObjectList(cellStruct *pListHead) { } } -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 @@ int16 Op_UnmergeBackgroundIncrust(void) { 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 @@ int16 Op_RemoveMessage(void) { return (0); } -int16 Op_FindSet(void) { +int16 Op_FindSet() { int16 i; char name[36] = ""; char *ptr; @@ -360,7 +360,7 @@ int16 Op_FindSet(void) { return -1; } -int16 Op_RemoveFrame(void) { +int16 Op_RemoveFrame() { int count = popVar(); int start = popVar(); @@ -369,7 +369,7 @@ int16 Op_RemoveFrame(void) { return (0); } -int16 Op_comment(void) { +int16 Op_comment() { char *var; var = (char *)popPtr(); @@ -379,7 +379,7 @@ int16 Op_comment(void) { return (0); } -int16 Op_RemoveProc(void) { +int16 Op_RemoveProc() { int idx; int overlay; @@ -395,7 +395,7 @@ int16 Op_RemoveProc(void) { return (0); } -int16 Op_FreeOverlay(void) { +int16 Op_FreeOverlay() { char localName[36] = ""; char *namePtr; @@ -411,7 +411,7 @@ int16 Op_FreeOverlay(void) { return 0; } -int16 Op_FindProc(void) { +int16 Op_FindProc() { char name[36] = ""; char *ptr; int param; @@ -425,13 +425,13 @@ int16 Op_FindProc(void) { 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 @@ int16 Op_KillMenu(void) { 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 @@ int16 Op_UserOn(void) { return oldValue; } -int16 Op_Display(void) { +int16 Op_Display() { int oldValue = displayOn; int newValue = popVar(); @@ -482,7 +482,7 @@ int16 Op_Display(void) { 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 @@ int16 Op_FreezeParent(void) { return 0; } -int16 Op_LoadBackground(void) { +int16 Op_LoadBackground() { int result = 0; char bgName[36] = ""; char *ptr; @@ -520,7 +520,7 @@ int16 Op_LoadBackground(void) { return result; } -int16 Op_FrameExist(void) { +int16 Op_FrameExist() { int param; param = popVar(); @@ -536,7 +536,7 @@ int16 Op_FrameExist(void) { return 0; } -int16 Op_LoadFrame(void) { +int16 Op_LoadFrame() { int param1; int param2; int param3; @@ -568,7 +568,7 @@ int16 Op_LoadFrame(void) { return 0; } -int16 Op_LoadAbs(void) { +int16 Op_LoadAbs() { int slot; char name[36] = ""; char *ptr; @@ -591,7 +591,7 @@ int16 Op_LoadAbs(void) { return result; } -int16 Op_InitializeState(void) { +int16 Op_InitializeState() { int param1 = popVar(); int objIdx = popVar(); int ovlIdx = popVar(); @@ -608,11 +608,11 @@ int16 Op_InitializeState(void) { 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 @@ int16 Op_AniDir(void) { 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 @@ int16 isOverlayLoaded(const char * name) { return 0; } -int16 Op_FindOverlay(void) { +int16 Op_FindOverlay() { char name[36] = ""; char *ptr; @@ -673,7 +673,7 @@ int16 Op_FindOverlay(void) { return (isOverlayLoaded(name)); } -int16 Op_WriteObject(void) { +int16 Op_WriteObject() { int16 returnParam; int16 param1 = popVar(); @@ -687,7 +687,7 @@ int16 Op_WriteObject(void) { return returnParam; } -int16 Op_ReadObject(void) { +int16 Op_ReadObject() { int16 returnParam; int member = popVar(); @@ -699,12 +699,12 @@ int16 Op_ReadObject(void) { 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 @@ int16 Op_GetMouseButton(void) { return mouseButton; } -int16 Op_AddCell(void) { +int16 Op_AddCell() { int16 objType = popVar(); int16 objIdx = popVar(); int16 overlayIdx = popVar(); @@ -728,7 +728,7 @@ int16 Op_AddCell(void) { return 0; } -int16 Op_AddBackgroundIncrust(void) { +int16 Op_AddBackgroundIncrust() { int16 objType = popVar(); int16 objIdx = popVar(); @@ -742,7 +742,7 @@ int16 Op_AddBackgroundIncrust(void) { return 0; } -int16 Op_RemoveCell(void) { +int16 Op_RemoveCell() { int objType = popVar(); int objectIdx = popVar(); int ovlNumber = popVar(); @@ -758,13 +758,13 @@ int16 Op_RemoveCell(void) { 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 @@ int16 Op_UnfreezeParent(void) { return 0; } -int16 Op_ProtectionFlag(void) { +int16 Op_ProtectionFlag() { int16 temp = protectionCode; int16 newVar; @@ -786,7 +786,7 @@ int16 Op_ProtectionFlag(void) { return temp; } -int16 Op_ClearScreen(void) { +int16 Op_ClearScreen() { int bgIdx = popVar(); if ((bgIdx >= 0) && (bgIdx < NBSCREENS) && (backgroundScreens[bgIdx])) { @@ -798,7 +798,7 @@ int16 Op_ClearScreen(void) { return 0; } -int16 Op_AddMessage(void) { +int16 Op_AddMessage() { int16 color = popVar(); int16 var_2 = popVar(); int16 var_4 = popVar(); @@ -822,18 +822,18 @@ int16 Op_AddMessage(void) { 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 @@ int16 Op_EndAnim(void) { 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 @@ int16 Op_AutoCell(void) { return 0; } -int16 Op_Sizeof(void) { +int16 Op_Sizeof() { objectParamsQuery params; int index = popVar(); int overlay = popVar(); @@ -919,7 +919,7 @@ int16 Op_Sizeof(void) { return params.nbState - 1; } -int16 Op_SetActiveBackground(void) { +int16 Op_SetActiveBackground() { int currentPlane = masterScreen; int newPlane = popVar(); @@ -934,7 +934,7 @@ int16 Op_SetActiveBackground(void) { return currentPlane; } -int16 Op_RemoveBackground(void) { +int16 Op_RemoveBackground() { int backgroundIdx = popVar(); if (backgroundIdx > 0 && backgroundIdx < 8) { @@ -956,14 +956,14 @@ int16 Op_RemoveBackground(void) { 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 @@ int16 Op_Sec(void) { return si; } -int16 Op_RemoveBackgroundIncrust(void) { +int16 Op_RemoveBackgroundIncrust() { int idx = popVar(); int overlay = popVar(); @@ -992,7 +992,7 @@ int16 Op_RemoveBackgroundIncrust(void) { return 0; } -int16 Op_SetColor(void) { +int16 Op_SetColor() { int colorB = popVar(); int colorG = popVar(); int colorR = popVar(); @@ -1023,7 +1023,7 @@ int16 Op_SetColor(void) { return 0; } -int16 Op_Inventory(void) { +int16 Op_Inventory() { int si = var41; var41 = popVar(); @@ -1031,7 +1031,7 @@ int16 Op_Inventory(void) { return si; } -int16 Op_RemoveOverlay(void) { +int16 Op_RemoveOverlay() { int overlayIdx; overlayIdx = popVar(); @@ -1043,7 +1043,7 @@ int16 Op_RemoveOverlay(void) { return 0; } -int16 Op_ComputeLine(void) { +int16 Op_ComputeLine() { int y2 = popVar(); int x2 = popVar(); int y1 = popVar(); @@ -1058,14 +1058,14 @@ int16 Op_ComputeLine(void) { 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 @@ int16 subOp23(int param1, int param2) { 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 removeAnimation(actorStruct * pHead, int overlay, int objIdx, int objType) { 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 @@ int16 Op_AddAnimation(void) { return 0; } -int16 Op_RemoveAnimation(void) { +int16 Op_RemoveAnimation() { int objType = popVar(); int objIdx = popVar(); int ovlIdx = popVar(); @@ -1260,12 +1260,12 @@ int16 Op_RemoveAnimation(void) { 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 @@ int16 Op_SetStringColors(void) { return 0; } -int16 Op_XClick(void) { +int16 Op_XClick() { int x = popVar(); if (x != -1) { @@ -1287,7 +1287,7 @@ int16 Op_XClick(void) { return aniX; } -int16 Op_YClick(void) { +int16 Op_YClick() { int y = popVar(); if (y != -1) { @@ -1298,7 +1298,7 @@ int16 Op_YClick(void) { return aniY; } -int16 Op_GetPixel(void) { +int16 Op_GetPixel() { int x = popVar(); int y = popVar(); @@ -1306,7 +1306,7 @@ int16 Op_GetPixel(void) { return numPoly; } -int16 Op_TrackAnim(void) { // setup actor position +int16 Op_TrackAnim() { // setup actor position actorStruct *pActor; int var0 = popVar(); @@ -1336,7 +1336,7 @@ int16 Op_TrackAnim(void) { // setup actor position return 0; } -int16 Op_BgName(void) { +int16 Op_BgName() { char* bgName = (char*)popPtr(); int bgIdx = popVar(); @@ -1352,7 +1352,7 @@ int16 Op_BgName(void) { return 0; } -int16 Op_LoadSong(void) { +int16 Op_LoadSong() { const char *ptr = (const char *)popPtr(); char buffer[33]; @@ -1364,27 +1364,27 @@ int16 Op_LoadSong(void) { 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 @@ int16 Op_SongSize(void) { return oldSize; } -int16 Op_SetPattern(void) { +int16 Op_SetPattern() { int value = popVar(); int offset = popVar(); @@ -1410,26 +1410,26 @@ int16 Op_SetPattern(void) { 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 @@ void setVar49Value(int value) { 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 @@ int16 Op_FreezeOverlay(void) { return temp; } -int16 Op_FreezeCell(void) { +int16 Op_FreezeCell() { int newFreezz = popVar(); int oldFreeze = popVar(); int backgroundPlante = popVar(); @@ -1492,7 +1492,7 @@ void Op_60Sub(int overlayIdx, actorStruct * pActorHead, int _var0, int _var1, in } } -int16 Op_FreezeAni(void) { +int16 Op_FreezeAni() { /* * int var0; * int var1; @@ -1516,7 +1516,7 @@ int16 Op_FreezeAni(void) { return 0; } -int16 Op_Itoa(void) { +int16 Op_Itoa() { int nbp = popVar(); int param[160]; char txt[40]; @@ -1546,7 +1546,7 @@ int16 Op_Itoa(void) { return 0; } -int16 Op_Strcat(void) { +int16 Op_Strcat() { char *pSource = (char *)popPtr(); char *pDest = (char *)popPtr(); @@ -1560,7 +1560,7 @@ int16 Op_Strcat(void) { return 0; } -int16 Op_FindSymbol(void) { +int16 Op_FindSymbol() { int var0 = popVar(); char *ptr = (char *)popPtr(); int var1 = popVar(); @@ -1571,7 +1571,7 @@ int16 Op_FindSymbol(void) { 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 @@ int16 Op_FindObject(void) { 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 @@ int16 Op_SetObjectAtNode(void) { return 0; } -int16 Op_GetNodeX(void) { +int16 Op_GetNodeX() { int16 node = popVar(); int nodeInfo[2]; @@ -1622,7 +1622,7 @@ int16 Op_GetNodeX(void) { return nodeInfo[0]; } -int16 Op_GetNodeY(void) { +int16 Op_GetNodeY() { int16 node = popVar(); int nodeInfo[2]; @@ -1634,7 +1634,7 @@ int16 Op_GetNodeY(void) { return nodeInfo[1]; } -int16 Op_SetVolume(void) { +int16 Op_SetVolume() { int oldVolume = _vm->sound().getVolume(); int newVolume = popVar(); @@ -1647,7 +1647,7 @@ int16 Op_SetVolume(void) { return oldVolume >> 2; } -int16 Op_SongExist(void) { +int16 Op_SongExist() { const char *songName = (char*)popPtr(); if (songName) { @@ -1662,33 +1662,33 @@ int16 Op_SongExist(void) { 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 @@ int16 Op_DialogOn(void) { return 0; } -int16 Op_DialogOff(void) { +int16 Op_DialogOff() { dialogueEnabled = false; objectReset(); @@ -1715,7 +1715,7 @@ int16 Op_DialogOff(void) { return 0; } -int16 Op_LinkObjects(void) { +int16 Op_LinkObjects() { int type = popVar(); int obj2 = popVar(); int ovl2 = popVar(); @@ -1732,7 +1732,7 @@ int16 Op_LinkObjects(void) { return 0; } -int16 Op_UserClick(void) { +int16 Op_UserClick() { sysKey = popVar(); sysY = popVar(); sysX = popVar(); @@ -1740,7 +1740,7 @@ int16 Op_UserClick(void) { return 0; } -int16 Op_XMenuItem(void) { +int16 Op_XMenuItem() { int index = popVar(); int count = 0; @@ -1760,7 +1760,7 @@ int16 Op_XMenuItem(void) { return 0; } -int16 Op_YMenuItem(void) { +int16 Op_YMenuItem() { int index = popVar(); int count = 0; @@ -1785,7 +1785,7 @@ int16 Op_Menu() { return (int16)(menuTable[0] != NULL); } -int16 Op_AutoControl(void) { +int16 Op_AutoControl() { int oldValue = automaticMode; int newValue = popVar(); @@ -1797,7 +1797,7 @@ int16 Op_AutoControl(void) { return oldValue; } -int16 Op_MouseMove(void) { +int16 Op_MouseMove() { int16 handle, button; Common::Point pt; @@ -1810,18 +1810,18 @@ int16 Op_MouseMove(void) { 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 @@ int16 Op_UserDelay(void) { 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 @@ opcodeFunction opcodeTablePtr[] = { Op_KillMenu, }; -int32 opcodeType8(void) { +int32 opcodeType8() { int opcode = getByteFromScript(); if (!opcode) diff --git a/engines/cruise/function.h b/engines/cruise/function.h index 6604d87bcb..347c9f23b8 100644 --- a/engines/cruise/function.h +++ b/engines/cruise/function.h @@ -30,12 +30,12 @@ namespace Cruise { 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 diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp index b8f7ef291e..fdf26337e3 100644 --- a/engines/cruise/gfxModule.cpp +++ b/engines/cruise/gfxModule.cpp @@ -201,10 +201,10 @@ void gfxModuleData_convertOldPalColor(uint16 oldColor, uint8 *pOutput) { *(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 gfxCopyRect(const uint8 *sourceBuffer, int width, int height, byte *dest, i } } -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(); diff --git a/engines/cruise/gfxModule.h b/engines/cruise/gfxModule.h index 724b327f35..1dbc5afc9b 100644 --- a/engines/cruise/gfxModule.h +++ b/engines/cruise/gfxModule.h @@ -49,9 +49,9 @@ extern gfxModuleDataStruct gfxModuleData; 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 gfxCopyRect(const uint8 *sourceBuffer, int width, int height, byte *dest, i 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); diff --git a/engines/cruise/linker.cpp b/engines/cruise/linker.cpp index 2d14d46ce3..49e97ebc11 100644 --- a/engines/cruise/linker.cpp +++ b/engines/cruise/linker.cpp @@ -270,7 +270,7 @@ int updateScriptImport(int ovlIdx) { } // 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++) { diff --git a/engines/cruise/linker.h b/engines/cruise/linker.h index 808ace75e0..f513d15845 100644 --- a/engines/cruise/linker.h +++ b/engines/cruise/linker.h @@ -28,7 +28,7 @@ namespace Cruise { -void updateAllScriptsImports(void); +void updateAllScriptsImports(); } // End of namespace Cruise #endif diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp index 2218c5bb7c..ca7859f1e9 100644 --- a/engines/cruise/mainDraw.cpp +++ b/engines/cruise/mainDraw.cpp @@ -56,7 +56,7 @@ void addAutoCell(int overlayIdx, int idx, int type, int newVal, cellStruct *pObj pNewEntry->pCell = pObject; } -void freeAutoCell(void) { +void freeAutoCell() { autoCellStruct *pCurrent = autoCellHead.next; while (pCurrent) { @@ -126,7 +126,7 @@ void fadeIn() { 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 @@ int16 *A2ptr; -void buildSegment(void) { +void buildSegment() { int16* pOut = XMIN_XMAX; if ((polyXMin >= 320) || (polyXMax < 0) || (polyYMax < 0) || (polyYMin >= 200)) { @@ -1265,7 +1265,7 @@ void drawSprite(int width, int height, cellStruct *currentObjPtr, const uint8 *d } #ifdef _DEBUG -void drawCtp(void) { +void drawCtp() { /* int i; if (ctp_walkboxTable) { diff --git a/engines/cruise/mainDraw.h b/engines/cruise/mainDraw.h index 620ac6e4d7..306fb6845d 100644 --- a/engines/cruise/mainDraw.h +++ b/engines/cruise/mainDraw.h @@ -37,7 +37,7 @@ int upscaleValue(int value, int scale); 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); diff --git a/engines/cruise/object.cpp b/engines/cruise/object.cpp index 0a5a45f027..4d2c1c2273 100644 --- a/engines/cruise/object.cpp +++ b/engines/cruise/object.cpp @@ -288,7 +288,7 @@ int16 getSingleObjectParam(int16 overlayIdx, int16 param2, int16 param3, int16 * 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) { diff --git a/engines/cruise/object.h b/engines/cruise/object.h index 73c430ad01..625e8e479e 100644 --- a/engines/cruise/object.h +++ b/engines/cruise/object.h @@ -53,7 +53,7 @@ struct objectParamsQuery { 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); diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp index 8ed129a424..f93e8f37fc 100644 --- a/engines/cruise/overlay.cpp +++ b/engines/cruise/overlay.cpp @@ -33,7 +33,7 @@ namespace Cruise { overlayStruct overlayTable[90]; int numOfLoadedOverlay; -void initOverlayTable(void) { +void initOverlayTable() { int i; for (i = 0; i < 90; i++) { diff --git a/engines/cruise/overlay.h b/engines/cruise/overlay.h index 338ec51caf..7b2f34b73d 100644 --- a/engines/cruise/overlay.h +++ b/engines/cruise/overlay.h @@ -179,7 +179,7 @@ struct overlayStruct { 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); diff --git a/engines/cruise/perso.cpp b/engines/cruise/perso.cpp index e6dee49c9e..27d3c8cb7d 100644 --- a/engines/cruise/perso.cpp +++ b/engines/cruise/perso.cpp @@ -39,7 +39,7 @@ void freePerso(int persoIdx) { } } -void freeCTP(void) { +void freeCTP() { for (unsigned long int i = 0; i < NUM_PERSONS; i++) { freePerso(i); diff --git a/engines/cruise/perso.h b/engines/cruise/perso.h index 9522ca2fa6..19201ecafb 100644 --- a/engines/cruise/perso.h +++ b/engines/cruise/perso.h @@ -63,7 +63,7 @@ extern int16 numPoly; 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); diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp index fb752ce2a7..a7351ff700 100644 --- a/engines/cruise/saveload.cpp +++ b/engines/cruise/saveload.cpp @@ -659,7 +659,7 @@ void unloadOverlay(const char*name, int overlayNumber) { overlayTable[overlayNumber].alreadyLoaded = 0; } -void initVars(void) { +void initVars() { closeAllMenu(); resetFileEntryRange(0, NUM_FILE_ENTRIES); diff --git a/engines/cruise/saveload.h b/engines/cruise/saveload.h index bb69918a48..9aa1f89e0f 100644 --- a/engines/cruise/saveload.h +++ b/engines/cruise/saveload.h @@ -42,7 +42,7 @@ struct CruiseSavegameHeader { 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 diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index 9ef9c686b1..3d0a0c1804 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -34,14 +34,14 @@ scriptInstanceStruct procHead; 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 @@ short int getShortFromScript(void) { } // load opcode -int32 opcodeType0(void) { +int32 opcodeType0() { int index = 0; switch (currentScriptOpcodeType) { @@ -128,7 +128,7 @@ int32 opcodeType0(void) { } // save opcode -int32 opcodeType1(void) { +int32 opcodeType1() { int var = popVar(); int offset = 0; @@ -222,7 +222,7 @@ int32 opcodeType1(void) { return (0); } -int32 opcodeType2(void) { +int32 opcodeType2() { int index = 0; switch (currentScriptOpcodeType) { case 5: @@ -269,15 +269,15 @@ int32 opcodeType2(void) { 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 @@ int32 opcodeType4(void) { // test return (0); } -int32 opcodeType6(void) { +int32 opcodeType6() { int si = 0; int pop = popVar(); @@ -343,7 +343,7 @@ int32 opcodeType6(void) { return (0); } -int32 opcodeType7(void) { +int32 opcodeType7() { int var1 = popVar(); int var2 = popVar(); @@ -353,7 +353,7 @@ int32 opcodeType7(void) { return (0); } -int32 opcodeType5(void) { +int32 opcodeType5() { int offset = currentScriptPtr->scriptOffset; int short1 = getShortFromScript(); int newSi = short1 + offset; @@ -408,7 +408,7 @@ int32 opcodeType5(void) { return (0); } -int32 opcodeType3(void) { // math +int32 opcodeType3() { // math int pop1 = popVar(); int pop2 = popVar(); @@ -447,7 +447,7 @@ int32 opcodeType3(void) { // math 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); diff --git a/engines/cruise/script.h b/engines/cruise/script.h index bcaa2db9ff..2a7a85689d 100644 --- a/engines/cruise/script.h +++ b/engines/cruise/script.h @@ -55,8 +55,8 @@ extern scriptInstanceStruct relHead; 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); diff --git a/engines/cruise/stack.cpp b/engines/cruise/stack.cpp index 1639ba3942..4f36dbec48 100644 --- a/engines/cruise/stack.cpp +++ b/engines/cruise/stack.cpp @@ -40,7 +40,7 @@ void pushVar(int16 var) { } } -int16 popVar(void) { +int16 popVar() { if (positionInStack <= 0) { return (0); } diff --git a/engines/cruise/stack.h b/engines/cruise/stack.h index 831c07e217..a7cd3f556d 100644 --- a/engines/cruise/stack.h +++ b/engines/cruise/stack.h @@ -46,11 +46,11 @@ struct stackElementStruct { } data; }; -int16 popVar(void); +int16 popVar(); void pushVar(int16 var); void pushPtr(void *ptr); -void *popPtr(void); +void *popPtr(); } // End of namespace Cruise diff --git a/engines/cruise/vars.h b/engines/cruise/vars.h index 4bb94ff691..1e19794f3a 100644 --- a/engines/cruise/vars.h +++ b/engines/cruise/vars.h @@ -51,8 +51,8 @@ struct menuElementStruct { menuElementSubStruct *ptrSub; }; -typedef int32(*opcodeTypeFunction)(void); -typedef int16(*opcodeFunction)(void); +typedef int32(*opcodeTypeFunction)(); +typedef int16(*opcodeFunction)(); extern uint8 *_systemFNT; extern int16 fontFileIndex; diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp index 58cd2fdb44..3b856b4440 100644 --- a/engines/cruise/volume.cpp +++ b/engines/cruise/volume.cpp @@ -56,7 +56,7 @@ void loadPal(volumeDataStruct *entry) { #endif } -void closePal(void) { +void closePal() { if (PAL_file.isOpen()) { PAL_file.close(); @@ -68,7 +68,7 @@ void closePal(void) { } } -int closeBase(void) { +int closeBase() { if (currentVolumeFile.isOpen()) { currentVolumeFile.close(); @@ -177,7 +177,7 @@ int32 findFileInDisksSub1(const char *fileName) { return (foundDisk); } -void freeDisk(void) { +void freeDisk() { if (currentVolumeFile.isOpen()) { currentVolumeFile.close(); MemFree(volumePtrToFileDescriptor); @@ -313,7 +313,7 @@ int16 findFileInDisks(const char *name) { } } -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 @@ int closeCnf(void) { return 0; } -int16 readVolCnf(void) { +int16 readVolCnf() { int i; Common::File fileHandle; short int sizeHEntry; diff --git a/engines/cruise/volume.h b/engines/cruise/volume.h index ef5113b1c3..a842a30470 100644 --- a/engines/cruise/volume.h +++ b/engines/cruise/volume.h @@ -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 drawMsgString(const char *string); void askDisk(int16 discNumber); void setObjectPosition(int16 param1, int16 param2, int16 param3, int16 param4); -int closeBase(void); +int closeBase(); } // End of namespace Cruise |