mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-24 11:36:22 +00:00
SWORD25: Fix compilation and several warnings
svn-id: r53215
This commit is contained in:
parent
de0fe1db49
commit
bf53914c2a
@ -54,8 +54,6 @@ namespace Sword25 {
|
||||
|
||||
class BS_RenderObject;
|
||||
|
||||
namespace Sword25 {
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Klassendeklaration
|
||||
// -----------------------------------------------------------------------------
|
||||
|
@ -169,7 +169,7 @@ protected:
|
||||
|
||||
T *FindPtrByHandle(unsigned int Handle) {
|
||||
// Zum Handle gehörigen Pointer finden.
|
||||
HANDLE2PTR_MAP::const_iterator it = m_Handle2PtrMap.find(Handle);
|
||||
typename HANDLE2PTR_MAP::const_iterator it = m_Handle2PtrMap.find(Handle);
|
||||
|
||||
// Pointer zurückgeben, oder, falls keiner gefunden wurde, 0 zurückgeben.
|
||||
return (it != m_Handle2PtrMap.end()) ? it->_value : 0;
|
||||
@ -179,7 +179,7 @@ protected:
|
||||
|
||||
unsigned int FindHandleByPtr(T *ObjectPtr) {
|
||||
// Zum Pointer gehöriges Handle finden.
|
||||
PTR2HANDLE_MAP::const_iterator it = m_Ptr2HandleMap.find(ObjectPtr);
|
||||
typename PTR2HANDLE_MAP::const_iterator it = m_Ptr2HandleMap.find(ObjectPtr);
|
||||
|
||||
// Handle zurückgeben, oder, falls keines gefunden wurde, 0 zurückgeben.
|
||||
return (it != m_Ptr2HandleMap.end()) ? it->_value : 0;
|
||||
|
@ -301,9 +301,9 @@ static int NewWalkRegion(lua_State *L) {
|
||||
static const char *GEO_LIBRARY_NAME = "Geo";
|
||||
|
||||
static const luaL_reg GEO_FUNCTIONS[] = {
|
||||
"NewRegion", NewRegion,
|
||||
"NewWalkRegion", NewWalkRegion,
|
||||
0, 0,
|
||||
{"NewRegion", NewRegion},
|
||||
{"NewWalkRegion", NewWalkRegion},
|
||||
{0, 0}
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
@ -477,17 +477,17 @@ static int R_Delete(lua_State *L) {
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
static const luaL_reg REGION_METHODS[] = {
|
||||
"SetPos", R_SetPos,
|
||||
"SetX", R_SetX,
|
||||
"SetY", R_SetY,
|
||||
"GetPos", R_GetPos,
|
||||
"IsPointInRegion", R_IsPointInRegion,
|
||||
"GetX", R_GetX,
|
||||
"GetY", R_GetY,
|
||||
"IsValid", R_IsValid,
|
||||
"Draw", R_Draw,
|
||||
"GetCentroid", R_GetCentroid,
|
||||
0, 0,
|
||||
{"SetPos", R_SetPos},
|
||||
{"SetX", R_SetX},
|
||||
{"SetY", R_SetY},
|
||||
{"GetPos", R_GetPos},
|
||||
{"IsPointInRegion", R_IsPointInRegion},
|
||||
{"GetX", R_GetX},
|
||||
{"GetY", R_GetY},
|
||||
{"IsValid", R_IsValid},
|
||||
{"Draw", R_Draw},
|
||||
{"GetCentroid", R_GetCentroid},
|
||||
{0, 0}
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
@ -533,8 +533,8 @@ static int WR_GetPath(lua_State *L) {
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
static const luaL_reg WALKREGION_METHODS[] = {
|
||||
"GetPath", WR_GetPath,
|
||||
0, 0,
|
||||
{"GetPath", WR_GetPath},
|
||||
{0, 0}
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
@ -56,15 +56,17 @@ public:
|
||||
|
||||
void Move(int DeltaX, int DeltaY) { translate(DeltaX, DeltaY); }
|
||||
|
||||
bool DoesIntersect(const BS_Rect &Rect) const { return intersects(Rect); }
|
||||
bool DoesIntersect(const BS_Rect &Rect_) const { return intersects(Rect_); }
|
||||
|
||||
bool Intersect(const BS_Rect &Rect, BS_Rect &Result) const {
|
||||
Result = Rect;
|
||||
bool Intersect(const BS_Rect &Rect_, BS_Rect &Result) const {
|
||||
Result = Rect_;
|
||||
Result.clip(*this);
|
||||
|
||||
return Result.isEmpty();
|
||||
}
|
||||
|
||||
void Join(const BS_Rect &Rect, BS_Rect &Result) const {
|
||||
Result = Rect;
|
||||
void Join(const BS_Rect &Rect_, BS_Rect &Result) const {
|
||||
Result = Rect_;
|
||||
Result.extend(*this);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user