Patch #2973290: Semicolon cleanup

svn-id: r48359
This commit is contained in:
Max Horn 2010-03-22 20:28:08 +00:00
parent dd7891cdad
commit 92c896d883
39 changed files with 92 additions and 92 deletions

View file

@ -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);

View file

@ -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.

View file

@ -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:
/**

View file

@ -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 {

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -49,7 +49,7 @@ class GameItem;
class Mouse {
public:
Mouse(DraciEngine *vm);
~Mouse() {};
~Mouse() {}
void handleEvent(Common::Event event);
void cursorOn();

View file

@ -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);

View file

@ -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; }

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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
};

View file

@ -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);

View file

@ -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

View file

@ -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;
};

View file

@ -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 *&currentItem) { 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) {}
};
}

View file

@ -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

View file

@ -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);
};

View file

@ -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***
};

View file

@ -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);

View file

@ -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);

View file

@ -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;

View file

@ -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;

View file

@ -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.

View file

@ -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;

View file

@ -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) {

View file

@ -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)

View file

@ -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);

View file

@ -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:
};

View file

@ -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);

View file

@ -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_) {

View file

@ -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 {

View file

@ -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);

View file

@ -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);

View file

@ -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

View file

@ -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:

View file

@ -210,7 +210,7 @@ protected:
KEY_END()
KEY_END()
} PARSER_END();
} PARSER_END()
/** Render info callbacks */
bool parserCallback_render_info(ParserNode *node);