aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-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
4 files changed, 10 insertions, 10 deletions
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;