aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/platform/sdl/sdl-common.h2
-rw-r--r--common/system.h8
-rw-r--r--engines/gob/draw.h6
-rw-r--r--engines/gob/game.h4
-rw-r--r--engines/gob/goblin.h4
-rw-r--r--engines/gob/init.h6
-rw-r--r--engines/gob/inter.h2
-rw-r--r--engines/gob/mult.h2
-rw-r--r--engines/gob/parse.h6
-rw-r--r--engines/gob/scenery.h4
-rw-r--r--engines/gob/video.h4
-rw-r--r--engines/queen/command.h2
-rw-r--r--engines/scumm/he/logic_he.h10
-rw-r--r--engines/scumm/he/resource_he.h6
-rw-r--r--engines/scumm/player_v2a.cpp2
-rw-r--r--engines/scumm/smush/smush_player.cpp2
-rw-r--r--engines/sky/control.h8
-rw-r--r--engines/sky/disk.h2
-rw-r--r--engines/sky/logic.h2
-rw-r--r--engines/sky/screen.h8
-rw-r--r--engines/sky/sound.h2
-rw-r--r--engines/sword1/credits.h2
-rw-r--r--engines/sword1/sound.h8
-rw-r--r--engines/sword2/screen.cpp2
-rw-r--r--graphics/font.h4
-rw-r--r--gui/theme.h2
-rw-r--r--sound/adpcm.cpp2
-rw-r--r--sound/mixer.h2
28 files changed, 57 insertions, 57 deletions
diff --git a/backends/platform/sdl/sdl-common.h b/backends/platform/sdl/sdl-common.h
index 58ebb72bd1..7703a1a511 100644
--- a/backends/platform/sdl/sdl-common.h
+++ b/backends/platform/sdl/sdl-common.h
@@ -117,7 +117,7 @@ public:
void disableCursorPalette(bool disable) {
_cursorPaletteDisabled = disable;
blitCursor();
- };
+ }
// Shaking is used in SCUMM. Set current shake position.
void setShakePos(int shake_pos);
diff --git a/common/system.h b/common/system.h
index 4f2f1c37fe..c1ff066095 100644
--- a/common/system.h
+++ b/common/system.h
@@ -352,14 +352,14 @@ public:
* of the relevant methods simply do nothing.
* @see endGFXTransaction
*/
- virtual void beginGFXTransaction() {};
+ virtual void beginGFXTransaction() {}
/**
* End (and thereby commit) the current GFX transaction.
* @see beginGFXTransaction
*/
- virtual void endGFXTransaction() {};
+ virtual void endGFXTransaction() {}
/**
@@ -656,7 +656,7 @@ public:
* @see setPalette
* @see kFeatureCursorHasPalette
*/
- virtual void setCursorPalette(const byte *colors, uint start, uint num) {};
+ virtual void setCursorPalette(const byte *colors, uint start, uint num) {}
/**
* Disable or enable cursor palette.
@@ -668,7 +668,7 @@ public:
* @see setPalette
* @see kFeatureCursorHasPalette
*/
- virtual void disableCursorPalette(bool disable) {};
+ virtual void disableCursorPalette(bool disable) {}
//@}
diff --git a/engines/gob/draw.h b/engines/gob/draw.h
index 8e973a8ee5..106b8c5be0 100644
--- a/engines/gob/draw.h
+++ b/engines/gob/draw.h
@@ -154,7 +154,7 @@ public:
virtual void spriteOperation(int16 operation) = 0;
Draw(GobEngine *vm);
- virtual ~Draw() {};
+ virtual ~Draw() {}
protected:
GobEngine *_vm;
@@ -170,7 +170,7 @@ public:
virtual void spriteOperation(int16 operation);
Draw_v1(GobEngine *vm);
- virtual ~Draw_v1() {};
+ virtual ~Draw_v1() {}
};
class Draw_v2 : public Draw_v1 {
@@ -183,7 +183,7 @@ public:
virtual void spriteOperation(int16 operation);
Draw_v2(GobEngine *vm);
- virtual ~Draw_v2() {};
+ virtual ~Draw_v2() {}
};
class Draw_Bargon: public Draw_v2 {
diff --git a/engines/gob/game.h b/engines/gob/game.h
index 244cc1b6e9..349d95ba86 100644
--- a/engines/gob/game.h
+++ b/engines/gob/game.h
@@ -248,7 +248,7 @@ public:
virtual void prepareStart(void);
Game_v1(GobEngine *vm);
- virtual ~Game_v1() {};
+ virtual ~Game_v1() {}
protected:
virtual void pushCollisions(char all);
@@ -276,7 +276,7 @@ public:
virtual void prepareStart(void);
Game_v2(GobEngine *vm);
- virtual ~Game_v2() {};
+ virtual ~Game_v2() {}
protected:
struct CollLast {
diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h
index f8bddff332..d6e5cdf6d7 100644
--- a/engines/gob/goblin.h
+++ b/engines/gob/goblin.h
@@ -271,7 +271,7 @@ public:
int16 nextAct, int16 framesCount);
Goblin_v1(GobEngine *vm);
- virtual ~Goblin_v1() {};
+ virtual ~Goblin_v1() {}
protected:
virtual bool isMovement(int8 state) { return false; }
@@ -291,7 +291,7 @@ public:
int16 nextAct, int16 framesCount);
Goblin_v2(GobEngine *vm);
- virtual ~Goblin_v2() {};
+ virtual ~Goblin_v2() {}
protected:
virtual bool isMovement(int8 state);
diff --git a/engines/gob/init.h b/engines/gob/init.h
index d64dcb91a0..61a09c1295 100644
--- a/engines/gob/init.h
+++ b/engines/gob/init.h
@@ -35,7 +35,7 @@ public:
virtual void initVideo() = 0;
Init(GobEngine *vm);
- virtual ~Init() {};
+ virtual ~Init() {}
protected:
Video::PalDesc *_palDesc;
@@ -50,7 +50,7 @@ public:
virtual void initVideo();
Init_v1(GobEngine *vm);
- virtual ~Init_v1() {};
+ virtual ~Init_v1() {}
};
class Init_v2 : public Init_v1 {
@@ -58,7 +58,7 @@ public:
virtual void initVideo();
Init_v2(GobEngine *vm);
- virtual ~Init_v2() {};
+ virtual ~Init_v2() {}
};
class Init_v3 : public Init_v2 {
diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index cd685bd27e..a684c26af9 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -61,7 +61,7 @@ public:
virtual void animPalette() = 0;
Inter(GobEngine *vm);
- virtual ~Inter() {};
+ virtual ~Inter() {}
protected:
struct OpFuncParams {
diff --git a/engines/gob/mult.h b/engines/gob/mult.h
index 7f318e8a7f..4be1290a87 100644
--- a/engines/gob/mult.h
+++ b/engines/gob/mult.h
@@ -293,7 +293,7 @@ protected:
class Mult_v1 : public Mult {
public:
Mult_v1(GobEngine *vm);
- virtual ~Mult_v1() {};
+ virtual ~Mult_v1() {}
virtual void loadMult(int16 resId);
virtual void freeMultKeys();
diff --git a/engines/gob/parse.h b/engines/gob/parse.h
index 27a6f50b1c..22853e24f0 100644
--- a/engines/gob/parse.h
+++ b/engines/gob/parse.h
@@ -36,7 +36,7 @@ public:
virtual int16 parseExpr(byte stopToken, byte *resultPtr) = 0;
Parse(GobEngine *vm);
- virtual ~Parse() {};
+ virtual ~Parse() {}
protected:
enum PointerType {
@@ -56,7 +56,7 @@ protected:
class Parse_v1 : public Parse {
public:
Parse_v1(GobEngine *vm);
- virtual ~Parse_v1() {};
+ virtual ~Parse_v1() {}
virtual int16 parseVarIndex(void);
virtual int16 parseValExpr(byte stopToken = 99);
@@ -66,7 +66,7 @@ public:
class Parse_v2 : public Parse_v1 {
public:
Parse_v2(GobEngine *vm);
- virtual ~Parse_v2() {};
+ virtual ~Parse_v2() {}
virtual int16 parseVarIndex(void);
virtual int16 parseValExpr(byte stopToken = 99);
diff --git a/engines/gob/scenery.h b/engines/gob/scenery.h
index 864b74f18d..365bbd326c 100644
--- a/engines/gob/scenery.h
+++ b/engines/gob/scenery.h
@@ -156,7 +156,7 @@ public:
virtual int16 loadAnim(char search);
Scenery_v1(GobEngine *vm);
- virtual ~Scenery_v1() {};
+ virtual ~Scenery_v1() {}
};
class Scenery_v2 : public Scenery_v1 {
@@ -164,7 +164,7 @@ public:
virtual int16 loadAnim(char search);
Scenery_v2(GobEngine *vm);
- virtual ~Scenery_v2() {};
+ virtual ~Scenery_v2() {}
};
} // End of namespace Gob
diff --git a/engines/gob/video.h b/engines/gob/video.h
index 265392a7a2..3a409b9ea9 100644
--- a/engines/gob/video.h
+++ b/engines/gob/video.h
@@ -168,7 +168,7 @@ public:
int16 x, int16 y, int16 transp, SurfaceDesc *destDesc);
Video_v1(GobEngine *vm);
- virtual ~Video_v1() {};
+ virtual ~Video_v1() {}
};
class Video_v2 : public Video_v1 {
@@ -177,7 +177,7 @@ public:
int16 x, int16 y, int16 transp, SurfaceDesc *destDesc);
Video_v2(GobEngine *vm);
- virtual ~Video_v2() {};
+ virtual ~Video_v2() {}
};
class VideoDriver {
diff --git a/engines/queen/command.h b/engines/queen/command.h
index 98218ee1b3..659b67f8ed 100644
--- a/engines/queen/command.h
+++ b/engines/queen/command.h
@@ -185,7 +185,7 @@ private:
void lookForCurrentIcon(int16 cx, int16 cy);
//! returns true if the verb is an action verb
- bool isVerbAction(Verb v) const { return (v >= VERB_PANEL_COMMAND_FIRST && v <= VERB_PANEL_COMMAND_LAST) || (v == VERB_WALK_TO); };
+ bool isVerbAction(Verb v) const { return (v >= VERB_PANEL_COMMAND_FIRST && v <= VERB_PANEL_COMMAND_LAST) || (v == VERB_WALK_TO); }
//! return true if the verb is an inventory item
bool isVerbInv(Verb v) const { return v >= VERB_INV_FIRST && v <= VERB_INV_LAST; }
diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h
index e0f70ff52a..1f2303da1f 100644
--- a/engines/scumm/he/logic_he.h
+++ b/engines/scumm/he/logic_he.h
@@ -40,11 +40,11 @@ public:
int getFromArray(int arg0, int idx2, int idx1);
void putInArray(int arg0, int idx2, int idx1, int val);
- void beforeBootScript(void) {};
- void initOnce() {};
- void startOfFrame() {};
- void endOfFrame() {};
- void processKeyStroke(int keyPressed) {};
+ void beforeBootScript(void) {}
+ void initOnce() {}
+ void startOfFrame() {}
+ void endOfFrame() {}
+ void processKeyStroke(int keyPressed) {}
virtual int versionID();
virtual int32 dispatch(int op, int numArgs, int32 *args);
diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h
index c04055962e..411dd375e2 100644
--- a/engines/scumm/he/resource_he.h
+++ b/engines/scumm/he/resource_he.h
@@ -118,10 +118,10 @@ public:
void setCursor(int id);
- virtual int extractResource(int id, byte **buf) { return 0; };
+ virtual int extractResource(int id, byte **buf) { return 0; }
virtual int convertIcons(byte *data, int datasize, byte **cursor, int *w, int *h,
int *hotspot_x, int *hotspot_y, int *keycolor,
- byte **palette, int *palSize) { return 0; };
+ byte **palette, int *palSize) { return 0; }
enum {
MAX_CACHED_CURSORS = 10
@@ -154,7 +154,7 @@ public:
class Win32ResExtractor : public ResExtractor {
public:
Win32ResExtractor(ScummEngine_v70he *scumm);
- ~Win32ResExtractor() {};
+ ~Win32ResExtractor() {}
int extractResource(int id, byte **data);
void setCursor(int id);
int convertIcons(byte *data, int datasize, byte **cursor, int *w, int *h,
diff --git a/engines/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp
index e1f36464bb..5957e2378f 100644
--- a/engines/scumm/player_v2a.cpp
+++ b/engines/scumm/player_v2a.cpp
@@ -63,7 +63,7 @@ static uint32 GetCRC (byte *data, int len)
class V2A_Sound {
public:
V2A_Sound() : _id(0), _mod(NULL) { }
- virtual ~V2A_Sound() {};
+ virtual ~V2A_Sound() {}
virtual void start(Player_MOD *mod, int id, const byte *data) = 0;
virtual bool update() = 0;
virtual void stop() = 0;
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 79930160a9..0b5a1450e5 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -82,7 +82,7 @@ public:
StringResource() :
_nbStrings(0),
_lastId(-1) {
- };
+ }
~StringResource() {
for (int32 i = 0; i < _nbStrings; i++) {
delete []_strings[i].string;
diff --git a/engines/sky/control.h b/engines/sky/control.h
index 4143772495..efccd268f4 100644
--- a/engines/sky/control.h
+++ b/engines/sky/control.h
@@ -133,10 +133,10 @@ struct AllocedMem {
class ConResource {
public:
ConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen);
- virtual ~ConResource(void) {};
- void setSprite(void *pSpData) { _spriteData = (dataFileHeader*)pSpData; };
- void setText(uint32 pText) { if (pText) _text = pText + 0x7000; else _text = 0; };
- void setXY(uint16 x, uint16 y) { _x = x; _y = y; };
+ virtual ~ConResource(void) {}
+ void setSprite(void *pSpData) { _spriteData = (dataFileHeader*)pSpData; }
+ void setText(uint32 pText) { if (pText) _text = pText + 0x7000; else _text = 0; }
+ void setXY(uint16 x, uint16 y) { _x = x; _y = y; }
bool isMouseOver(uint32 mouseX, uint32 mouseY);
virtual void drawToScreen(bool doMask);
diff --git a/engines/sky/disk.h b/engines/sky/disk.h
index 99cb105740..df0b8e380f 100644
--- a/engines/sky/disk.h
+++ b/engines/sky/disk.h
@@ -54,7 +54,7 @@ public:
void fnCacheChip(uint16 *fList);
void fnCacheFiles(void);
void fnFlushBuffers(void);
- uint32 *giveLoadedFilesList(void) { return _loadedFilesList; };
+ uint32 *giveLoadedFilesList(void) { return _loadedFilesList; }
void refreshFilesList(uint32 *list);
protected:
diff --git a/engines/sky/logic.h b/engines/sky/logic.h
index 53752ca88f..d1189bbef0 100644
--- a/engines/sky/logic.h
+++ b/engines/sky/logic.h
@@ -143,7 +143,7 @@ public:
Sound *skySound);
~Logic(void);
void engine();
- void useControlInstance(Control *control) { _skyControl = control; };
+ void useControlInstance(Control *control) { _skyControl = control; }
uint16 mouseScript(uint32 scrNum, Compact *scriptComp);
diff --git a/engines/sky/screen.h b/engines/sky/screen.h
index 872d6cf613..15223b0c3e 100644
--- a/engines/sky/screen.h
+++ b/engines/sky/screen.h
@@ -71,14 +71,14 @@ public:
void startSequence(uint16 fileNum);
void startSequenceItem(uint16 itemNum);
void stopSequence(void);
- bool sequenceRunning(void) { return _seqInfo.running; };
+ bool sequenceRunning(void) { return _seqInfo.running; }
void waitForSequence(void);
- uint32 seqFramesLeft(void) { return _seqInfo.framesLeft; };
- uint8 *giveCurrent(void) { return _currentScreen; };
+ uint32 seqFramesLeft(void) { return _seqInfo.framesLeft; }
+ uint8 *giveCurrent(void) { return _currentScreen; }
void halvePalette(void);
//- regular screen.asm routines
- void forceRefresh(void) { memset(_gameGrid, 0x80, GRID_X * GRID_Y); };
+ void forceRefresh(void) { memset(_gameGrid, 0x80, GRID_X * GRID_Y); }
void fnFadeUp(uint32 palNum, uint32 scroll);
void fnFadeDown(uint32 scroll);
void fnDrawScreen(uint32 palette, uint32 scroll);
diff --git a/engines/sky/sound.h b/engines/sky/sound.h
index b515e0e8a4..4d7456195e 100644
--- a/engines/sky/sound.h
+++ b/engines/sky/sound.h
@@ -70,7 +70,7 @@ public:
void playSound(uint16 sound, uint16 volume, uint8 channel);
void fnStartFx(uint32 sound, uint8 channel);
bool startSpeech(uint16 textNum);
- bool speechFinished(void) { return !_mixer->isSoundHandleActive(_ingameSpeech); };
+ bool speechFinished(void) { return !_mixer->isSoundHandleActive(_ingameSpeech); }
void fnPauseFx(void);
void fnUnPauseFx(void);
void fnStopFx(void);
diff --git a/engines/sword1/credits.h b/engines/sword1/credits.h
index 5a60cc320d..bce2678cd3 100644
--- a/engines/sword1/credits.h
+++ b/engines/sword1/credits.h
@@ -40,7 +40,7 @@ public:
uint8 *fetchFile(uint32 fileId, uint32 *size = NULL);
uint8 *decompressFile(uint32 fileId);
void enterPath(uint32 id);
- void backToRoot(void) { _bufPos = _buf; };
+ void backToRoot(void) { _bufPos = _buf; }
private:
uint8 *_bufPos;
uint8 *_buf;
diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h
index ddd0f017f3..2542c02b9e 100644
--- a/engines/sword1/sound.h
+++ b/engines/sword1/sound.h
@@ -72,10 +72,10 @@ class Sound {
public:
Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan);
~Sound(void);
- void setSpeechVol(uint8 volL, uint8 volR) { _speechVolL = volL; _speechVolR = volR; };
- void setSfxVol(uint8 volL, uint8 volR) { _sfxVolL = volL; _sfxVolR = volR; };
- void giveSpeechVol(uint8 *volL, uint8 *volR) { *volL = _speechVolL; *volR = _speechVolR; };
- void giveSfxVol(uint8 *volL, uint8 *volR) { *volL = _sfxVolL; *volR = _sfxVolR; };
+ void setSpeechVol(uint8 volL, uint8 volR) { _speechVolL = volL; _speechVolR = volR; }
+ void setSfxVol(uint8 volL, uint8 volR) { _sfxVolL = volL; _sfxVolR = volR; }
+ void giveSpeechVol(uint8 *volL, uint8 *volR) { *volL = _speechVolL; *volR = _speechVolR; }
+ void giveSfxVol(uint8 *volL, uint8 *volR) { *volL = _sfxVolL; *volR = _sfxVolR; }
void newScreen(uint32 screen);
void quitScreen(void);
void closeCowSystem(void);
diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp
index cd02af76fa..603a4d4d90 100644
--- a/engines/sword2/screen.cpp
+++ b/engines/sword2/screen.cpp
@@ -798,7 +798,7 @@ struct CreditsLine {
CreditsLine() {
str = NULL;
sprite = NULL;
- };
+ }
~CreditsLine() {
free(str);
diff --git a/graphics/font.h b/graphics/font.h
index 4c271903c5..263bedd96d 100644
--- a/graphics/font.h
+++ b/graphics/font.h
@@ -81,7 +81,7 @@ public:
class ScummFont : public Font {
public:
virtual int getFontHeight() const { return 8; }
- virtual int getMaxCharWidth() const { return 8; };
+ virtual int getMaxCharWidth() const { return 8; }
virtual int getCharWidth(byte chr) const;
virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
@@ -126,7 +126,7 @@ public:
~NewFont();
virtual int getFontHeight() const { return desc.height; }
- virtual int getMaxCharWidth() const { return desc.maxwidth; };
+ virtual int getMaxCharWidth() const { return desc.maxwidth; }
virtual int getCharWidth(byte chr) const;
virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
diff --git a/gui/theme.h b/gui/theme.h
index 7f04063391..b8055819d5 100644
--- a/gui/theme.h
+++ b/gui/theme.h
@@ -183,7 +183,7 @@ public:
break;
};
return Graphics::kTextAlignCenter;
- };
+ }
TextAlign convertAligment(Graphics::TextAlignment align) const {
switch (align) {
diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp
index c6feb45aee..72564d7022 100644
--- a/sound/adpcm.cpp
+++ b/sound/adpcm.cpp
@@ -69,7 +69,7 @@ private:
public:
ADPCMInputStream(Common::SeekableReadStream *stream, uint32 size, typesADPCM type, int rate, int channels = 2, uint32 blockAlign = 0);
- ~ADPCMInputStream() {};
+ ~ADPCMInputStream() {}
int readBuffer(int16 *buffer, const int numSamples);
int readBufferOKI(int16 *buffer, const int numSamples);
diff --git a/sound/mixer.h b/sound/mixer.h
index 5dfef06090..a0a7c93aed 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -132,7 +132,7 @@ public:
*
* @return whether the mixer is ready and setup
*/
- bool isReady() const { return _mixerReady; };
+ bool isReady() const { return _mixerReady; }
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-17 06:33:20 +0000