aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Ad
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/Ad')
-rw-r--r--engines/wintermute/Ad/AdActor.cpp34
-rw-r--r--engines/wintermute/Ad/AdEntity.cpp44
-rw-r--r--engines/wintermute/Ad/AdGame.cpp10
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.cpp20
-rw-r--r--engines/wintermute/Ad/AdItem.cpp18
-rw-r--r--engines/wintermute/Ad/AdLayer.cpp16
-rw-r--r--engines/wintermute/Ad/AdRegion.cpp22
-rw-r--r--engines/wintermute/Ad/AdResponseBox.cpp10
-rw-r--r--engines/wintermute/Ad/AdRotLevel.cpp8
-rw-r--r--engines/wintermute/Ad/AdScaleLevel.cpp8
-rw-r--r--engines/wintermute/Ad/AdScene.cpp48
-rw-r--r--engines/wintermute/Ad/AdSpriteSet.cpp4
-rw-r--r--engines/wintermute/Ad/AdTalkDef.cpp4
-rw-r--r--engines/wintermute/Ad/AdTalkNode.cpp10
-rw-r--r--engines/wintermute/Ad/AdWaypointGroup.cpp10
15 files changed, 133 insertions, 133 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 915399ea67..116f8e9794 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -228,7 +228,7 @@ HRESULT CAdActor::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ACTOR) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ACTOR) {
Game->LOG(0, "'ACTOR' keyword expected.");
return E_FAIL;
}
@@ -238,18 +238,18 @@ HRESULT CAdActor::loadBuffer(byte *buffer, bool complete) {
CAdGame *adGame = (CAdGame *)Game;
CAdSpriteSet *spr = NULL;
int ar = 0, ag = 0, ab = 0, alpha = 0;
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
break;
case TOKEN_X:
- parser.ScanStr((char *)params, "%d", &_posX);
+ parser.scanStr((char *)params, "%d", &_posX);
break;
case TOKEN_Y:
- parser.ScanStr((char *)params, "%d", &_posY);
+ parser.scanStr((char *)params, "%d", &_posY);
break;
case TOKEN_NAME:
@@ -265,26 +265,26 @@ HRESULT CAdActor::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_SCALABLE:
- parser.ScanStr((char *)params, "%b", &_zoomable);
+ parser.scanStr((char *)params, "%b", &_zoomable);
break;
case TOKEN_ROTABLE:
case TOKEN_ROTATABLE:
- parser.ScanStr((char *)params, "%b", &_rotatable);
+ parser.scanStr((char *)params, "%b", &_rotatable);
break;
case TOKEN_REGISTRABLE:
case TOKEN_INTERACTIVE:
- parser.ScanStr((char *)params, "%b", &_registrable);
+ parser.scanStr((char *)params, "%b", &_registrable);
break;
case TOKEN_SHADOWABLE:
case TOKEN_COLORABLE:
- parser.ScanStr((char *)params, "%b", &_shadowable);
+ parser.scanStr((char *)params, "%b", &_shadowable);
break;
case TOKEN_ACTIVE:
- parser.ScanStr((char *)params, "%b", &_active);
+ parser.scanStr((char *)params, "%b", &_active);
break;
case TOKEN_WALK:
@@ -346,12 +346,12 @@ HRESULT CAdActor::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_SOUND_VOLUME:
- parser.ScanStr((char *)params, "%d", &_sFXVolume);
+ parser.scanStr((char *)params, "%d", &_sFXVolume);
break;
case TOKEN_SCALE: {
int s;
- parser.ScanStr((char *)params, "%d", &s);
+ parser.scanStr((char *)params, "%d", &s);
_scale = (float)s;
}
@@ -359,14 +359,14 @@ HRESULT CAdActor::loadBuffer(byte *buffer, bool complete) {
case TOKEN_RELATIVE_SCALE: {
int s;
- parser.ScanStr((char *)params, "%d", &s);
+ parser.scanStr((char *)params, "%d", &s);
_relativeScale = (float)s;
}
break;
case TOKEN_SOUND_PANNING:
- parser.ScanStr((char *)params, "%b", &_autoSoundPanning);
+ parser.scanStr((char *)params, "%b", &_autoSoundPanning);
break;
case TOKEN_PROPERTY:
@@ -416,15 +416,15 @@ HRESULT CAdActor::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_IGNORE_ITEMS:
- parser.ScanStr((char *)params, "%b", &_ignoreItems);
+ parser.scanStr((char *)params, "%b", &_ignoreItems);
break;
case TOKEN_ALPHA_COLOR:
- parser.ScanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);
+ parser.scanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);
break;
case TOKEN_ALPHA:
- parser.ScanStr((char *)params, "%d", &alpha);
+ parser.scanStr((char *)params, "%d", &alpha);
break;
case TOKEN_EDITOR_PROPERTY:
@@ -1281,7 +1281,7 @@ HRESULT CAdActor::mergeAnims(const char *animsFilename) {
HRESULT Ret = S_OK;
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_ANIMATION: {
CAdSpriteSet *Anim = new CAdSpriteSet(Game, this);
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index 5e2fb233d4..c5edae5a8f 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -201,7 +201,7 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ENTITY) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ENTITY) {
Game->LOG(0, "'ENTITY' keyword expected.");
return E_FAIL;
}
@@ -211,18 +211,18 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
CAdGame *adGame = (CAdGame *)Game;
CBSprite *spr = NULL;
int ar = 0, ag = 0, ab = 0, alpha = 0;
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
break;
case TOKEN_X:
- parser.ScanStr((char *)params, "%d", &_posX);
+ parser.scanStr((char *)params, "%d", &_posX);
break;
case TOKEN_Y:
- parser.ScanStr((char *)params, "%d", &_posY);
+ parser.scanStr((char *)params, "%d", &_posY);
break;
case TOKEN_SPRITE: {
@@ -265,12 +265,12 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_SCALABLE:
- parser.ScanStr((char *)params, "%b", &_zoomable);
+ parser.scanStr((char *)params, "%b", &_zoomable);
break;
case TOKEN_SCALE: {
int s;
- parser.ScanStr((char *)params, "%d", &s);
+ parser.scanStr((char *)params, "%d", &s);
_scale = (float)s;
}
@@ -278,7 +278,7 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
case TOKEN_RELATIVE_SCALE: {
int s;
- parser.ScanStr((char *)params, "%d", &s);
+ parser.scanStr((char *)params, "%d", &s);
_relativeScale = (float)s;
}
@@ -286,21 +286,21 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
case TOKEN_ROTABLE:
case TOKEN_ROTATABLE:
- parser.ScanStr((char *)params, "%b", &_rotatable);
+ parser.scanStr((char *)params, "%b", &_rotatable);
break;
case TOKEN_REGISTRABLE:
case TOKEN_INTERACTIVE:
- parser.ScanStr((char *)params, "%b", &_registrable);
+ parser.scanStr((char *)params, "%b", &_registrable);
break;
case TOKEN_SHADOWABLE:
case TOKEN_COLORABLE:
- parser.ScanStr((char *)params, "%b", &_shadowable);
+ parser.scanStr((char *)params, "%b", &_shadowable);
break;
case TOKEN_ACTIVE:
- parser.ScanStr((char *)params, "%b", &_active);
+ parser.scanStr((char *)params, "%b", &_active);
break;
case TOKEN_CURSOR:
@@ -314,7 +314,7 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_EDITOR_SELECTED:
- parser.ScanStr((char *)params, "%b", &_editorSelected);
+ parser.scanStr((char *)params, "%b", &_editorSelected);
break;
case TOKEN_REGION: {
@@ -399,19 +399,19 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_SOUND_START_TIME:
- parser.ScanStr((char *)params, "%d", &_sFXStart);
+ parser.scanStr((char *)params, "%d", &_sFXStart);
break;
case TOKEN_SOUND_VOLUME:
- parser.ScanStr((char *)params, "%d", &_sFXVolume);
+ parser.scanStr((char *)params, "%d", &_sFXVolume);
break;
case TOKEN_SOUND_PANNING:
- parser.ScanStr((char *)params, "%b", &_autoSoundPanning);
+ parser.scanStr((char *)params, "%b", &_autoSoundPanning);
break;
case TOKEN_SAVE_STATE:
- parser.ScanStr((char *)params, "%b", &_saveState);
+ parser.scanStr((char *)params, "%b", &_saveState);
break;
case TOKEN_PROPERTY:
@@ -419,15 +419,15 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_IGNORE_ITEMS:
- parser.ScanStr((char *)params, "%b", &_ignoreItems);
+ parser.scanStr((char *)params, "%b", &_ignoreItems);
break;
case TOKEN_ALPHA_COLOR:
- parser.ScanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);
+ parser.scanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);
break;
case TOKEN_ALPHA:
- parser.ScanStr((char *)params, "%d", &alpha);
+ parser.scanStr((char *)params, "%d", &alpha);
break;
case TOKEN_EDITOR_PROPERTY:
@@ -435,16 +435,16 @@ HRESULT CAdEntity::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_WALK_TO_X:
- parser.ScanStr((char *)params, "%d", &_walkToX);
+ parser.scanStr((char *)params, "%d", &_walkToX);
break;
case TOKEN_WALK_TO_Y:
- parser.ScanStr((char *)params, "%d", &_walkToY);
+ parser.scanStr((char *)params, "%d", &_walkToY);
break;
case TOKEN_WALK_TO_DIR: {
int i;
- parser.ScanStr((char *)params, "%d", &i);
+ parser.scanStr((char *)params, "%d", &i);
if (i < 0) i = 0;
if (i >= NUM_DIRECTIONS) i = DI_NONE;
_walkToDir = (TDirection)i;
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 2e8e77d36e..58b3250deb 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -1171,14 +1171,14 @@ HRESULT CAdGame::loadBuffer(byte *buffer, bool complete) {
bool itemFound = false, itemsFound = false;
- while (cmd > 0 && (cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_GAME:
if (FAILED(CBGame::loadBuffer(params, false))) cmd = PARSERR_GENERIC;
break;
case TOKEN_AD_GAME:
- while (cmd > 0 && (cmd = parser.GetCommand((char **)&params, commands, (char **)&params2)) > 0) {
+ while (cmd > 0 && (cmd = parser.getCommand((char **)&params, commands, (char **)&params2)) > 0) {
switch (cmd) {
case TOKEN_RESPONSE_BOX:
delete _responseBox;
@@ -1222,7 +1222,7 @@ HRESULT CAdGame::loadBuffer(byte *buffer, bool complete) {
case TOKEN_SCENE_VIEWPORT: {
RECT rc;
- parser.ScanStr((char *)params2, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
+ parser.scanStr((char *)params2, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
if (!_sceneViewport) _sceneViewport = new CBViewport(Game);
if (_sceneViewport) _sceneViewport->setRect(rc.left, rc.top, rc.right, rc.bottom);
}
@@ -1419,7 +1419,7 @@ HRESULT CAdGame::loadItemsBuffer(byte *buffer, bool merge) {
while (_items.GetSize() > 0) deleteItem(_items[0]);
}
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_ITEM: {
CAdItem *item = new CAdItem(Game);
@@ -1492,7 +1492,7 @@ HRESULT CAdGame::windowLoadHook(CUIWindow *win, char **buffer, char **params) {
int cmd = PARSERR_GENERIC;
CBParser parser(Game);
- cmd = parser.GetCommand(buffer, commands, params);
+ cmd = parser.getCommand(buffer, commands, params);
switch (cmd) {
case TOKEN_ENTITY_CONTAINER: {
CUIEntity *ent = new CUIEntity(Game);
diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index 7ebcc4457f..8472ab122e 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -217,14 +217,14 @@ HRESULT CAdInventoryBox::loadBuffer(byte *buffer, bool complete) {
_exclusive = false;
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_INVENTORY_BOX) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_INVENTORY_BOX) {
Game->LOG(0, "'INVENTORY_BOX' keyword expected.");
return E_FAIL;
}
buffer = params;
}
- while (cmd > 0 && (cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
@@ -249,35 +249,35 @@ HRESULT CAdInventoryBox::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_AREA:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &_itemsArea.left, &_itemsArea.top, &_itemsArea.right, &_itemsArea.bottom);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &_itemsArea.left, &_itemsArea.top, &_itemsArea.right, &_itemsArea.bottom);
break;
case TOKEN_EXCLUSIVE:
- parser.ScanStr((char *)params, "%b", &_exclusive);
+ parser.scanStr((char *)params, "%b", &_exclusive);
break;
case TOKEN_HIDE_SELECTED:
- parser.ScanStr((char *)params, "%b", &_hideSelected);
+ parser.scanStr((char *)params, "%b", &_hideSelected);
break;
case TOKEN_ALWAYS_VISIBLE:
- parser.ScanStr((char *)params, "%b", &always_visible);
+ parser.scanStr((char *)params, "%b", &always_visible);
break;
case TOKEN_SPACING:
- parser.ScanStr((char *)params, "%d", &_spacing);
+ parser.scanStr((char *)params, "%d", &_spacing);
break;
case TOKEN_ITEM_WIDTH:
- parser.ScanStr((char *)params, "%d", &_itemWidth);
+ parser.scanStr((char *)params, "%d", &_itemWidth);
break;
case TOKEN_ITEM_HEIGHT:
- parser.ScanStr((char *)params, "%d", &_itemHeight);
+ parser.scanStr((char *)params, "%d", &_itemHeight);
break;
case TOKEN_SCROLL_BY:
- parser.ScanStr((char *)params, "%d", &_scrollBy);
+ parser.scanStr((char *)params, "%d", &_scrollBy);
break;
case TOKEN_EDITOR_PROPERTY:
diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index 2ef7f0c200..e431ca78cf 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -169,7 +169,7 @@ HRESULT CAdItem::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ITEM) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ITEM) {
Game->LOG(0, "'ITEM' keyword expected.");
return E_FAIL;
}
@@ -177,7 +177,7 @@ HRESULT CAdItem::loadBuffer(byte *buffer, bool complete) {
}
int ar = 0, ag = 0, ab = 0, alpha = 255;
- while (cmd > 0 && (cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
@@ -216,19 +216,19 @@ HRESULT CAdItem::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_AMOUNT:
- parser.ScanStr((char *)params, "%d", &_amount);
+ parser.scanStr((char *)params, "%d", &_amount);
break;
case TOKEN_DISPLAY_AMOUNT:
- parser.ScanStr((char *)params, "%b", &_displayAmount);
+ parser.scanStr((char *)params, "%b", &_displayAmount);
break;
case TOKEN_AMOUNT_OFFSET_X:
- parser.ScanStr((char *)params, "%d", &_amountOffsetX);
+ parser.scanStr((char *)params, "%d", &_amountOffsetX);
break;
case TOKEN_AMOUNT_OFFSET_Y:
- parser.ScanStr((char *)params, "%d", &_amountOffsetY);
+ parser.scanStr((char *)params, "%d", &_amountOffsetY);
break;
case TOKEN_AMOUNT_ALIGN:
@@ -276,7 +276,7 @@ HRESULT CAdItem::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_CURSOR_COMBINED:
- parser.ScanStr((char *)params, "%b", &_cursorCombined);
+ parser.scanStr((char *)params, "%b", &_cursorCombined);
break;
case TOKEN_SCRIPT:
@@ -288,11 +288,11 @@ HRESULT CAdItem::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_ALPHA_COLOR:
- parser.ScanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);
+ parser.scanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);
break;
case TOKEN_ALPHA:
- parser.ScanStr((char *)params, "%d", &alpha);
+ parser.scanStr((char *)params, "%d", &alpha);
break;
case TOKEN_EDITOR_PROPERTY:
diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp
index e71a31587c..64d36e67db 100644
--- a/engines/wintermute/Ad/AdLayer.cpp
+++ b/engines/wintermute/Ad/AdLayer.cpp
@@ -123,14 +123,14 @@ HRESULT CAdLayer::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_LAYER) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_LAYER) {
Game->LOG(0, "'LAYER' keyword expected.");
return E_FAIL;
}
buffer = params;
}
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
@@ -145,23 +145,23 @@ HRESULT CAdLayer::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_MAIN:
- parser.ScanStr((char *)params, "%b", &_main);
+ parser.scanStr((char *)params, "%b", &_main);
break;
case TOKEN_CLOSE_UP:
- parser.ScanStr((char *)params, "%b", &_closeUp);
+ parser.scanStr((char *)params, "%b", &_closeUp);
break;
case TOKEN_WIDTH:
- parser.ScanStr((char *)params, "%d", &_width);
+ parser.scanStr((char *)params, "%d", &_width);
break;
case TOKEN_HEIGHT:
- parser.ScanStr((char *)params, "%d", &_height);
+ parser.scanStr((char *)params, "%d", &_height);
break;
case TOKEN_ACTIVE:
- parser.ScanStr((char *)params, "%b", &_active);
+ parser.scanStr((char *)params, "%b", &_active);
break;
case TOKEN_REGION: {
@@ -198,7 +198,7 @@ HRESULT CAdLayer::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_EDITOR_SELECTED:
- parser.ScanStr((char *)params, "%b", &_editorSelected);
+ parser.scanStr((char *)params, "%b", &_editorSelected);
break;
case TOKEN_SCRIPT:
diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp
index 6aa201c60d..0ea0bb9ed1 100644
--- a/engines/wintermute/Ad/AdRegion.cpp
+++ b/engines/wintermute/Ad/AdRegion.cpp
@@ -121,7 +121,7 @@ HRESULT CAdRegion::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_REGION) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_REGION) {
Game->LOG(0, "'REGION' keyword expected.");
return E_FAIL;
}
@@ -133,7 +133,7 @@ HRESULT CAdRegion::loadBuffer(byte *buffer, bool complete) {
int ar = 255, ag = 255, ab = 255, alpha = 255;
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
@@ -148,46 +148,46 @@ HRESULT CAdRegion::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_ACTIVE:
- parser.ScanStr((char *)params, "%b", &_active);
+ parser.scanStr((char *)params, "%b", &_active);
break;
case TOKEN_BLOCKED:
- parser.ScanStr((char *)params, "%b", &_blocked);
+ parser.scanStr((char *)params, "%b", &_blocked);
break;
case TOKEN_DECORATION:
- parser.ScanStr((char *)params, "%b", &_decoration);
+ parser.scanStr((char *)params, "%b", &_decoration);
break;
case TOKEN_ZOOM:
case TOKEN_SCALE: {
int j;
- parser.ScanStr((char *)params, "%d", &j);
+ parser.scanStr((char *)params, "%d", &j);
_zoom = (float)j;
}
break;
case TOKEN_POINT: {
int x, y;
- parser.ScanStr((char *)params, "%d,%d", &x, &y);
+ parser.scanStr((char *)params, "%d,%d", &x, &y);
_points.Add(new CBPoint(x, y));
}
break;
case TOKEN_ALPHA_COLOR:
- parser.ScanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);
+ parser.scanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);
break;
case TOKEN_ALPHA:
- parser.ScanStr((char *)params, "%d", &alpha);
+ parser.scanStr((char *)params, "%d", &alpha);
break;
case TOKEN_EDITOR_SELECTED:
- parser.ScanStr((char *)params, "%b", &_editorSelected);
+ parser.scanStr((char *)params, "%b", &_editorSelected);
break;
case TOKEN_EDITOR_SELECTED_POINT:
- parser.ScanStr((char *)params, "%d", &_editorSelectedPoint);
+ parser.scanStr((char *)params, "%d", &_editorSelectedPoint);
break;
case TOKEN_SCRIPT:
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index 6841705701..eb9912fb14 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -245,14 +245,14 @@ HRESULT CAdResponseBox::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_RESPONSE_BOX) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_RESPONSE_BOX) {
Game->LOG(0, "'RESPONSE_BOX' keyword expected.");
return E_FAIL;
}
buffer = params;
}
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
@@ -281,11 +281,11 @@ HRESULT CAdResponseBox::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_AREA:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &_responseArea.left, &_responseArea.top, &_responseArea.right, &_responseArea.bottom);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &_responseArea.left, &_responseArea.top, &_responseArea.right, &_responseArea.bottom);
break;
case TOKEN_HORIZONTAL:
- parser.ScanStr((char *)params, "%b", &_horizontal);
+ parser.scanStr((char *)params, "%b", &_horizontal);
break;
case TOKEN_TEXT_ALIGN:
@@ -301,7 +301,7 @@ HRESULT CAdResponseBox::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_SPACING:
- parser.ScanStr((char *)params, "%d", &_spacing);
+ parser.scanStr((char *)params, "%d", &_spacing);
break;
case TOKEN_EDITOR_PROPERTY:
diff --git a/engines/wintermute/Ad/AdRotLevel.cpp b/engines/wintermute/Ad/AdRotLevel.cpp
index 356771d0fa..dbe00460dc 100644
--- a/engines/wintermute/Ad/AdRotLevel.cpp
+++ b/engines/wintermute/Ad/AdRotLevel.cpp
@@ -96,26 +96,26 @@ HRESULT CAdRotLevel::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ROTATION_LEVEL) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ROTATION_LEVEL) {
Game->LOG(0, "'ROTATION_LEVEL' keyword expected.");
return E_FAIL;
}
buffer = params;
}
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
break;
case TOKEN_X:
- parser.ScanStr((char *)params, "%d", &_posX);
+ parser.scanStr((char *)params, "%d", &_posX);
break;
case TOKEN_ROTATION: {
int i;
- parser.ScanStr((char *)params, "%d", &i);
+ parser.scanStr((char *)params, "%d", &i);
_rotation = (float)i;
}
break;
diff --git a/engines/wintermute/Ad/AdScaleLevel.cpp b/engines/wintermute/Ad/AdScaleLevel.cpp
index ba3a9806c6..d0f1d479b3 100644
--- a/engines/wintermute/Ad/AdScaleLevel.cpp
+++ b/engines/wintermute/Ad/AdScaleLevel.cpp
@@ -94,26 +94,26 @@ HRESULT CAdScaleLevel::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SCALE_LEVEL) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SCALE_LEVEL) {
Game->LOG(0, "'SCALE_LEVEL' keyword expected.");
return E_FAIL;
}
buffer = params;
}
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
break;
case TOKEN_Y:
- parser.ScanStr((char *)params, "%d", &_posY);
+ parser.scanStr((char *)params, "%d", &_posY);
break;
case TOKEN_SCALE: {
int i;
- parser.ScanStr((char *)params, "%d", &i);
+ parser.scanStr((char *)params, "%d", &i);
_scale = (float)i;
}
break;
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index 3c73d1b33a..7415de6add 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -613,7 +613,7 @@ HRESULT CAdScene::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SCENE) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SCENE) {
Game->LOG(0, "'SCENE' keyword expected.");
return E_FAIL;
}
@@ -624,7 +624,7 @@ HRESULT CAdScene::loadBuffer(byte *buffer, bool complete) {
char camera[MAX_PATH] = "";
/* float WaypointHeight = -1.0f; */
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
@@ -722,91 +722,91 @@ HRESULT CAdScene::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_EDITOR_MARGIN_H:
- parser.ScanStr((char *)params, "%d", &_editorMarginH);
+ parser.scanStr((char *)params, "%d", &_editorMarginH);
break;
case TOKEN_EDITOR_MARGIN_V:
- parser.ScanStr((char *)params, "%d", &_editorMarginV);
+ parser.scanStr((char *)params, "%d", &_editorMarginV);
break;
case TOKEN_EDITOR_COLOR_FRAME:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColFrame = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_ENTITY:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColEntity = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_ENTITY_SEL:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColEntitySel = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_REGION_SEL:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColRegionSel = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_DECORATION_SEL:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColDecorSel = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_BLOCKED_SEL:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColBlockedSel = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_WAYPOINTS_SEL:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColWaypointsSel = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_REGION:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColRegion = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_DECORATION:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColDecor = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_BLOCKED:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColBlocked = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_WAYPOINTS:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColWaypoints = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_COLOR_SCALE:
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &ar, &ag, &ab, &aa);
_editorColScale = DRGBA(ar, ag, ab, aa);
break;
case TOKEN_EDITOR_SHOW_REGIONS:
- parser.ScanStr((char *)params, "%b", &_editorShowRegions);
+ parser.scanStr((char *)params, "%b", &_editorShowRegions);
break;
case TOKEN_EDITOR_SHOW_BLOCKED:
- parser.ScanStr((char *)params, "%b", &_editorShowBlocked);
+ parser.scanStr((char *)params, "%b", &_editorShowBlocked);
break;
case TOKEN_EDITOR_SHOW_DECORATION:
- parser.ScanStr((char *)params, "%b", &_editorShowDecor);
+ parser.scanStr((char *)params, "%b", &_editorShowDecor);
break;
case TOKEN_EDITOR_SHOW_ENTITIES:
- parser.ScanStr((char *)params, "%b", &_editorShowEntities);
+ parser.scanStr((char *)params, "%b", &_editorShowEntities);
break;
case TOKEN_EDITOR_SHOW_SCALE:
- parser.ScanStr((char *)params, "%b", &_editorShowScale);
+ parser.scanStr((char *)params, "%b", &_editorShowScale);
break;
case TOKEN_SCRIPT:
@@ -819,17 +819,17 @@ HRESULT CAdScene::loadBuffer(byte *buffer, bool complete) {
case TOKEN_VIEWPORT: {
RECT rc;
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &rc.left, &rc.top, &rc.right, &rc.bottom);
if (!_viewport) _viewport = new CBViewport(Game);
if (_viewport) _viewport->setRect(rc.left, rc.top, rc.right, rc.bottom, true);
}
case TOKEN_PERSISTENT_STATE:
- parser.ScanStr((char *)params, "%b", &_persistentState);
+ parser.scanStr((char *)params, "%b", &_persistentState);
break;
case TOKEN_PERSISTENT_STATE_SPRITES:
- parser.ScanStr((char *)params, "%b", &_persistentStateSprites);
+ parser.scanStr((char *)params, "%b", &_persistentStateSprites);
break;
case TOKEN_EDITOR_PROPERTY:
diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp
index 26844667d9..296511491d 100644
--- a/engines/wintermute/Ad/AdSpriteSet.cpp
+++ b/engines/wintermute/Ad/AdSpriteSet.cpp
@@ -111,7 +111,7 @@ HRESULT CAdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpr
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SPRITESET) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SPRITESET) {
Game->LOG(0, "'SPRITESET' keyword expected.");
return E_FAIL;
}
@@ -119,7 +119,7 @@ HRESULT CAdSpriteSet::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpr
}
CBSprite *spr = NULL;
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params, lifeTime, CacheType))) cmd = PARSERR_GENERIC;
diff --git a/engines/wintermute/Ad/AdTalkDef.cpp b/engines/wintermute/Ad/AdTalkDef.cpp
index 5b7f4b5e7a..8c48942de5 100644
--- a/engines/wintermute/Ad/AdTalkDef.cpp
+++ b/engines/wintermute/Ad/AdTalkDef.cpp
@@ -114,14 +114,14 @@ HRESULT CAdTalkDef::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_TALK) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_TALK) {
Game->LOG(0, "'TALK' keyword expected.");
return E_FAIL;
}
buffer = params;
}
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
diff --git a/engines/wintermute/Ad/AdTalkNode.cpp b/engines/wintermute/Ad/AdTalkNode.cpp
index 0cfadf396a..b398f84cfe 100644
--- a/engines/wintermute/Ad/AdTalkNode.cpp
+++ b/engines/wintermute/Ad/AdTalkNode.cpp
@@ -98,7 +98,7 @@ HRESULT CAdTalkNode::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ACTION) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ACTION) {
Game->LOG(0, "'ACTION' keyword expected.");
return E_FAIL;
}
@@ -109,7 +109,7 @@ HRESULT CAdTalkNode::loadBuffer(byte *buffer, bool complete) {
_playToEnd = false;
_preCache = false;
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_SPRITE:
CBUtils::setString(&_spriteFilename, (char *)params);
@@ -131,15 +131,15 @@ HRESULT CAdTalkNode::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_START_TIME:
- parser.ScanStr((char *)params, "%d", &_startTime);
+ parser.scanStr((char *)params, "%d", &_startTime);
break;
case TOKEN_END_TIME:
- parser.ScanStr((char *)params, "%d", &_endTime);
+ parser.scanStr((char *)params, "%d", &_endTime);
break;
case TOKEN_PRECACHE:
- parser.ScanStr((char *)params, "%b", &_preCache);
+ parser.scanStr((char *)params, "%b", &_preCache);
break;
case TOKEN_COMMENT:
diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp
index 0dde814fed..b845f4e02e 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.cpp
+++ b/engines/wintermute/Ad/AdWaypointGroup.cpp
@@ -113,14 +113,14 @@ HRESULT CAdWaypointGroup::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_WAYPOINTS) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_WAYPOINTS) {
Game->LOG(0, "'WAYPOINTS' keyword expected.");
return E_FAIL;
}
buffer = params;
}
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_TEMPLATE:
if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;
@@ -132,17 +132,17 @@ HRESULT CAdWaypointGroup::loadBuffer(byte *buffer, bool complete) {
case TOKEN_POINT: {
int x, y;
- parser.ScanStr((char *)params, "%d,%d", &x, &y);
+ parser.scanStr((char *)params, "%d,%d", &x, &y);
_points.Add(new CBPoint(x, y));
}
break;
case TOKEN_EDITOR_SELECTED:
- parser.ScanStr((char *)params, "%b", &_editorSelected);
+ parser.scanStr((char *)params, "%b", &_editorSelected);
break;
case TOKEN_EDITOR_SELECTED_POINT:
- parser.ScanStr((char *)params, "%d", &_editorSelectedPoint);
+ parser.scanStr((char *)params, "%d", &_editorSelectedPoint);
break;
case TOKEN_PROPERTY:
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-06 16:26:37 +0000