aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
diff options
context:
space:
mode:
authorMax Horn2009-11-02 21:54:57 +0000
committerMax Horn2009-11-02 21:54:57 +0000
commit51933629d1f1a17839ddbb75b2b619effe117abb (patch)
tree7292b23e5ce3fb11e6b2bb360a3befbbf35b64d9 /engines/agi
parent400ee8c461e8060393b62be639c27dd3820dccd4 (diff)
downloadscummvm-rg350-51933629d1f1a17839ddbb75b2b619effe117abb.tar.gz
scummvm-rg350-51933629d1f1a17839ddbb75b2b619effe117abb.tar.bz2
scummvm-rg350-51933629d1f1a17839ddbb75b2b619effe117abb.zip
Changed foo(void) to foo() in almost all non-backend source files
svn-id: r45616
Diffstat (limited to 'engines/agi')
-rw-r--r--engines/agi/agi.cpp4
-rw-r--r--engines/agi/agi.h36
-rw-r--r--engines/agi/console.h8
-rw-r--r--engines/agi/detection.cpp4
-rw-r--r--engines/agi/keyboard.cpp6
-rw-r--r--engines/agi/op_test.cpp2
-rw-r--r--engines/agi/preagi.h8
-rw-r--r--engines/agi/predictive.cpp6
-rw-r--r--engines/agi/saveload.cpp4
-rw-r--r--engines/agi/sound.cpp2
10 files changed, 40 insertions, 40 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 95939684de..ca76d91169 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -269,7 +269,7 @@ void AgiEngine::processEvents() {
}
}
-void AgiEngine::pollTimer(void) {
+void AgiEngine::pollTimer() {
static uint32 m = 0;
uint32 dm;
@@ -715,7 +715,7 @@ void AgiEngine::syncSoundSettings() {
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech);
}
-void AgiEngine::parseFeatures(void) {
+void AgiEngine::parseFeatures() {
if (!ConfMan.hasKey("features"))
return;
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 994edcc11b..679d686b7e 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -721,10 +721,10 @@ public:
bool _noSaveLoadAllowed;
- virtual void pollTimer(void) = 0;
- virtual int getKeypress(void) = 0;
- virtual bool isKeypress(void) = 0;
- virtual void clearKeyQueue(void) = 0;
+ virtual void pollTimer() = 0;
+ virtual int getKeypress() = 0;
+ virtual bool isKeypress() = 0;
+ virtual void clearKeyQueue() = 0;
AgiBase(OSystem *syst, const AGIGameDescription *gameDesc);
@@ -755,9 +755,9 @@ public:
Common::Language getLanguage() const;
Common::Platform getPlatform() const;
const char *getGameMD5() const;
- void initFeatures(void);
+ void initFeatures();
void setFeature(uint32 feature);
- void initVersion(void);
+ void initVersion();
void setVersion(uint16 version);
bool canLoadGameStateCurrently();
@@ -800,7 +800,7 @@ private:
int checkCollision(VtEntry *v);
int checkPosition(VtEntry *v);
- void parseFeatures(void);
+ void parseFeatures();
int _firstSlot;
@@ -854,10 +854,10 @@ public:
int agiUnloadResource(int, int);
void agiUnloadResources();
- virtual void pollTimer(void);
- virtual int getKeypress(void);
- virtual bool isKeypress(void);
- virtual void clearKeyQueue(void);
+ virtual void pollTimer();
+ virtual int getKeypress();
+ virtual bool isKeypress();
+ virtual void clearKeyQueue();
static void agiTimerFunctionLow(void *refCon);
void initPriTable();
@@ -981,27 +981,27 @@ public:
int messageBox(const char *);
int selectionBox(const char *, const char **);
- void closeWindow(void);
+ void closeWindow();
void drawWindow(int, int, int, int);
void printText(const char *, int, int, int, int, int, int, bool checkerboard = false);
void printTextConsole(const char *, int, int, int, int, int);
int print(const char *, int, int, int);
char *wordWrapString(const char *, int *);
char *agiSprintf(const char *);
- void writeStatus(void);
- void writePrompt(void);
- void clearPrompt(void);
+ void writeStatus();
+ void writePrompt();
+ void clearPrompt();
void clearLines(int, int, int);
void flushLines(int, int);
- bool predictiveDialog(void);
+ bool predictiveDialog();
private:
void printStatus(const char *message, ...) GCC_PRINTF(2, 3);
void printText2(int l, const char *msg, int foff, int xoff, int yoff, int len, int fg, int bg, bool checkerboard = false);
void blitTextbox(const char *p, int y, int x, int len);
void eraseTextbox();
- void loadDict(void);
- bool matchWord(void);
+ void loadDict();
+ bool matchWord();
// Predictive dialog
// TODO: Move this to a separate class
diff --git a/engines/agi/console.h b/engines/agi/console.h
index b75abe2ccd..270f4e86bd 100644
--- a/engines/agi/console.h
+++ b/engines/agi/console.h
@@ -49,7 +49,7 @@ struct AgiDebug {
class Console : public GUI::Debugger {
public:
Console(AgiEngine *vm);
- virtual ~Console(void);
+ virtual ~Console();
protected:
virtual void preEnter();
@@ -81,7 +81,7 @@ private:
class PreAGI_Console : public GUI::Debugger {
public:
PreAGI_Console(PreAgiEngine *vm);
- virtual ~PreAGI_Console(void) {}
+ virtual ~PreAGI_Console() {}
protected:
virtual void preEnter() {}
@@ -95,7 +95,7 @@ private:
class Mickey_Console : public PreAGI_Console {
public:
Mickey_Console(PreAgiEngine *vm, Mickey *mickey);
- virtual ~Mickey_Console(void) {}
+ virtual ~Mickey_Console() {}
protected:
virtual void preEnter() {}
@@ -113,7 +113,7 @@ private:
class Winnie_Console : public PreAGI_Console {
public:
Winnie_Console(PreAgiEngine *vm, Winnie *winnie);
- virtual ~Winnie_Console(void) {}
+ virtual ~Winnie_Console() {}
protected:
virtual void preEnter() {}
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 8760adb19e..e22a8148ce 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -74,7 +74,7 @@ const char *AgiBase::getGameMD5() const {
return _gameDescription->desc.filesDescriptions[0].md5;
}
-void AgiBase::initFeatures(void) {
+void AgiBase::initFeatures() {
_gameFeatures = _gameDescription->features;
}
@@ -86,7 +86,7 @@ void AgiBase::setVersion(uint16 version) {
_gameVersion = version;
}
-void AgiBase::initVersion(void) {
+void AgiBase::initVersion() {
_gameVersion = _gameDescription->version;
}
diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index ea384f3418..d5ef590961 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -421,12 +421,12 @@ int AgiEngine::waitAnyKey() {
return key;
}
-bool AgiEngine::isKeypress(void) {
+bool AgiEngine::isKeypress() {
processEvents();
return _keyQueueStart != _keyQueueEnd;
}
-int AgiEngine::getKeypress(void) {
+int AgiEngine::getKeypress() {
int k;
while (_keyQueueStart == _keyQueueEnd) // block
@@ -437,7 +437,7 @@ int AgiEngine::getKeypress(void) {
return k;
}
-void AgiEngine::clearKeyQueue(void) {
+void AgiEngine::clearKeyQueue() {
while (isKeypress()) {
getKeypress();
}
diff --git a/engines/agi/op_test.cpp b/engines/agi/op_test.cpp
index ca80798a52..16ceb2ef72 100644
--- a/engines/agi/op_test.cpp
+++ b/engines/agi/op_test.cpp
@@ -36,7 +36,7 @@ static uint8 testObjInBox(uint8, uint8, uint8, uint8, uint8);
static uint8 testPosn(uint8, uint8, uint8, uint8, uint8);
static uint8 testSaid(uint8, uint8 *);
static uint8 testController(uint8);
-static uint8 testKeypressed(void);
+static uint8 testKeypressed();
static uint8 testCompareStrings(uint8, uint8);
static AgiEngine *g_agi;
diff --git a/engines/agi/preagi.h b/engines/agi/preagi.h
index 89d120b0ae..0fe0064e76 100644
--- a/engines/agi/preagi.h
+++ b/engines/agi/preagi.h
@@ -41,10 +41,10 @@ protected:
void initialize();
public:
- void pollTimer(void) {}
- int getKeypress(void) { return 0; }
- bool isKeypress(void) { return false; }
- void clearKeyQueue(void) {}
+ void pollTimer() {}
+ int getKeypress() { return 0; }
+ bool isKeypress() { return false; }
+ void clearKeyQueue() {}
PreAgiEngine(OSystem *syst, const AGIGameDescription *gameDesc);
virtual ~PreAgiEngine();
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index c2f031ea75..ea674272e6 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -92,7 +92,7 @@ void bringWordtoTop(char *str, int wordnum) {
memcpy(str, tmp.c_str(), strlen(str));
}
-bool AgiEngine::predictiveDialog(void) {
+bool AgiEngine::predictiveDialog() {
int key = 0, active = -1, lastactive = 0;
bool rc = false;
uint8 x;
@@ -483,7 +483,7 @@ bool AgiEngine::predictiveDialog(void) {
return rc;
}
-void AgiEngine::loadDict(void) {
+void AgiEngine::loadDict() {
Common::File inFile;
int lines = 0;
@@ -550,7 +550,7 @@ void AgiEngine::loadDict(void) {
printf("Time to parse pred.dic: %d, total: %d\n", time3-time2, time3-time1);
}
-bool AgiEngine::matchWord(void) {
+bool AgiEngine::matchWord() {
if (_currentCode.empty()) {
return false;
}
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index df3667d312..431c190a8f 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -974,11 +974,11 @@ void AgiEngine::replayImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
}
}
-void AgiEngine::clearImageStack(void) {
+void AgiEngine::clearImageStack() {
_imageStack.clear();
}
-void AgiEngine::releaseImageStack(void) {
+void AgiEngine::releaseImageStack() {
_imageStack.clear();
}
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 5e52a66d91..7c0e895219 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -931,7 +931,7 @@ void SoundMgr::playSound() {
}
}
-uint32 SoundMgr::mixSound(void) {
+uint32 SoundMgr::mixSound() {
register int i, p;
const int16 *src;
int c, b, m;