diff options
Diffstat (limited to 'engines/sci')
-rw-r--r-- | engines/sci/engine/kernel32.cpp | 4 | ||||
-rw-r--r-- | engines/sci/engine/kstring.cpp | 4 | ||||
-rw-r--r-- | engines/sci/engine/message.cpp | 2 | ||||
-rw-r--r-- | engines/sci/graphics/animate.h | 2 | ||||
-rw-r--r-- | engines/sci/graphics/coordadjuster.h | 14 | ||||
-rw-r--r-- | engines/sci/graphics/screen.h | 12 | ||||
-rw-r--r-- | engines/sci/resource.h | 2 |
7 files changed, 20 insertions, 20 deletions
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_) { |