aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute')
-rw-r--r--engines/wintermute/Ad/AdActor.cpp2
-rw-r--r--engines/wintermute/Ad/AdEntity.cpp2
-rw-r--r--engines/wintermute/Ad/AdObject.cpp2
-rw-r--r--engines/wintermute/Ad/AdRegion.cpp2
-rw-r--r--engines/wintermute/Ad/AdScene.cpp32
-rw-r--r--engines/wintermute/Base/BGame.cpp2
-rw-r--r--engines/wintermute/Base/BRegion.cpp115
-rw-r--r--engines/wintermute/Base/BRegion.h12
-rw-r--r--engines/wintermute/Base/BRenderer.cpp2
-rw-r--r--engines/wintermute/Base/PartEmitter.cpp2
10 files changed, 86 insertions, 87 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 4724be5c1d..915399ea67 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -389,7 +389,7 @@ HRESULT CAdActor::loadBuffer(byte *buffer, bool complete) {
} else {
_blockRegion = rgn;
_currentBlockRegion = crgn;
- _currentBlockRegion->Mimic(_blockRegion);
+ _currentBlockRegion->mimic(_blockRegion);
}
}
break;
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index ef87d90a32..5e2fb233d4 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -345,7 +345,7 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
} else {
_blockRegion = rgn;
_currentBlockRegion = crgn;
- _currentBlockRegion->Mimic(_blockRegion);
+ _currentBlockRegion->mimic(_blockRegion);
}
}
break;
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index b132bec46e..4bea6921b9 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -1040,7 +1040,7 @@ HRESULT CAdObject::updateBlockRegion() {
CAdGame *adGame = (CAdGame *)Game;
if (adGame->_scene) {
if (_blockRegion && _currentBlockRegion)
- _currentBlockRegion->Mimic(_blockRegion, _zoomable ? adGame->_scene->getScaleAt(_posY) : 100.0f, _posX, _posY);
+ _currentBlockRegion->mimic(_blockRegion, _zoomable ? adGame->_scene->getScaleAt(_posY) : 100.0f, _posX, _posY);
if (_wptGroup && _currentWptGroup)
_currentWptGroup->mimic(_wptGroup, _zoomable ? adGame->_scene->getScaleAt(_posY) : 100.0f, _posX, _posY);
diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp
index 7e681ada72..6aa201c60d 100644
--- a/engines/wintermute/Ad/AdRegion.cpp
+++ b/engines/wintermute/Ad/AdRegion.cpp
@@ -208,7 +208,7 @@ HRESULT CAdRegion::loadBuffer(byte *buffer, bool complete) {
return E_FAIL;
}
- CreateRegion();
+ createRegion();
_alpha = DRGBA(ar, ag, ab, alpha);
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index 8a15175ca5..3c73d1b33a 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -278,7 +278,7 @@ float CAdScene::getZoomAt(int x, int y) {
if (_mainLayer) {
for (int i = _mainLayer->_nodes.GetSize() - 1; i >= 0; i--) {
CAdSceneNode *node = _mainLayer->_nodes[i];
- if (node->_type == OBJECT_REGION && node->_region->_active && !node->_region->_blocked && node->_region->PointInRegion(x, y)) {
+ if (node->_type == OBJECT_REGION && node->_region->_active && !node->_region->_blocked && node->_region->pointInRegion(x, y)) {
if (node->_region->_zoom != 0) {
ret = node->_region->_zoom;
found = true;
@@ -304,7 +304,7 @@ uint32 CAdScene::getAlphaAt(int x, int y, bool colorCheck) {
if (_mainLayer) {
for (int i = _mainLayer->_nodes.GetSize() - 1; i >= 0; i--) {
CAdSceneNode *node = _mainLayer->_nodes[i];
- if (node->_type == OBJECT_REGION && node->_region->_active && (colorCheck || !node->_region->_blocked) && node->_region->PointInRegion(x, y)) {
+ if (node->_type == OBJECT_REGION && node->_region->_active && (colorCheck || !node->_region->_blocked) && node->_region->pointInRegion(x, y)) {
if (!node->_region->_blocked) ret = node->_region->_alpha;
break;
}
@@ -322,13 +322,13 @@ bool CAdScene::isBlockedAt(int x, int y, bool checkFreeObjects, CBObject *reques
if (checkFreeObjects) {
for (int i = 0; i < _objects.GetSize(); i++) {
if (_objects[i]->_active && _objects[i] != requester && _objects[i]->_currentBlockRegion) {
- if (_objects[i]->_currentBlockRegion->PointInRegion(x, y)) return true;
+ if (_objects[i]->_currentBlockRegion->pointInRegion(x, y)) return true;
}
}
CAdGame *adGame = (CAdGame *)Game;
for (int i = 0; i < adGame->_objects.GetSize(); i++) {
if (adGame->_objects[i]->_active && adGame->_objects[i] != requester && adGame->_objects[i]->_currentBlockRegion) {
- if (adGame->_objects[i]->_currentBlockRegion->PointInRegion(x, y)) return true;
+ if (adGame->_objects[i]->_currentBlockRegion->pointInRegion(x, y)) return true;
}
}
}
@@ -344,7 +344,7 @@ bool CAdScene::isBlockedAt(int x, int y, bool checkFreeObjects, CBObject *reques
break;
}
*/
- if (node->_type == OBJECT_REGION && node->_region->_active && !node->_region->_decoration && node->_region->PointInRegion(x, y)) {
+ if (node->_type == OBJECT_REGION && node->_region->_active && !node->_region->_decoration && node->_region->pointInRegion(x, y)) {
if (node->_region->_blocked) {
ret = true;
break;
@@ -363,13 +363,13 @@ bool CAdScene::isWalkableAt(int x, int y, bool checkFreeObjects, CBObject *reque
if (checkFreeObjects) {
for (int i = 0; i < _objects.GetSize(); i++) {
if (_objects[i]->_active && _objects[i] != requester && _objects[i]->_currentBlockRegion) {
- if (_objects[i]->_currentBlockRegion->PointInRegion(x, y)) return false;
+ if (_objects[i]->_currentBlockRegion->pointInRegion(x, y)) return false;
}
}
CAdGame *adGame = (CAdGame *)Game;
for (int i = 0; i < adGame->_objects.GetSize(); i++) {
if (adGame->_objects[i]->_active && adGame->_objects[i] != requester && adGame->_objects[i]->_currentBlockRegion) {
- if (adGame->_objects[i]->_currentBlockRegion->PointInRegion(x, y)) return false;
+ if (adGame->_objects[i]->_currentBlockRegion->pointInRegion(x, y)) return false;
}
}
}
@@ -378,7 +378,7 @@ bool CAdScene::isWalkableAt(int x, int y, bool checkFreeObjects, CBObject *reque
if (_mainLayer) {
for (int i = 0; i < _mainLayer->_nodes.GetSize(); i++) {
CAdSceneNode *node = _mainLayer->_nodes[i];
- if (node->_type == OBJECT_REGION && node->_region->_active && !node->_region->_decoration && node->_region->PointInRegion(x, y)) {
+ if (node->_type == OBJECT_REGION && node->_region->_active && !node->_region->_decoration && node->_region->pointInRegion(x, y)) {
if (node->_region->_blocked) {
ret = false;
break;
@@ -1075,7 +1075,7 @@ HRESULT CAdScene::displayRegionContent(CAdRegion *region, bool display3DOnly) {
// global objects
for (int i = 0; i < adGame->_objects.GetSize(); i++) {
obj = adGame->_objects[i];
- if (obj->_active && !obj->_drawn && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->PointInRegion(obj->_posX, obj->_posY)))) {
+ if (obj->_active && !obj->_drawn && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) {
objects.Add(obj);
}
}
@@ -1083,7 +1083,7 @@ HRESULT CAdScene::displayRegionContent(CAdRegion *region, bool display3DOnly) {
// scene objects
for (int i = 0; i < _objects.GetSize(); i++) {
obj = _objects[i];
- if (obj->_active && !obj->_editorOnly && !obj->_drawn && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->PointInRegion(obj->_posX, obj->_posY)))) {
+ if (obj->_active && !obj->_editorOnly && !obj->_drawn && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) {
objects.Add(obj);
}
}
@@ -1141,7 +1141,7 @@ HRESULT CAdScene::displayRegionContentOld(CAdRegion *region) {
// global objects
for (int i = 0; i < adGame->_objects.GetSize(); i++) {
- if (adGame->_objects[i]->_active && !adGame->_objects[i]->_drawn && adGame->_objects[i]->_posY < minY && (adGame->_objects[i]->_stickRegion == region || region == NULL || (adGame->_objects[i]->_stickRegion == NULL && region->PointInRegion(adGame->_objects[i]->_posX, adGame->_objects[i]->_posY)))) {
+ if (adGame->_objects[i]->_active && !adGame->_objects[i]->_drawn && adGame->_objects[i]->_posY < minY && (adGame->_objects[i]->_stickRegion == region || region == NULL || (adGame->_objects[i]->_stickRegion == NULL && region->pointInRegion(adGame->_objects[i]->_posX, adGame->_objects[i]->_posY)))) {
obj = adGame->_objects[i];
minY = adGame->_objects[i]->_posY;
}
@@ -1149,7 +1149,7 @@ HRESULT CAdScene::displayRegionContentOld(CAdRegion *region) {
// scene objects
for (int i = 0; i < _objects.GetSize(); i++) {
- if (_objects[i]->_active && !_objects[i]->_editorOnly && !_objects[i]->_drawn && _objects[i]->_posY < minY && (_objects[i]->_stickRegion == region || region == NULL || (_objects[i]->_stickRegion == NULL && region->PointInRegion(_objects[i]->_posX, _objects[i]->_posY)))) {
+ if (_objects[i]->_active && !_objects[i]->_editorOnly && !_objects[i]->_drawn && _objects[i]->_posY < minY && (_objects[i]->_stickRegion == region || region == NULL || (_objects[i]->_stickRegion == NULL && region->pointInRegion(_objects[i]->_posX, _objects[i]->_posY)))) {
obj = _objects[i];
minY = _objects[i]->_posY;
}
@@ -1427,7 +1427,7 @@ HRESULT CAdScene::scCallMethod(CScScript *script, CScStack *stack, CScStack *thi
if (_mainLayer) {
for (int i = _mainLayer->_nodes.GetSize() - 1; i >= 0; i--) {
CAdSceneNode *node = _mainLayer->_nodes[i];
- if (node->_type == OBJECT_REGION && node->_region->_active && node->_region->PointInRegion(x, y)) {
+ if (node->_type == OBJECT_REGION && node->_region->_active && node->_region->pointInRegion(x, y)) {
if (node->_region->_decoration && !includeDecors) continue;
stack->pushNative(node->_region, true);
@@ -2597,7 +2597,7 @@ HRESULT CAdScene::getRegionsAt(int x, int y, CAdRegion **regionList, int numRegi
if (_mainLayer) {
for (int i = _mainLayer->_nodes.GetSize() - 1; i >= 0; i--) {
CAdSceneNode *node = _mainLayer->_nodes[i];
- if (node->_type == OBJECT_REGION && node->_region->_active && node->_region->PointInRegion(x, y)) {
+ if (node->_type == OBJECT_REGION && node->_region->_active && node->_region->pointInRegion(x, y)) {
if (numUsed < numRegions - 1) {
regionList[numUsed] = node->_region;
numUsed++;
@@ -2726,7 +2726,7 @@ HRESULT CAdScene::getRegionObjects(CAdRegion *region, CBArray<CAdObject *, CAdOb
// global objects
for (int i = 0; i < adGame->_objects.GetSize(); i++) {
obj = adGame->_objects[i];
- if (obj->_active && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->PointInRegion(obj->_posX, obj->_posY)))) {
+ if (obj->_active && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) {
if (interactiveOnly && !obj->_registrable) continue;
objects.Add(obj);
@@ -2736,7 +2736,7 @@ HRESULT CAdScene::getRegionObjects(CAdRegion *region, CBArray<CAdObject *, CAdOb
// scene objects
for (int i = 0; i < _objects.GetSize(); i++) {
obj = _objects[i];
- if (obj->_active && !obj->_editorOnly && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->PointInRegion(obj->_posX, obj->_posY)))) {
+ if (obj->_active && !obj->_editorOnly && (obj->_stickRegion == region || region == NULL || (obj->_stickRegion == NULL && region->pointInRegion(obj->_posX, obj->_posY)))) {
if (interactiveOnly && !obj->_registrable) continue;
objects.Add(obj);
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index 3054bc9151..220f3359bc 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -3356,7 +3356,7 @@ HRESULT CBGame::initAfterLoad() {
//////////////////////////////////////////////////////////////////////////
void CBGame::afterLoadRegion(void *region, void *data) {
- ((CBRegion *)region)->CreateRegion();
+ ((CBRegion *)region)->createRegion();
}
diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp
index 6194346093..ea3ecda58e 100644
--- a/engines/wintermute/Base/BRegion.cpp
+++ b/engines/wintermute/Base/BRegion.cpp
@@ -70,26 +70,26 @@ void CBRegion::cleanup() {
//////////////////////////////////////////////////////////////////////////
-bool CBRegion::CreateRegion() {
- return SUCCEEDED(GetBoundingRect(&_rect));
+bool CBRegion::createRegion() {
+ return SUCCEEDED(getBoundingRect(&_rect));
}
//////////////////////////////////////////////////////////////////////////
-bool CBRegion::PointInRegion(int X, int Y) {
+bool CBRegion::pointInRegion(int x, int y) {
if (_points.GetSize() < 3) return false;
POINT pt;
- pt.x = X;
- pt.y = Y;
+ pt.x = x;
+ pt.y = y;
RECT rect;
- rect.left = X - 1;
- rect.right = X + 2;
- rect.top = Y - 1;
- rect.bottom = Y + 2;
+ rect.left = x - 1;
+ rect.right = x + 2;
+ rect.top = y - 1;
+ rect.bottom = y + 2;
- if (CBPlatform::PtInRect(&_rect, pt)) return PtInPolygon(X, Y);
+ if (CBPlatform::PtInRect(&_rect, pt)) return ptInPolygon(x, y);
else return false;
}
@@ -201,7 +201,7 @@ HRESULT CBRegion::loadBuffer(byte *buffer, bool complete) {
return E_FAIL;
}
- CreateRegion();
+ createRegion();
return S_OK;
}
@@ -217,11 +217,11 @@ HRESULT CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *thi
//////////////////////////////////////////////////////////////////////////
if (strcmp(name, "AddPoint") == 0) {
stack->correctParams(2);
- int X = stack->pop()->getInt();
- int Y = stack->pop()->getInt();
+ int x = stack->pop()->getInt();
+ int y = stack->pop()->getInt();
- _points.Add(new CBPoint(X, Y));
- CreateRegion();
+ _points.Add(new CBPoint(x, y));
+ createRegion();
stack->pushBool(true);
@@ -234,12 +234,12 @@ HRESULT CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *thi
else if (strcmp(name, "InsertPoint") == 0) {
stack->correctParams(3);
int Index = stack->pop()->getInt();
- int X = stack->pop()->getInt();
- int Y = stack->pop()->getInt();
+ int x = stack->pop()->getInt();
+ int y = stack->pop()->getInt();
if (Index >= 0 && Index < _points.GetSize()) {
- _points.InsertAt(Index, new CBPoint(X, Y));
- CreateRegion();
+ _points.InsertAt(Index, new CBPoint(x, y));
+ createRegion();
stack->pushBool(true);
} else stack->pushBool(false);
@@ -253,13 +253,13 @@ HRESULT CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *thi
else if (strcmp(name, "SetPoint") == 0) {
stack->correctParams(3);
int Index = stack->pop()->getInt();
- int X = stack->pop()->getInt();
- int Y = stack->pop()->getInt();
+ int x = stack->pop()->getInt();
+ int y = stack->pop()->getInt();
if (Index >= 0 && Index < _points.GetSize()) {
- _points[Index]->x = X;
- _points[Index]->y = Y;
- CreateRegion();
+ _points[Index]->x = x;
+ _points[Index]->y = y;
+ createRegion();
stack->pushBool(true);
} else stack->pushBool(false);
@@ -272,14 +272,14 @@ HRESULT CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *thi
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "RemovePoint") == 0) {
stack->correctParams(1);
- int Index = stack->pop()->getInt();
+ int index = stack->pop()->getInt();
- if (Index >= 0 && Index < _points.GetSize()) {
- delete _points[Index];
- _points[Index] = NULL;
+ if (index >= 0 && index < _points.GetSize()) {
+ delete _points[index];
+ _points[index] = NULL;
- _points.RemoveAt(Index);
- CreateRegion();
+ _points.RemoveAt(index);
+ createRegion();
stack->pushBool(true);
} else stack->pushBool(false);
@@ -292,13 +292,13 @@ HRESULT CBRegion::scCallMethod(CScScript *script, CScStack *stack, CScStack *thi
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "GetPoint") == 0) {
stack->correctParams(1);
- int Index = stack->pop()->getInt();
+ int index = stack->pop()->getInt();
- if (Index >= 0 && Index < _points.GetSize()) {
- CScValue *Val = stack->getPushValue();
- if (Val) {
- Val->setProperty("X", _points[Index]->x);
- Val->setProperty("Y", _points[Index]->y);
+ if (index >= 0 && index < _points.GetSize()) {
+ CScValue *val = stack->getPushValue();
+ if (val) {
+ val->setProperty("X", _points[index]->x);
+ val->setProperty("Y", _points[index]->y);
}
} else stack->pushNULL();
@@ -378,9 +378,9 @@ const char *CBRegion::scToString() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CBRegion::saveAsText(CBDynBuffer *buffer, int indent, const char *NameOverride) {
- if (!NameOverride) buffer->putTextIndent(indent, "REGION {\n");
- else buffer->putTextIndent(indent, "%s {\n", NameOverride);
+HRESULT CBRegion::saveAsText(CBDynBuffer *buffer, int indent, const char *nameOverride) {
+ if (!nameOverride) buffer->putTextIndent(indent, "REGION {\n");
+ else buffer->putTextIndent(indent, "%s {\n", nameOverride);
buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", _name);
buffer->putTextIndent(indent + 2, "CAPTION=\"%s\"\n", getCaption());
@@ -426,21 +426,20 @@ typedef struct {
} dPoint;
//////////////////////////////////////////////////////////////////////////
-bool CBRegion::PtInPolygon(int X, int Y) {
+bool CBRegion::ptInPolygon(int x, int y) {
if (_points.GetSize() < 3) return false;
int counter = 0;
- int i;
double xinters;
dPoint p, p1, p2;
- p.x = (double)X;
- p.y = (double)Y;
+ p.x = (double)x;
+ p.y = (double)y;
p1.x = (double)_points[0]->x;
p1.y = (double)_points[0]->y;
- for (i = 1; i <= _points.GetSize(); i++) {
+ for (int i = 1; i <= _points.GetSize(); i++) {
p2.x = (double)_points[i % _points.GetSize()]->x;
p2.y = (double)_points[i % _points.GetSize()]->y;
@@ -466,8 +465,8 @@ bool CBRegion::PtInPolygon(int X, int Y) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CBRegion::GetBoundingRect(RECT *Rect) {
- if (_points.GetSize() == 0) CBPlatform::SetRectEmpty(Rect);
+HRESULT CBRegion::getBoundingRect(RECT *rect) {
+ if (_points.GetSize() == 0) CBPlatform::SetRectEmpty(rect);
else {
int MinX = INT_MAX, MinY = INT_MAX, MaxX = INT_MIN, MaxY = INT_MIN;
@@ -478,32 +477,32 @@ HRESULT CBRegion::GetBoundingRect(RECT *Rect) {
MaxX = MAX(MaxX, _points[i]->x);
MaxY = MAX(MaxY, _points[i]->y);
}
- CBPlatform::SetRect(Rect, MinX, MinY, MaxX, MaxY);
+ CBPlatform::SetRect(rect, MinX, MinY, MaxX, MaxY);
}
return S_OK;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBRegion::Mimic(CBRegion *Region, float Scale, int X, int Y) {
- if (Scale == _lastMimicScale && X == _lastMimicX && Y == _lastMimicY) return S_OK;
+HRESULT CBRegion::mimic(CBRegion *region, float scale, int x, int y) {
+ if (scale == _lastMimicScale && x == _lastMimicX && y == _lastMimicY) return S_OK;
cleanup();
- for (int i = 0; i < Region->_points.GetSize(); i++) {
- int x, y;
+ for (int i = 0; i < region->_points.GetSize(); i++) {
+ int xVal, yVal;
- x = (int)((float)Region->_points[i]->x * Scale / 100.0f);
- y = (int)((float)Region->_points[i]->y * Scale / 100.0f);
+ xVal = (int)((float)region->_points[i]->x * scale / 100.0f);
+ yVal = (int)((float)region->_points[i]->y * scale / 100.0f);
- _points.Add(new CBPoint(x + X, y + Y));
+ _points.Add(new CBPoint(xVal + x, yVal + y));
}
- _lastMimicScale = Scale;
- _lastMimicX = X;
- _lastMimicY = Y;
+ _lastMimicScale = scale;
+ _lastMimicX = x;
+ _lastMimicY = y;
- return CreateRegion() ? S_OK : E_FAIL;
+ return createRegion() ? S_OK : E_FAIL;
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/Base/BRegion.h b/engines/wintermute/Base/BRegion.h
index 2ac783ca7b..0b005eb1de 100644
--- a/engines/wintermute/Base/BRegion.h
+++ b/engines/wintermute/Base/BRegion.h
@@ -40,21 +40,21 @@ public:
int _lastMimicX;
int _lastMimicY;
void cleanup();
- HRESULT Mimic(CBRegion *Region, float Scale = 100.0f, int X = 0, int Y = 0);
- HRESULT GetBoundingRect(RECT *Rect);
- bool PtInPolygon(int X, int Y);
+ HRESULT mimic(CBRegion *region, float scale = 100.0f, int x = 0, int y = 0);
+ HRESULT getBoundingRect(RECT *rect);
+ bool ptInPolygon(int x, int y);
DECLARE_PERSISTENT(CBRegion, CBObject)
bool _active;
int _editorSelectedPoint;
CBRegion(CBGame *inGame);
virtual ~CBRegion();
- bool PointInRegion(int X, int Y);
- bool CreateRegion();
+ bool pointInRegion(int x, int y);
+ bool createRegion();
HRESULT loadFile(const char *filename);
HRESULT loadBuffer(byte *buffer, bool complete = true);
RECT _rect;
CBArray<CBPoint *, CBPoint *> _points;
- virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent, const char *NameOverride = NULL);
+ virtual HRESULT saveAsText(CBDynBuffer *buffer, int indent, const char *nameOverride = NULL);
// scripting interface
virtual CScValue *scGetProperty(const char *name);
diff --git a/engines/wintermute/Base/BRenderer.cpp b/engines/wintermute/Base/BRenderer.cpp
index 690f16016c..5ccd04f1fd 100644
--- a/engines/wintermute/Base/BRenderer.cpp
+++ b/engines/wintermute/Base/BRenderer.cpp
@@ -95,7 +95,7 @@ CBObject *CBRenderer::getObjectAt(int X, int Y) {
}
// region
else if (_rectList[i]->_region) {
- if (_rectList[i]->_region->PointInRegion(X + _rectList[i]->_offsetX, Y + _rectList[i]->_offsetY)) return _rectList[i]->_owner;
+ if (_rectList[i]->_region->pointInRegion(X + _rectList[i]->_offsetX, Y + _rectList[i]->_offsetY)) return _rectList[i]->_owner;
}
} else return _rectList[i]->_owner;
}
diff --git a/engines/wintermute/Base/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp
index b80d6b0b68..7c49177039 100644
--- a/engines/wintermute/Base/PartEmitter.cpp
+++ b/engines/wintermute/Base/PartEmitter.cpp
@@ -293,7 +293,7 @@ HRESULT CPartEmitter::display(CBRegion *Region) {
for (int i = 0; i < _particles.GetSize(); i++) {
if (Region != NULL && _useRegion) {
- if (!Region->PointInRegion(_particles[i]->_pos.x, _particles[i]->_pos.y)) continue;
+ if (!Region->pointInRegion(_particles[i]->_pos.x, _particles[i]->_pos.y)) continue;
}
_particles[i]->display(this);
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 22:14:53 +0000