aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/base_active_rect.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-21 21:01:47 +0200
committerEinar Johan Trøan Sømåen2012-07-21 21:01:47 +0200
commitb5a07fef8ebf29f7f44b15d9b34799c7e115fdad (patch)
tree76599c7b51aa6ad0447cb6ff6847f9eba54a679a /engines/wintermute/base/base_active_rect.cpp
parent2e82471240804df65acdf51c43ea044cbb81ae68 (diff)
downloadscummvm-rg350-b5a07fef8ebf29f7f44b15d9b34799c7e115fdad.tar.gz
scummvm-rg350-b5a07fef8ebf29f7f44b15d9b34799c7e115fdad.tar.bz2
scummvm-rg350-b5a07fef8ebf29f7f44b15d9b34799c7e115fdad.zip
WINTERMUTE: Get rid of the C-prefix for class-definitions.
Diffstat (limited to 'engines/wintermute/base/base_active_rect.cpp')
-rw-r--r--engines/wintermute/base/base_active_rect.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp
index 5895b1acd5..493b35bf12 100644
--- a/engines/wintermute/base/base_active_rect.cpp
+++ b/engines/wintermute/base/base_active_rect.cpp
@@ -35,8 +35,8 @@
namespace WinterMute {
//////////////////////////////////////////////////////////////////////
-CBActiveRect::CBActiveRect(CBGame *inGame): CBBase(inGame) {
- CBPlatform::setRectEmpty(&_rect);
+BaseActiveRect::BaseActiveRect(BaseGame *inGame): BaseClass(inGame) {
+ BasePlatform::setRectEmpty(&_rect);
_owner = NULL;
_frame = NULL;
_region = NULL;
@@ -48,10 +48,10 @@ CBActiveRect::CBActiveRect(CBGame *inGame): CBBase(inGame) {
//////////////////////////////////////////////////////////////////////
-CBActiveRect::CBActiveRect(CBGame *inGame, CBObject *owner, CBSubFrame *frame, int x, int y, int width, int height, float zoomX, float zoomY, bool precise): CBBase(inGame) {
+BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseSubFrame *frame, int x, int y, int width, int height, float zoomX, float zoomY, bool precise): BaseClass(inGame) {
_owner = owner;
_frame = frame;
- CBPlatform::setRect(&_rect, x, y, x + width, y + height);
+ BasePlatform::setRect(&_rect, x, y, x + width, y + height);
_zoomX = zoomX;
_zoomY = zoomY;
_precise = precise;
@@ -61,11 +61,11 @@ CBActiveRect::CBActiveRect(CBGame *inGame, CBObject *owner, CBSubFrame *frame, i
}
//////////////////////////////////////////////////////////////////////
-CBActiveRect::CBActiveRect(CBGame *inGame, CBObject *owner, CBRegion *region, int offsetX, int offsetY): CBBase(inGame) {
+BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseRegion *region, int offsetX, int offsetY): BaseClass(inGame) {
_owner = owner;
_region = region;
- CBPlatform::copyRect(&_rect, &region->_rect);
- CBPlatform::offsetRect(&_rect, -offsetX, -offsetY);
+ BasePlatform::copyRect(&_rect, &region->_rect);
+ BasePlatform::offsetRect(&_rect, -offsetX, -offsetY);
_zoomX = 100;
_zoomY = 100;
_precise = true;
@@ -77,7 +77,7 @@ CBActiveRect::CBActiveRect(CBGame *inGame, CBObject *owner, CBRegion *region, in
//////////////////////////////////////////////////////////////////////
-CBActiveRect::~CBActiveRect() {
+BaseActiveRect::~BaseActiveRect() {
_owner = NULL;
_frame = NULL;
_region = NULL;
@@ -85,11 +85,11 @@ CBActiveRect::~CBActiveRect() {
//////////////////////////////////////////////////////////////////////////
-void CBActiveRect::clipRect() {
+void BaseActiveRect::clipRect() {
Rect32 rc;
bool customViewport;
_gameRef->getCurrentViewportRect(&rc, &customViewport);
- CBRenderer *Rend = _gameRef->_renderer;
+ BaseRenderer *Rend = _gameRef->_renderer;
if (!customViewport) {
rc.left -= Rend->_drawOffsetX;
@@ -101,7 +101,7 @@ void CBActiveRect::clipRect() {
if (rc.left > _rect.left) _offsetX = rc.left - _rect.left;
if (rc.top > _rect.top) _offsetY = rc.top - _rect.top;
- CBPlatform::intersectRect(&_rect, &_rect, &rc);
+ BasePlatform::intersectRect(&_rect, &_rect, &rc);
}
} // end of namespace WinterMute