aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Avtalion2010-04-01 15:03:08 +0000
committerOri Avtalion2010-04-01 15:03:08 +0000
commitaee05cd21d5da6de39f23e5250af00f05a94fb5d (patch)
tree14402ede3869229d397aed504254f80cb67a8301
parent09da7ca563eb2f8b66adb7f245e39d666df3ae46 (diff)
downloadscummvm-rg350-aee05cd21d5da6de39f23e5250af00f05a94fb5d.tar.gz
scummvm-rg350-aee05cd21d5da6de39f23e5250af00f05a94fb5d.tar.bz2
scummvm-rg350-aee05cd21d5da6de39f23e5250af00f05a94fb5d.zip
Remove extra semicolons
svn-id: r48457
-rw-r--r--engines/kyra/lol.h2
-rw-r--r--engines/m4/globals.h6
-rw-r--r--engines/m4/mads_menus.h2
-rw-r--r--engines/m4/mads_scene.h2
-rw-r--r--engines/m4/mads_views.h2
-rw-r--r--engines/saga/resource.h2
-rw-r--r--engines/teenagent/pack.h2
7 files changed, 9 insertions, 9 deletions
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index 375c7f98fa..65ae6c2695 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -276,7 +276,7 @@ struct FireballState {
step = 10;
finalize = false;
finProgress = 0;
- };
+ }
bool active;
int16 destX;
diff --git a/engines/m4/globals.h b/engines/m4/globals.h
index 0ff67cb79c..92bc5e8242 100644
--- a/engines/m4/globals.h
+++ b/engines/m4/globals.h
@@ -262,9 +262,9 @@ public:
uint32 getQuotesSize() { return _madsQuotes.size(); }
const char *getQuote(uint32 index) { return _madsQuotes[index - 1]; }
// DEPRECATED: ScummVM re-implementation keeps all the quotes loaded, so the methods below are stubs
- void clearQuotes() {};
- void loadQuoteRange(int startNum, int endNum) {};
- void loadQuote(int quoteNum) {};
+ void clearQuotes() {}
+ void loadQuoteRange(int startNum, int endNum) {}
+ void loadQuote(int quoteNum) {}
void loadMadsMessagesInfo();
uint32 getMessagesSize() { return _madsMessages.size(); }
diff --git a/engines/m4/mads_menus.h b/engines/m4/mads_menus.h
index 278e07e3fd..50528d3c6e 100644
--- a/engines/m4/mads_menus.h
+++ b/engines/m4/mads_menus.h
@@ -104,7 +104,7 @@ public:
int textDisplay_index;
- DialogTextEntry() { in_use = false; };
+ DialogTextEntry() { in_use = false; }
};
#define DIALOG_LINES_SIZE 20
diff --git a/engines/m4/mads_scene.h b/engines/m4/mads_scene.h
index f8709c4bc5..317b5fb93c 100644
--- a/engines/m4/mads_scene.h
+++ b/engines/m4/mads_scene.h
@@ -208,7 +208,7 @@ public:
MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; }
MadsSceneResources &getSceneResources() { return _sceneResources; }
MadsAction &getAction() { return _action; }
- void setStatusText(const char *text) {};//***DEPRECATED***
+ void setStatusText(const char *text) {}//***DEPRECATED***
};
} // End of namespace M4
diff --git a/engines/m4/mads_views.h b/engines/m4/mads_views.h
index 8cd2024180..7dd991ffd6 100644
--- a/engines/m4/mads_views.h
+++ b/engines/m4/mads_views.h
@@ -50,7 +50,7 @@ public:
int depth;
int scale;
- MadsSpriteSlot() { };
+ MadsSpriteSlot() { }
};
#define SPRITE_SLOTS_SIZE 50
diff --git a/engines/saga/resource.h b/engines/saga/resource.h
index 34341f50f0..dd79b7ed24 100644
--- a/engines/saga/resource.h
+++ b/engines/saga/resource.h
@@ -277,7 +277,7 @@ public:
Resource_RES(SagaEngine *vm) : Resource(vm) {}
virtual uint32 convertResourceId(uint32 resourceId) { return resourceId; }
virtual void loadGlobalResources(int chapter, int actorsEntrance);
- virtual MetaResource* getMetaResource() { return &_metaResource; };
+ virtual MetaResource* getMetaResource() { return &_metaResource; }
protected:
virtual ResourceContext *createContext() {
return new ResourceContext_RES();
diff --git a/engines/teenagent/pack.h b/engines/teenagent/pack.h
index 753941673c..a24091e153 100644
--- a/engines/teenagent/pack.h
+++ b/engines/teenagent/pack.h
@@ -36,7 +36,7 @@ protected:
uint32 _fileCount;
public:
Pack(): _fileCount(0) {}
- virtual ~Pack() {};
+ virtual ~Pack() {}
virtual bool open(const Common::String &filename) = 0;
virtual void close() = 0;