libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WINTERMUTE: General cleanup

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen 2012-08-31 19:38:24 +02:00
parent 07c27b775c
commit 8cf7d765c0
6 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/wintermute/ad/ad_path.h
View File

@ -46,7 +46,7 @@ public:
void reset();
AdPath(BaseGame *inGame);
virtual ~AdPath();
BaseArray <BasePoint *> _points;
BaseArray<BasePoint *> _points;
int _currIndex;
bool _ready;
};

2
engines/wintermute/ad/ad_scene.cpp
View File

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

4
engines/wintermute/base/base.h
View File

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

4
engines/wintermute/base/font/base_font.h
View File

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

2
engines/wintermute/base/gfx/base_renderer.h
View File

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

9
engines/wintermute/math/matrix4.h
View File

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