aboutsummaryrefslogtreecommitdiff
path: root/engines/tony/mpal
diff options
context:
space:
mode:
authorStrangerke2012-06-18 08:24:33 +0200
committerStrangerke2012-06-18 08:24:33 +0200
commite8a6f61f8815fcf36e7a43383695c74b8925993f (patch)
tree26f532bc477fe29ebe304b262af69ceb7ef931d2 /engines/tony/mpal
parentbb55045cc85e1c9b70bd7267de0b578e6662725b (diff)
downloadscummvm-rg350-e8a6f61f8815fcf36e7a43383695c74b8925993f.tar.gz
scummvm-rg350-e8a6f61f8815fcf36e7a43383695c74b8925993f.tar.bz2
scummvm-rg350-e8a6f61f8815fcf36e7a43383695c74b8925993f.zip
TONY: Remove useless void in function declaration
Diffstat (limited to 'engines/tony/mpal')
-rw-r--r--engines/tony/mpal/mpal.cpp56
-rw-r--r--engines/tony/mpal/mpal.h25
2 files changed, 21 insertions, 60 deletions
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index bb3df1662f..7385e60b66 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -59,101 +59,91 @@ const char *mpalCopyright =
/**
* Locks the variables for access
*/
-void lockVar(void) {
+void lockVar() {
GLOBALS._lpmvVars = (LPMPALVAR)globalLock(GLOBALS._hVars);
}
/**
* Unlocks variables after use
*/
-void unlockVar(void) {
+void unlockVar() {
globalUnlock(GLOBALS._hVars);
}
/**
* Locks the messages for access
*/
-static void LockMsg(void) {
+static void LockMsg() {
#ifdef NEED_LOCK_MSGS
GLOBALS._lpmmMsgs = (LPMPALMSG)globalLock(GLOBALS._hMsgs);
#endif
}
-
/**
* Unlocks the messages after use
*/
-static void UnlockMsg(void) {
+static void UnlockMsg() {
#ifdef NEED_LOCK_MSGS
globalUnlock(GLOBALS._hMsgs);
#endif
}
-
/**
* Locks the dialogs for access
*/
-static void lockDialogs(void) {
+static void lockDialogs() {
GLOBALS._lpmdDialogs = (LPMPALDIALOG)globalLock(GLOBALS._hDialogs);
}
-
/**
* Unlocks the dialogs after use
*/
-static void unlockDialogs(void) {
+static void unlockDialogs() {
globalUnlock(GLOBALS._hDialogs);
}
-
/**
* Locks the location data structures for access
*/
-static void lockLocations(void) {
+static void lockLocations() {
GLOBALS._lpmlLocations = (LPMPALLOCATION)globalLock(GLOBALS._hLocations);
}
-
/**
* Unlocks the location structures after use
*/
-static void unlockLocations(void) {
+static void unlockLocations() {
globalUnlock(GLOBALS._hLocations);
}
-
/**
* Locks the items structures for use
*/
-static void lockItems(void) {
+static void lockItems() {
GLOBALS._lpmiItems = (LPMPALITEM)globalLock(GLOBALS._hItems);
}
-
/**
* Unlocks the items structures after use
*/
-static void unlockItems(void) {
+static void unlockItems() {
globalUnlock(GLOBALS._hItems);
}
-
/**
* Locks the script data structures for use
*/
-static void LockScripts(void) {
+static void LockScripts() {
GLOBALS._lpmsScripts = (LPMPALSCRIPT)globalLock(GLOBALS._hScripts);
}
-
/**
* Unlocks the script data structures after use
*/
-static void unlockScripts(void) {
+static void unlockScripts() {
globalUnlock(GLOBALS._hScripts);
}
-
/**
* Returns the current value of a global variable
*
@@ -175,7 +165,6 @@ int32 varGetValue(const char *lpszVarName) {
return 0;
}
-
/**
* Sets the value of a MPAL global variable
* @param lpszVarName Name of the variable
@@ -204,7 +193,6 @@ void varSetValue(const char *lpszVarName, int32 val) {
return;
}
-
/**
* Find the index of a location within the location array. Remember to call LockLoc() beforehand.
*
@@ -1973,17 +1961,15 @@ void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...) {
va_end(v);
}
-
/**
* Returns the current MPAL error code
*
* @returns Error code
*/
-uint32 mpalGetError(void) {
+uint32 mpalGetError() {
return GLOBALS._mpalError;
}
-
/**
* Execute a script. The script runs on multitasking by a thread.
*
@@ -2091,17 +2077,15 @@ void mpalEndIdlePoll(CORO_PARAM, int nLoc, bool *result) {
CORO_END_CODE;
}
-
/**
* Retrieve the length of a save state
*
* @returns Length in bytes
*/
-int mpalGetSaveStateSize(void) {
+int mpalGetSaveStateSize() {
return GLOBALS._nVars * sizeof(MPALVAR) + 4;
}
-
/**
* Store the save state into a buffer. The buffer must be
* length at least the size specified with mpalGetSaveStateSize
@@ -2251,7 +2235,6 @@ int OutputStartOther(uint16 wNum, Common::OutSaveFile *f) {
return 0;
}
-
void outputEndOther(uint16 wNum, Common::OutSaveFile *f) {
int i;
@@ -2262,8 +2245,7 @@ void outputEndOther(uint16 wNum, Common::OutSaveFile *f) {
}
}
-
-void mpalDumpMessages(void) {
+void mpalDumpMessages() {
int i, j;
char *lpMessage;
char *p;
@@ -2354,9 +2336,7 @@ void mpalDumpMessages(void) {
UnlockMsg();
}
-
-
-void mpalDumpOthers(void) {
+void mpalDumpOthers() {
int i,j;
char *lpMessage;
char *p;
@@ -2914,7 +2894,7 @@ void mpalDumpDialog(LPMPALDIALOG dlg) {
delete v1;
}
-void mpalDumpDialogs(void) {
+void mpalDumpDialogs() {
int i;
lockDialogs();
@@ -2925,8 +2905,6 @@ void mpalDumpDialogs(void) {
unlockDialogs();
}
-//@}
-
} // end of namespace MPAL
} // end of namespace Tony
diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h
index 1ec96c97d0..251e78afdf 100644
--- a/engines/tony/mpal/mpal.h
+++ b/engines/tony/mpal/mpal.h
@@ -327,7 +327,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
#define mpalQueryDialogWaitForChoice(dwRet) \
CORO_INVOKE_2(mpalQueryCORO, MPQ_DIALOG_WAITFORCHOICE, dwRet)
-
/**
* Requires a list of various options for some choice within the current dialog.
*
@@ -340,7 +339,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
#define mpalQueryDialogSelectList(nChoice) \
(uint32 *)mpalQueryHANDLE(MPQ_DIALOG_SELECTLIST, (uint32)(nChoice))
-
/**
* Warns the library that the user has selected, in a certain choice of the current dialog,
* corresponding option at a certain given.
@@ -358,7 +356,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
#define mpalQueryDialogSelectionDWORD(nChoice, dwData) \
mpalQueryDWORD(MPQ_DIALOG_SELECTION, (uint32)(nChoice), (uint32)(dwData))
-
/**
* Warns the library an action was performed on a Object.
* The library will call custom functions, if necessary.
@@ -375,7 +372,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
#define mpalQueryDoAction(nAction, nItem, dwParam) \
mpalQueryDWORD(MPQ_DO_ACTION, (uint32)(nAction), (uint32)(nItem), (uint32)(dwParam))
-
/**
* Warns the library a dialogue was required.
*
@@ -387,8 +383,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
#define mpalQueryDoDialog(nDialog,nGroup) \
mpalQueryDWORD(MPQ_DO_DIALOG, (uint32)(nDialog),(uint32)(nGroup))
-//@}
-
/**
* @defgroup Functions exported to the main game
*/
@@ -442,7 +436,6 @@ HANDLE mpalQueryHANDLE(uint16 wQueryType, ...);
*/
void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...);
-
/**
* Execute a script. The script runs on multitasking by a thread.
*
@@ -451,14 +444,12 @@ void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...);
*/
bool mpalExecuteScript(int nScript);
-
/**
* Returns the current MPAL error code
*
* @returns Error code
*/
-uint32 mpalGetError(void);
-
+uint32 mpalGetError();
/**
* Install a custom routine That will be called by MPAL every time the pattern
@@ -468,7 +459,6 @@ uint32 mpalGetError(void);
*/
void mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCustom);
-
/**
* Process the idle actions of the items on one location.
*
@@ -480,7 +470,6 @@ void mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCustom);
*/
bool mpalStartIdlePoll(int nLoc);
-
/**
* Stop processing the idle actions of the items on one location.
*
@@ -499,7 +488,6 @@ void mpalEndIdlePoll(CORO_PARAM, int nLoc, bool *result);
*/
int mpalLoadState(byte *buf);
-
/**
* Store the save state into a buffer. The buffer must be
* length at least the size specified with mpalGetSaveStateSize
@@ -508,27 +496,22 @@ int mpalLoadState(byte *buf);
*/
void mpalSaveState(byte *buf);
-
/**
* Retrieve the length of a save state
*
* @returns Length in bytes
*/
-int mpalGetSaveStateSize(void);
-
+int mpalGetSaveStateSize();
/**
* Locks the variables for access
*/
-void lockVar(void);
-
+void lockVar();
/**
* Unlocks variables after use
*/
-void unlockVar(void);
-
-//@}
+void unlockVar();
} // end of namespace MPAL