diff options
39 files changed, 92 insertions, 92 deletions
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index e2af21320a..dadda65b30 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -235,7 +235,7 @@ public: virtual bool hasFeature(Feature f); virtual void setFeatureState(Feature f, bool enable); virtual bool getFeatureState(Feature f); - virtual void preprocessEvents(SDL_Event *event) {}; + virtual void preprocessEvents(SDL_Event *event) {} #ifdef USE_OSD void displayMessageOnOSD(const char *msg); diff --git a/common/rect.h b/common/rect.h index 54b219394c..dc97dcceec 100644 --- a/common/rect.h +++ b/common/rect.h @@ -41,8 +41,8 @@ struct Point { Point() : x(0), y(0) {} Point(int16 x1, int16 y1) : x(x1), y(y1) {} - bool operator==(const Point &p) const { return x == p.x && y == p.y; }; - bool operator!=(const Point &p) const { return x != p.x || y != p.y; }; + bool operator==(const Point &p) const { return x == p.x && y == p.y; } + bool operator!=(const Point &p) const { return x != p.x || y != p.y; } /** * Return the square of the distance between this point and the point p. diff --git a/engines/agi/wagparser.h b/engines/agi/wagparser.h index c10be541cb..c16d4092e7 100644 --- a/engines/agi/wagparser.h +++ b/engines/agi/wagparser.h @@ -150,25 +150,25 @@ public: /** * Was the property read ok from the source stream? */ - bool readOk() const { return _readOk; }; + bool readOk() const { return _readOk; } /** * Return the property's code. * @return The property's code if readOk(), PC_UNDEFINED otherwise. */ - enum WagPropertyCode getCode() const { return _propCode; }; + enum WagPropertyCode getCode() const { return _propCode; } /** * Return the property's type. * @return The property's type if readOk(), PT_UNDEFINED otherwise. */ - enum WagPropertyType getType() const { return _propType; }; + enum WagPropertyType getType() const { return _propType; } /** * Return the property's number. * @return The property's number if readOk(), 0 otherwise. */ - byte getNumber() const { return _propNum; }; + byte getNumber() const { return _propNum; } /** * Return the property's data's length. @@ -181,7 +181,7 @@ public: * Can be used as a C-style string (i.e. this is guaranteed to have a trailing zero). * @return The property's data if readOk(), NULL otherwise. */ - const char *getData() const { return _propData; }; + const char *getData() const { return _propData; } // Member variables protected: @@ -230,7 +230,7 @@ public: * @note Use only after a call to parse() first. * @return The list of loaded properties. */ - const PropertyList &getProperties() const { return _propList; }; + const PropertyList &getProperties() const { return _propList; } /** * Get property with the given property code. @@ -264,7 +264,7 @@ public: * Was the file parsed successfully? * @return True if file was parsed successfully, false otherwise. */ - bool parsedOk() const { return _parsedOk; }; + bool parsedOk() const { return _parsedOk; } protected: /** diff --git a/engines/agos/animation.h b/engines/agos/animation.h index f0a975f1d4..6a1bdccadf 100644 --- a/engines/agos/animation.h +++ b/engines/agos/animation.h @@ -71,7 +71,7 @@ public: private: virtual void handleNextFrame(); virtual bool processFrame() = 0; - virtual void startSound() {}; + virtual void startSound() {} }; class MoviePlayerDXA : public MoviePlayer, ::Graphics::DXADecoder { diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index ea49a5fa5e..e1f12b734e 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -253,7 +253,7 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual int getMaximumSaveSlot() const { return 99; }; + virtual int getMaximumSaveSlot() const { return 99; } virtual SaveStateList listSaves(const char *target) const; virtual void removeSaveState(const char *target, int slot) const; virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index ac809f8454..c3204fc656 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -110,7 +110,7 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual int getMaximumSaveSlot() const { return 99; }; + virtual int getMaximumSaveSlot() const { return 99; } virtual SaveStateList listSaves(const char *target) const; virtual void removeSaveState(const char *target, int slot) const; virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; diff --git a/engines/draci/font.h b/engines/draci/font.h index b80a2fbedf..010de66e2c 100644 --- a/engines/draci/font.h +++ b/engines/draci/font.h @@ -61,8 +61,8 @@ public: ~Font(); bool loadFont(const Common::String &filename); - uint8 getFontHeight() const { return _fontHeight; }; - uint8 getMaxCharWidth() const { return _maxCharWidth; }; + uint8 getFontHeight() const { return _fontHeight; } + uint8 getMaxCharWidth() const { return _maxCharWidth; } uint8 getCharWidth(byte chr) const; void drawChar(Surface *dst, uint8 chr, int tx, int ty, int with_colour) const; diff --git a/engines/draci/mouse.h b/engines/draci/mouse.h index c47ce5b33c..c7f492cb6e 100644 --- a/engines/draci/mouse.h +++ b/engines/draci/mouse.h @@ -49,7 +49,7 @@ class GameItem; class Mouse { public: Mouse(DraciEngine *vm); - ~Mouse() {}; + ~Mouse() {} void handleEvent(Common::Event event); void cursorOn(); diff --git a/engines/draci/script.h b/engines/draci/script.h index 3d5880575d..1551d3573c 100644 --- a/engines/draci/script.h +++ b/engines/draci/script.h @@ -97,7 +97,7 @@ class GameObject; class Script { public: - Script(DraciEngine *vm) : _vm(vm), _jump(0), _endProgram(false) { setupCommandList(); }; + Script(DraciEngine *vm) : _vm(vm), _jump(0), _endProgram(false) { setupCommandList(); } void run(const GPL2Program &program, uint16 offset); void runWrapper(const GPL2Program &program, uint16 offset, bool disableCursor, bool releaseAnims); diff --git a/engines/draci/sprite.h b/engines/draci/sprite.h index b889603e63..ddc56ecd80 100644 --- a/engines/draci/sprite.h +++ b/engines/draci/sprite.h @@ -51,7 +51,7 @@ public: virtual void draw(Surface *surface, bool markDirty, int relX, int relY) const = 0; virtual void drawReScaled(Surface *surface, bool markDirty, const Displacement &displacement) const = 0; - virtual ~Drawable() {}; + virtual ~Drawable() {} uint getWidth() const { return _width; } uint getHeight() const { return _height; } @@ -141,7 +141,7 @@ class Text : public Drawable { public: Text(const Common::String &str, const Font *font, byte fontColour, int x, int y, uint spacing); - ~Text() {}; + ~Text() {} void setText(const Common::String &str); void setColour(byte fontColour) { _colour = fontColour; } diff --git a/engines/groovie/player.h b/engines/groovie/player.h index d54601bc52..bb156d7929 100644 --- a/engines/groovie/player.h +++ b/engines/groovie/player.h @@ -40,8 +40,8 @@ public: bool load(Common::SeekableReadStream *file, uint16 flags); bool playFrame(); - virtual void resetFlags() {}; - virtual void setOrigin(int16 x, int16 y) {}; + virtual void resetFlags() {} + virtual void setOrigin(int16 x, int16 y) {} protected: // To be implemented by subclasses diff --git a/engines/groovie/resource.h b/engines/groovie/resource.h index 0cbcd43a89..405de538a9 100644 --- a/engines/groovie/resource.h +++ b/engines/groovie/resource.h @@ -36,7 +36,7 @@ struct ResInfo { class ResMan { public: - virtual ~ResMan() {}; + virtual ~ResMan() {} Common::SeekableReadStream *open(uint32 fileRef); virtual uint16 getRef(Common::String name, Common::String scriptname = "") = 0; @@ -51,7 +51,7 @@ protected: class ResMan_t7g : public ResMan { public: ResMan_t7g(); - ~ResMan_t7g() {}; + ~ResMan_t7g() {} uint16 getRef(Common::String name, Common::String scriptname); bool getResInfo(uint32 fileRef, ResInfo &resInfo); @@ -60,7 +60,7 @@ public: class ResMan_v2 : public ResMan { public: ResMan_v2(); - ~ResMan_v2() {}; + ~ResMan_v2() {} uint16 getRef(Common::String name, Common::String scriptname); bool getResInfo(uint32 fileRef, ResInfo &resInfo); diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h index 8703ee3ee6..654b7da6b7 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/screen.h @@ -532,7 +532,7 @@ protected: int _mouseLockCount; const uint8 _cursorColorKey; - virtual void postProcessCursor(uint8 *data, int w, int h, int pitch) {}; + virtual void postProcessCursor(uint8 *data, int w, int h, int pitch) {} enum { kMaxDirtyRects = 50 diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h index ddc7bdb1fa..ff22f790c9 100644 --- a/engines/kyra/script_tim.h +++ b/engines/kyra/script_tim.h @@ -260,8 +260,8 @@ protected: int cmd_stopAllFuncs(const uint16 *param); #define cmd_return(n, v) \ int cmd_return_##n(const uint16 *){ return v; } - cmd_return( 1, 1); - cmd_return(n1, -1); + cmd_return( 1, 1) + cmd_return(n1, -1) #undef cmd_return }; diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index 06e943557d..6671ab118d 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -699,7 +699,7 @@ public: class SequenceDelayData { private: - SequenceDelayData() {}; + SequenceDelayData() {} public: SequenceDelayData(uint16 delay, uint16 seqOffset, bool canClearFlag); static SequenceDelayData *load(uint32 delay, uint16 seqOffset, bool canClearFlag); diff --git a/engines/m4/console.h b/engines/m4/console.h index 008531c0ac..b592f041cf 100644 --- a/engines/m4/console.h +++ b/engines/m4/console.h @@ -66,7 +66,7 @@ private: bool cmdSceneInfo(int argc, const char **argv); public: MadsConsole(MadsEngine *vm); - virtual ~MadsConsole() {}; + virtual ~MadsConsole() {} }; class M4Console : public Console { @@ -76,7 +76,7 @@ private: bool cmdSceneInfo(int argc, const char **argv); public: M4Console(M4Engine *vm); - virtual ~M4Console() {}; + virtual ~M4Console() {} }; } // End of namespace M4 diff --git a/engines/m4/globals.h b/engines/m4/globals.h index 0a591d131f..4b0d7ce3d5 100644 --- a/engines/m4/globals.h +++ b/engines/m4/globals.h @@ -173,10 +173,10 @@ struct VocabEntry { class MadsObject { public: - MadsObject() {}; + MadsObject() {} MadsObject(Common::SeekableReadStream *stream); void load(Common::SeekableReadStream *stream); - bool isInInventory() const { return roomNumber == PLAYER_INVENTORY; }; + bool isInInventory() const { return roomNumber == PLAYER_INVENTORY; } uint16 descId; uint16 roomNumber; @@ -192,7 +192,7 @@ private: MadsM4Engine *_vm; public: Globals(MadsM4Engine *vm); - virtual ~Globals() {}; + virtual ~Globals() {} bool isInterfaceVisible(); @@ -203,7 +203,7 @@ private: M4Engine *_vm; public: M4Globals(M4Engine *vm); - virtual ~M4Globals() {}; + virtual ~M4Globals() {} bool invSuppressClickSound; }; diff --git a/engines/m4/gui.h b/engines/m4/gui.h index 343b6811fd..7e1c8bf070 100644 --- a/engines/m4/gui.h +++ b/engines/m4/gui.h @@ -213,9 +213,9 @@ enum MenuObjectState {OS_GREYED = 0, OS_NORMAL = 1, OS_MOUSEOVER = 2, OS_PRESSED class DialogView : public View { public: DialogView(MadsM4Engine *Vm, const Common::Rect &viewBounds, bool transparent = false): - View(Vm, viewBounds, transparent) {}; + View(Vm, viewBounds, transparent) {} DialogView(MadsM4Engine *Vm, int x = 0, int y = 0, bool transparent = false): - View(Vm, x, y, transparent) {}; + View(Vm, x, y, transparent) {} MadsM4Engine *vm() { return _vm; } virtual SpriteAsset *sprites() = 0; @@ -399,7 +399,7 @@ class GUIRect : public GUIObject { private: int _tag; public: - GUIRect(View *owner, const Common::Rect &bounds, int tag): GUIObject(owner, bounds) { _tag = tag; }; + GUIRect(View *owner, const Common::Rect &bounds, int tag): GUIObject(owner, bounds) { _tag = tag; } virtual bool onEvent(M4EventType eventType, int32 param, int x, int y, GUIObject *¤tItem) { return false; } int getTag() const { return _tag; } @@ -443,12 +443,12 @@ public: class GameInterfaceView : public View { public: - GameInterfaceView(MadsM4Engine *vm, const Common::Rect &rect): View(vm, rect) {}; - ~GameInterfaceView() {}; + GameInterfaceView(MadsM4Engine *vm, const Common::Rect &rect): View(vm, rect) {} + ~GameInterfaceView() {} - virtual void initialise() {}; - virtual void setSelectedObject(int objectNumber) {}; - virtual void addObjectToInventory(int objectNumber) {}; + virtual void initialise() {} + virtual void setSelectedObject(int objectNumber) {} + virtual void addObjectToInventory(int objectNumber) {} }; } diff --git a/engines/m4/m4.h b/engines/m4/m4.h index cadf03b944..618e942ba5 100644 --- a/engines/m4/m4.h +++ b/engines/m4/m4.h @@ -202,7 +202,7 @@ public: Animation *_animation; Common::RandomSource *_random; - Scene *scene() { return _scene; }; + Scene *scene() { return _scene; } }; class MadsEngine : public MadsM4Engine { @@ -216,8 +216,8 @@ public: virtual Common::Error run(); - MadsGlobals *globals() { return (MadsGlobals *)_globals; }; - MadsScene *scene() { return (MadsScene *)_scene; }; + MadsGlobals *globals() { return (MadsGlobals *)_globals; } + MadsScene *scene() { return (MadsScene *)_scene; } }; class M4Engine : public MadsM4Engine { @@ -229,8 +229,8 @@ public: virtual Common::Error run(); - M4Globals *globals() { return (M4Globals *)_globals; }; - M4Scene *scene() { return (M4Scene *)_scene; }; + M4Globals *globals() { return (M4Globals *)_globals; } + M4Scene *scene() { return (M4Scene *)_scene; } }; // FIXME: remove globals diff --git a/engines/m4/m4_scene.h b/engines/m4/m4_scene.h index 25546fe491..329582caf4 100644 --- a/engines/m4/m4_scene.h +++ b/engines/m4/m4_scene.h @@ -76,8 +76,8 @@ public: virtual void showHotSpots(); byte *getInverseColourTable() const { return _inverseColourTable; } - M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; }; - M4SceneResources &getSceneResources() { return _sceneResources; }; + M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; } + M4SceneResources &getSceneResources() { return _sceneResources; } void setStatusText(const char *text); void setAction(int action, int objectId = -1); }; diff --git a/engines/m4/mads_scene.h b/engines/m4/mads_scene.h index 0ed0d7cace..d5d3a5a477 100644 --- a/engines/m4/mads_scene.h +++ b/engines/m4/mads_scene.h @@ -206,8 +206,8 @@ public: void loadPlayerSprites(const char *prefix); void showMADSV2TextBox(char *text, int x, int y, char *faceName); - MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; }; - MadsSceneResources &getSceneResources() { return _sceneResources; }; + MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; } + MadsSceneResources &getSceneResources() { return _sceneResources; } MadsAction &getAction() { return _action; } void setStatusText(const char *text) {};//***DEPRECATED*** }; diff --git a/engines/m4/resource.h b/engines/m4/resource.h index b41b1b0799..eed6e6dcd9 100644 --- a/engines/m4/resource.h +++ b/engines/m4/resource.h @@ -94,7 +94,7 @@ protected: virtual Common::SeekableReadStream *loadResource(const char *resourceName, bool loadFlag) = 0; public: - ResourceManager(MadsM4Engine *vm): _vm(vm) {}; + ResourceManager(MadsM4Engine *vm): _vm(vm) {} virtual ~ResourceManager(); Common::SeekableReadStream *get(const char *resourceName, bool loadFlag = true); @@ -124,7 +124,7 @@ private: protected: Common::SeekableReadStream *loadResource(const char *resourceName, bool loadFlag); public: - MADSResourceManager(MadsM4Engine *vm): ResourceManager(vm) {}; + MADSResourceManager(MadsM4Engine *vm): ResourceManager(vm) {} bool resourceExists(const char *resourceName); static const char *getResourceName(char asciiCh, int prefix, ExtensionType extType, const char *suffix, int index); diff --git a/engines/m4/scene.h b/engines/m4/scene.h index be383605ec..5dafb138db 100644 --- a/engines/m4/scene.h +++ b/engines/m4/scene.h @@ -111,8 +111,8 @@ public: M4Surface *getBackgroundSurface() const { return _backgroundSurface; } void showInterface(); void hideInterface(); - GameInterfaceView *getInterface() { return _interfaceSurface; }; - SceneResources &getSceneResources() { return *_sceneResources; }; + GameInterfaceView *getInterface() { return _interfaceSurface; } + SceneResources &getSceneResources() { return *_sceneResources; } void onRefresh(RectList *rects, M4Surface *destSurface); bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents); diff --git a/engines/m4/script.h b/engines/m4/script.h index 1aeebbe57a..7382c05b67 100644 --- a/engines/m4/script.h +++ b/engines/m4/script.h @@ -88,10 +88,10 @@ struct ScriptValue { int value; }; - ScriptValue() : type(kInteger), value(0) {}; - ScriptValue(ScriptValueType itype, int ivalue) : type(itype), value(ivalue) {}; + ScriptValue() : type(kInteger), value(0) {} + ScriptValue(ScriptValueType itype, int ivalue) : type(itype), value(ivalue) {} - ScriptValue(const int intValue) : type(kInteger), value(intValue) {}; + ScriptValue(const int intValue) : type(kInteger), value(intValue) {} ScriptValue& operator=(const int intValue) { type = kInteger; diff --git a/engines/m4/viewmgr.h b/engines/m4/viewmgr.h index c3055c6706..dccfffb8aa 100644 --- a/engines/m4/viewmgr.h +++ b/engines/m4/viewmgr.h @@ -90,7 +90,7 @@ public: struct Hotkey { public: typedef void (*Callback)(MadsM4Engine *vm, View *view, uint32 key); - Hotkey(uint32 keyVal, Hotkey::Callback callbackFn) : key(keyVal), callback(callbackFn) {}; + Hotkey(uint32 keyVal, Hotkey::Callback callbackFn) : key(keyVal), callback(callbackFn) {} uint32 key; Hotkey::Callback callback; }; @@ -136,7 +136,7 @@ public: virtual void onRefresh(RectList *rects, M4Surface *destSurface); virtual bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) { return false; } - virtual void updateState() {}; + virtual void updateState() {} protected: MadsM4Engine *_vm; diff --git a/engines/metaengine.h b/engines/metaengine.h index ab549eee82..7519feaaa4 100644 --- a/engines/metaengine.h +++ b/engines/metaengine.h @@ -126,7 +126,7 @@ public: * @param target name of a config manager target * @param slot slot number of the save state to be removed */ - virtual void removeSaveState(const char *target, int slot) const {}; + virtual void removeSaveState(const char *target, int slot) const {} /** * Returns meta infos from the specified save state. diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp index 9d3b80a5ae..f63e2e3e77 100644 --- a/engines/sci/engine/kernel32.cpp +++ b/engines/sci/engine/kernel32.cpp @@ -382,7 +382,7 @@ void Kernel::setKernelNamesSci21(EngineState *s) { // Some SCI games use a modified SCI2 kernel table instead of the SCI2.1/SCI3 kernel table. // The GK2 demo does this as well as at least one version of KQ7. We detect which version // to use based on where kDoSound is called from Sound::play(). - + // This is interesting because they all have the same interpreter version (2.100.002), yet // they would not be compatible with other games of the same interpreter. @@ -634,7 +634,7 @@ reg_t kString(EngineState *s, int argc, reg_t *argv) { reg_t *adjustedArgs = new reg_t[argc]; adjustedArgs[0] = stringHandle; memcpy(&adjustedArgs[1], argv + 1, (argc - 1) * sizeof(reg_t)); - + kFormat(s, argc, adjustedArgs); delete[] adjustedArgs; return stringHandle; diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp index 6499e038bd..55873efc8b 100644 --- a/engines/sci/engine/kstring.cpp +++ b/engines/sci/engine/kstring.cpp @@ -274,7 +274,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) { #ifdef ENABLE_SCI32 // If the string is a string object, get to the actual string in the data selector - if (s->_segMan->isObject(reg)) + if (s->_segMan->isObject(reg)) reg = GET_SEL32(s->_segMan, reg, SELECTOR(data)); #endif @@ -400,7 +400,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) { free(arguments); *target = 0; /* Terminate string */ - + #ifdef ENABLE_SCI32 // Resize SCI32 strings if necessary if (getSciVersion() >= SCI_VERSION_2) { diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp index 84029392d1..a4f5da2b4e 100644 --- a/engines/sci/engine/message.cpp +++ b/engines/sci/engine/message.cpp @@ -53,7 +53,7 @@ public: virtual bool findRecord(const MessageTuple &tuple, MessageRecord &record) = 0; - virtual ~MessageReader() { }; + virtual ~MessageReader() { } protected: MessageReader(const byte *data, uint size, uint headerSize, uint recordSize) diff --git a/engines/sci/graphics/animate.h b/engines/sci/graphics/animate.h index 44b91024cd..2cc59b1767 100644 --- a/engines/sci/graphics/animate.h +++ b/engines/sci/graphics/animate.h @@ -104,7 +104,7 @@ public: void addToPicDrawCels(); void addToPicDrawView(GuiResourceId viewId, int16 loopNo, int16 celNo, int16 leftPos, int16 topPos, int16 priority, int16 control); - uint16 getLastCastCount() { return _lastCastCount; }; + uint16 getLastCastCount() { return _lastCastCount; } virtual void kernelAnimate(reg_t listReference, bool cycle, int argc, reg_t *argv); virtual void kernelAddToPicList(reg_t listReference, int argc, reg_t *argv); diff --git a/engines/sci/graphics/coordadjuster.h b/engines/sci/graphics/coordadjuster.h index 1aa79f25f3..9b2bef48f1 100644 --- a/engines/sci/graphics/coordadjuster.h +++ b/engines/sci/graphics/coordadjuster.h @@ -41,16 +41,16 @@ class GfxPorts; class GfxCoordAdjuster { public: GfxCoordAdjuster(); - virtual ~GfxCoordAdjuster() { }; + virtual ~GfxCoordAdjuster() { } - virtual void kernelGlobalToLocal(int16 &x, int16 &y, reg_t planeObject = NULL_REG) { }; - virtual void kernelLocalToGlobal(int16 &x, int16 &y, reg_t planeObject = NULL_REG) { }; + virtual void kernelGlobalToLocal(int16 &x, int16 &y, reg_t planeObject = NULL_REG) { } + virtual void kernelLocalToGlobal(int16 &x, int16 &y, reg_t planeObject = NULL_REG) { } - virtual Common::Rect onControl(Common::Rect rect) { return rect; }; - virtual void setCursorPos(Common::Point &pos) { }; - virtual void moveCursor(Common::Point &pos) { }; + virtual Common::Rect onControl(Common::Rect rect) { return rect; } + virtual void setCursorPos(Common::Point &pos) { } + virtual void moveCursor(Common::Point &pos) { } - virtual Common::Rect pictureGetDisplayArea() { return Common::Rect(0, 0); }; + virtual Common::Rect pictureGetDisplayArea() { return Common::Rect(0, 0); } private: }; diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h index f5e64986ea..6d8b6f7c9a 100644 --- a/engines/sci/graphics/screen.h +++ b/engines/sci/graphics/screen.h @@ -51,12 +51,12 @@ public: GfxScreen(ResourceManager *resMan, int16 width = 320, int16 height = 200, bool upscaledHires = false); ~GfxScreen(); - uint16 getWidth() { return _width; }; - uint16 getHeight() { return _height; }; - uint16 getDisplayWidth() { return _displayWidth; }; - uint16 getDisplayHeight() { return _displayHeight; }; - byte getColorWhite() { return _colorWhite; }; - byte getColorDefaultVectorData() { return _colorDefaultVectorData; }; + uint16 getWidth() { return _width; } + uint16 getHeight() { return _height; } + uint16 getDisplayWidth() { return _displayWidth; } + uint16 getDisplayHeight() { return _displayHeight; } + byte getColorWhite() { return _colorWhite; } + byte getColorDefaultVectorData() { return _colorDefaultVectorData; } void copyToScreen(); void copyFromScreen(byte *buffer); diff --git a/engines/sci/resource.h b/engines/sci/resource.h index 94ffe176d9..3b86c5aaaa 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -121,7 +121,7 @@ public: uint16 number; uint32 tuple; // Only used for audio36 and sync36 - ResourceId() : type(kResourceTypeInvalid), number(0), tuple(0) { }; + ResourceId() : type(kResourceTypeInvalid), number(0), tuple(0) { } ResourceId(ResourceType type_, uint16 number_, uint32 tuple_ = 0) : type(type_), number(number_), tuple(tuple_) { diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp index 2e6f625fd9..d413fc718b 100644 --- a/engines/scumm/player_nes.cpp +++ b/engines/scumm/player_nes.cpp @@ -101,7 +101,7 @@ public: int32 Pos; uint32 Cycles; // short - inline byte GetTimer() const { return Timer; }; + inline byte GetTimer() const { return Timer; } }; class Square : public SoundGen { diff --git a/engines/scumm/player_pce.h b/engines/scumm/player_pce.h index 99c7c80699..a87b6feb64 100644 --- a/engines/scumm/player_pce.h +++ b/engines/scumm/player_pce.h @@ -77,7 +77,7 @@ public: Player_PCE(ScummEngine *scumm, Audio::Mixer *mixer); virtual ~Player_PCE(); - virtual void setMusicVolume(int vol) { _maxvol = vol; }; + virtual void setMusicVolume(int vol) { _maxvol = vol; } void startMusic(int songResIndex); virtual void startSound(int sound); virtual void stopSound(int sound); diff --git a/engines/scumm/player_sid.h b/engines/scumm/player_sid.h index 1b643a8fbd..9e883abe74 100644 --- a/engines/scumm/player_sid.h +++ b/engines/scumm/player_sid.h @@ -59,7 +59,7 @@ public: Player_SID(ScummEngine *scumm, Audio::Mixer *mixer); virtual ~Player_SID(); - virtual void setMusicVolume(int vol) { _maxvol = vol; }; + virtual void setMusicVolume(int vol) { _maxvol = vol; } void startMusic(int songResIndex); virtual void startSound(int sound); virtual void stopSound(int sound); diff --git a/engines/scumm/smush/channel.h b/engines/scumm/smush/channel.h index b873bbdb30..c35ac0ac00 100644 --- a/engines/scumm/smush/channel.h +++ b/engines/scumm/smush/channel.h @@ -93,7 +93,7 @@ public: vol = _volume; pan = _pan; return true; - }; + } }; class ImuseChannel : public SmushChannel { @@ -123,7 +123,7 @@ public: vol = _volume; pan = _pan; return true; - }; + } }; } // End of namespace Scumm diff --git a/engines/sky/mouse.h b/engines/sky/mouse.h index a0e3ef4aaf..6237b9fd29 100644 --- a/engines/sky/mouse.h +++ b/engines/sky/mouse.h @@ -55,15 +55,15 @@ public: void restoreMouseData(uint16 frameNum); void drawNewMouse(); void spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY); - void useLogicInstance(Logic *skyLogic) { _skyLogic = skyLogic; }; + void useLogicInstance(Logic *skyLogic) { _skyLogic = skyLogic; } void buttonPressed(uint8 button); void mouseMoved(uint16 mouseX, uint16 mouseY); void waitMouseNotPressed(int minDelay = 0); - uint16 giveMouseX() { return _mouseX; }; - uint16 giveMouseY() { return _mouseY; }; - uint16 giveCurrentMouseType() { return _currentCursor; }; + uint16 giveMouseX() { return _mouseX; } + uint16 giveMouseY() { return _mouseY; } + uint16 giveCurrentMouseType() { return _currentCursor; } bool wasClicked(); - void logicClick() { _logicClick = true; }; + void logicClick() { _logicClick = true; } void resetCursor(); protected: diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h index 92734fa421..cab1050b47 100644 --- a/gui/ThemeParser.h +++ b/gui/ThemeParser.h @@ -210,7 +210,7 @@ protected: KEY_END() KEY_END() - } PARSER_END(); + } PARSER_END() /** Render info callbacks */ bool parserCallback_render_info(ParserNode *node); |