diff options
| author | Einar Johan Trøan Sømåen | 2012-08-31 19:38:24 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-31 20:00:40 +0200 |
| commit | 8cf7d765c05bd13fc381e94801b2bbd8c27e1c07 (patch) | |
| tree | 554f6adc2446b1ee8bfddfc8ece08b9b068167bf | |
| parent | 07c27b775c8d3997bf40891c2772ae8859eb534d (diff) | |
| download | scummvm-rg350-8cf7d765c05bd13fc381e94801b2bbd8c27e1c07.tar.gz scummvm-rg350-8cf7d765c05bd13fc381e94801b2bbd8c27e1c07.tar.bz2 scummvm-rg350-8cf7d765c05bd13fc381e94801b2bbd8c27e1c07.zip | |
WINTERMUTE: General cleanup
| -rw-r--r-- | engines/wintermute/ad/ad_path.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_scene.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base.h | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font.h | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/base_renderer.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/math/matrix4.h | 9 |
6 files changed, 6 insertions, 17 deletions
diff --git a/engines/wintermute/ad/ad_path.h b/engines/wintermute/ad/ad_path.h index b85e1fce7a..de115b261a 100644 --- a/engines/wintermute/ad/ad_path.h +++ b/engines/wintermute/ad/ad_path.h @@ -46,7 +46,7 @@ public: void reset();
AdPath(BaseGame *inGame);
virtual ~AdPath();
- BaseArray <BasePoint *> _points;
+ BaseArray<BasePoint *> _points;
int _currIndex;
bool _ready;
};
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp index 176604b75f..5b96bc0c3a 100644 --- a/engines/wintermute/ad/ad_scene.cpp +++ b/engines/wintermute/ad/ad_scene.cpp @@ -267,7 +267,7 @@ void AdScene::pfAddWaypointGroup(AdWaypointGroup *wpt, BaseObject *requester) { return;
}
- for (uint32 i = 0; i < wpt->_points.size(); i++) {
+ for (uint32 i = 0; i < wpt->_points.size(); i++) {
if (isBlockedAt(wpt->_points[i]->x, wpt->_points[i]->y, true, requester)) {
continue;
}
diff --git a/engines/wintermute/base/base.h b/engines/wintermute/base/base.h index b07065ec0d..f4c1cf0739 100644 --- a/engines/wintermute/base/base.h +++ b/engines/wintermute/base/base.h @@ -45,7 +45,7 @@ public: bool _persistable;
bool setEditorProp(const Common::String &propName, const Common::String &propValue);
Common::String getEditorProp(const Common::String &propName, const Common::String &initVal = NULL);
- BaseClass(TDynamicConstructor, TDynamicConstructor) {};
+ BaseClass(TDynamicConstructor, TDynamicConstructor) {}
bool parseEditorProperty(byte *buffer, bool complete = true);
virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent = 0);
BaseClass();
@@ -55,8 +55,6 @@ public: protected:
Common::HashMap<Common::String, Common::String> _editorProps;
Common::HashMap<Common::String, Common::String>::iterator _editorPropsIter;
- /* std::map<std::string, std::string> _editorProps;
- std::map<std::string, std::string>::iterator _editorPropsIter;*/
};
} // end of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font.h b/engines/wintermute/base/font/base_font.h index 461a724160..acd424ac06 100644 --- a/engines/wintermute/base/font/base_font.h +++ b/engines/wintermute/base/font/base_font.h @@ -43,8 +43,8 @@ public: virtual void drawText(const byte *text, int x, int y, int width, TTextAlign align = TAL_LEFT, int max_height = -1, int maxLength = -1);
virtual int getLetterHeight();
- virtual void initLoop() {};
- virtual void afterLoad() {};
+ virtual void initLoop() {}
+ virtual void afterLoad() {}
BaseFont(BaseGame *inGame);
virtual ~BaseFont();
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 26d7e6db57..0ff4e6a3be 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -54,7 +54,7 @@ public: int _drawOffsetX;
int _drawOffsetY;
- virtual void dumpData(const char *filename) {};
+ virtual void dumpData(const char *filename) {}
/**
* Take a screenshot of the current screenstate
*
diff --git a/engines/wintermute/math/matrix4.h b/engines/wintermute/math/matrix4.h index 5b68944397..c95bd364ff 100644 --- a/engines/wintermute/math/matrix4.h +++ b/engines/wintermute/math/matrix4.h @@ -42,16 +42,7 @@ public: void rotationZ(float angle);
void transformVector2(Vector2 &vec);
- /* union {
- struct {
- float _11, _12, _13, _14;
- float _21, _22, _23, _24;
- float _31, _32, _33, _34;
- float _41, _42, _43, _44;
- };*/
float m[4][4];
- //};
-
};
} // end of namespace Wintermute
|