aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
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/sci
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/sci')
-rw-r--r--engines/sci/engine/kpathing.cpp2
-rw-r--r--engines/sci/engine/said.y4
-rw-r--r--engines/sci/gui/gui_animate.h2
-rw-r--r--engines/sci/gui/gui_controls.h2
-rw-r--r--engines/sci/gui/gui_gfx.cpp4
-rw-r--r--engines/sci/gui/gui_gfx.h2
-rw-r--r--engines/sci/gui/gui_portrait.h2
-rw-r--r--engines/sci/gui/gui_text.h2
-rw-r--r--engines/sci/gui/gui_transitions.h2
-rw-r--r--engines/sci/resource.h2
-rw-r--r--engines/sci/sfx/core.cpp4
-rw-r--r--engines/sci/sfx/seq/gm.cpp4
12 files changed, 16 insertions, 16 deletions
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 3e46586914..c4cb899262 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -689,7 +689,7 @@ static void clockwise(const Vertex *vertex_cur, const Vertex *v, const Common::P
// Orders the points of an edge clockwise around vertex_cur. If all three
// points are collinear the original order is used
// Parameters: (const Vertex *) v: The first vertex of the edge
- // Returns : (void)
+ // Returns : ()
// (const Common::Point *&) p1: The first point in clockwise order
// (const Common::Point *&) p2: The second point in clockwise order
Vertex *w = CLIST_NEXT(v);
diff --git a/engines/sci/engine/said.y b/engines/sci/engine/said.y
index 02350e0d60..1a3b2f52c8 100644
--- a/engines/sci/engine/said.y
+++ b/engines/sci/engine/said.y
@@ -100,7 +100,7 @@ static tree_t said_paren(tree_t, tree_t);
static tree_t said_value(int, tree_t);
static tree_t said_terminal(int);
-static int yylex(void);
+static int yylex();
static int yyerror(const char *s) {
said_parse_error = strdup(s);
@@ -237,7 +237,7 @@ recref : YY_LT wordset recref
int parse_yy_token_lookup[] = {YY_COMMA, YY_AMP, YY_SLASH, YY_PARENO, YY_PARENC, YY_BRACKETSO, YY_BRACKETSC, YY_HASH, YY_LT, YY_GT};
-static int yylex(void) {
+static int yylex() {
int retval = said_tokens[said_token++];
if (retval < SAID_LONG(SAID_FIRST)) {
diff --git a/engines/sci/gui/gui_animate.h b/engines/sci/gui/gui_animate.h
index f3c19448e0..ca6400d0da 100644
--- a/engines/sci/gui/gui_animate.h
+++ b/engines/sci/gui/gui_animate.h
@@ -77,7 +77,7 @@ public:
void addToPicDrawView(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, int16 leftPos, int16 topPos, int16 priority, int16 control);
private:
- void init(void);
+ void init();
EngineState *_s;
SciGuiGfx *_gfx;
diff --git a/engines/sci/gui/gui_controls.h b/engines/sci/gui/gui_controls.h
index 426cd6b96e..95e4a0e34f 100644
--- a/engines/sci/gui/gui_controls.h
+++ b/engines/sci/gui/gui_controls.h
@@ -42,7 +42,7 @@ public:
void TexteditChange(reg_t controlObject, reg_t eventObject);
private:
- void init(void);
+ void init();
void TexteditSetBlinkTime();
SegManager *_segMan;
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index b87079b69f..021c9e7d6c 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -93,7 +93,7 @@ GuiPort *SciGuiGfx::SetPort(GuiPort *newPort) {
return oldPort;
}
-GuiPort *SciGuiGfx::GetPort(void) {
+GuiPort *SciGuiGfx::GetPort() {
return _curPort;
}
@@ -146,7 +146,7 @@ void SciGuiGfx::TextFace(int16 textFace) {
_curPort->textFace = textFace;
}
-int16 SciGuiGfx::GetPointSize(void) {
+int16 SciGuiGfx::GetPointSize() {
return _curPort->fontHeight;
}
diff --git a/engines/sci/gui/gui_gfx.h b/engines/sci/gui/gui_gfx.h
index 28242d41b7..a5d1d35cee 100644
--- a/engines/sci/gui/gui_gfx.h
+++ b/engines/sci/gui/gui_gfx.h
@@ -69,7 +69,7 @@ public:
void BackColor(int16 color);
void PenMode(int16 mode);
void TextFace(int16 textFace);
- int16 GetPointSize(void);
+ int16 GetPointSize();
void ClearScreen(byte color = 255);
void InvertRect(const Common::Rect &rect);
diff --git a/engines/sci/gui/gui_portrait.h b/engines/sci/gui/gui_portrait.h
index 3305c53f93..b97f3dd2a6 100644
--- a/engines/sci/gui/gui_portrait.h
+++ b/engines/sci/gui/gui_portrait.h
@@ -34,7 +34,7 @@ public:
~SciGuiPortrait();
private:
- void init(void);
+ void init();
ResourceManager *_resMan;
SciGuiScreen *_screen;
diff --git a/engines/sci/gui/gui_text.h b/engines/sci/gui/gui_text.h
index 75bd90e326..8002cdcf0c 100644
--- a/engines/sci/gui/gui_text.h
+++ b/engines/sci/gui/gui_text.h
@@ -66,7 +66,7 @@ public:
SciGuiFont *_font;
private:
- void init(void);
+ void init();
ResourceManager *_resMan;
SciGuiGfx *_gfx;
diff --git a/engines/sci/gui/gui_transitions.h b/engines/sci/gui/gui_transitions.h
index 279a086d86..b20e22fa5b 100644
--- a/engines/sci/gui/gui_transitions.h
+++ b/engines/sci/gui/gui_transitions.h
@@ -69,7 +69,7 @@ public:
void doit(Common::Rect picRect);
private:
- void init(void);
+ void init();
const GuiTransitionTranslateEntry *translateNumber(int16 number, const GuiTransitionTranslateEntry *tablePtr);
void doTransition(int16 number, bool blackout);
void setNewPalette(bool blackoutFlag);
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index 6f00425402..4478bebf31 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -246,7 +246,7 @@ public:
/* Unlocks a previously locked resource
** (Resource *) res: The resource to free
- ** Returns : (void)
+ ** Returns : ()
*/
void unlockResource(Resource *res);
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index 01177837b2..acc89f6df8 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -136,7 +136,7 @@ public:
void setVolume(int vol);
- int getVolume(void);
+ int getVolume();
};
SfxPlayer::SfxPlayer() {
@@ -324,7 +324,7 @@ void SfxPlayer::setVolume(int vol) {
_mididrv->setVolume(vol);
}
-int SfxPlayer::getVolume(void) {
+int SfxPlayer::getVolume() {
return _mididrv->getVolume();
}
diff --git a/engines/sci/sfx/seq/gm.cpp b/engines/sci/sfx/seq/gm.cpp
index 2fe5675150..f1937e063a 100644
--- a/engines/sci/sfx/seq/gm.cpp
+++ b/engines/sci/sfx/seq/gm.cpp
@@ -52,7 +52,7 @@ static Common::Error midi_gm_open(int patch_len, byte *data, int patch2_len, byt
return Common::kNoError;
}
-static Common::Error midi_gm_close(void) {
+static Common::Error midi_gm_close() {
return Common::kNoError;
}
@@ -101,7 +101,7 @@ static Common::Error midi_gm_volume(uint8 volume) {
return Common::kNoError;
}
-static Common::Error midi_gm_allstop(void) {
+static Common::Error midi_gm_allstop() {
byte data[3] = { 0xb0,
0x78, /* all sound off */
0