aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Base
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/Base')
-rw-r--r--engines/wintermute/Base/BBase.cpp4
-rw-r--r--engines/wintermute/Base/BFont.cpp4
-rw-r--r--engines/wintermute/Base/BFontBitmap.cpp28
-rw-r--r--engines/wintermute/Base/BFontTT.cpp28
-rw-r--r--engines/wintermute/Base/BFrame.cpp34
-rw-r--r--engines/wintermute/Base/BGame.cpp60
-rw-r--r--engines/wintermute/Base/BParser.cpp48
-rw-r--r--engines/wintermute/Base/BParser.h27
-rw-r--r--engines/wintermute/Base/BRegion.cpp10
-rw-r--r--engines/wintermute/Base/BScriptHolder.cpp4
-rw-r--r--engines/wintermute/Base/BSprite.cpp22
-rw-r--r--engines/wintermute/Base/BSubFrame.cpp24
12 files changed, 147 insertions, 146 deletions
diff --git a/engines/wintermute/Base/BBase.cpp b/engines/wintermute/Base/BBase.cpp
index 3ca29e9dcd..f101eea69f 100644
--- a/engines/wintermute/Base/BBase.cpp
+++ b/engines/wintermute/Base/BBase.cpp
@@ -101,7 +101,7 @@ HRESULT CBBase::parseEditorProperty(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_EDITOR_PROPERTY) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_EDITOR_PROPERTY) {
Game->LOG(0, "'EDITOR_PROPERTY' keyword expected.");
return E_FAIL;
}
@@ -111,7 +111,7 @@ HRESULT CBBase::parseEditorProperty(byte *buffer, bool complete) {
char *propName = NULL;
char *propValue = 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_NAME:
delete[] propName;
diff --git a/engines/wintermute/Base/BFont.cpp b/engines/wintermute/Base/BFont.cpp
index 490b4be35d..d394f3e21b 100644
--- a/engines/wintermute/Base/BFont.cpp
+++ b/engines/wintermute/Base/BFont.cpp
@@ -121,7 +121,7 @@ HRESULT CBFont::loadBuffer(byte * Buffer)
break;
case TOKEN_TRANSPARENT:
- parser.ScanStr(params, "%d,%d,%d", &r, &g, &b);
+ parser.scanStr(params, "%d,%d,%d", &r, &g, &b);
custo_trans = true;
break;
}
@@ -196,7 +196,7 @@ bool CBFont::isTrueType(CBGame *Game, const char *filename) {
CBParser parser(Game);
bool ret = false;
- if (parser.GetCommand((char **)&WorkBuffer, commands, (char **)&params) == TOKEN_TTFONT)
+ if (parser.getCommand((char **)&WorkBuffer, commands, (char **)&params) == TOKEN_TTFONT)
ret = true;
delete [] buffer;
diff --git a/engines/wintermute/Base/BFontBitmap.cpp b/engines/wintermute/Base/BFontBitmap.cpp
index 4f60dea478..06c6055101 100644
--- a/engines/wintermute/Base/BFontBitmap.cpp
+++ b/engines/wintermute/Base/BFontBitmap.cpp
@@ -308,7 +308,7 @@ HRESULT CBFontBitmap::loadBuffer(byte *buffer) {
int cmd;
CBParser parser(Game);
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_FONT) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_FONT) {
Game->LOG(0, "'FONT' keyword expected.");
return E_FAIL;
}
@@ -327,7 +327,7 @@ HRESULT CBFontBitmap::loadBuffer(byte *buffer) {
int spaceWidth = 0;
int expandWidth = 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_IMAGE:
@@ -339,55 +339,55 @@ HRESULT CBFontBitmap::loadBuffer(byte *buffer) {
break;
case TOKEN_TRANSPARENT:
- parser.ScanStr(params, "%d,%d,%d", &r, &g, &b);
+ parser.scanStr(params, "%d,%d,%d", &r, &g, &b);
custoTrans = true;
break;
case TOKEN_WIDTHS:
- parser.ScanStr(params, "%D", widths, &num);
+ parser.scanStr(params, "%D", widths, &num);
for (i = 0; lastWidth < NUM_CHARACTERS, num > 0; lastWidth++, num--, i++) {
_widths[lastWidth] = (byte)widths[i];
}
break;
case TOKEN_DEFAULT_WIDTH:
- parser.ScanStr(params, "%d", &default_width);
+ parser.scanStr(params, "%d", &default_width);
break;
case TOKEN_WIDTHS_FRAME:
- parser.ScanStr(params, "%d", &_widthsFrame);
+ parser.scanStr(params, "%d", &_widthsFrame);
break;
case TOKEN_COLUMNS:
- parser.ScanStr(params, "%d", &_numColumns);
+ parser.scanStr(params, "%d", &_numColumns);
break;
case TOKEN_TILE_WIDTH:
- parser.ScanStr(params, "%d", &_tileWidth);
+ parser.scanStr(params, "%d", &_tileWidth);
break;
case TOKEN_TILE_HEIGHT:
- parser.ScanStr(params, "%d", &_tileHeight);
+ parser.scanStr(params, "%d", &_tileHeight);
break;
case TOKEN_AUTO_WIDTH:
- parser.ScanStr(params, "%b", &autoWidth);
+ parser.scanStr(params, "%b", &autoWidth);
break;
case TOKEN_FONTEXT_FIX:
- parser.ScanStr(params, "%b", &_fontextFix);
+ parser.scanStr(params, "%b", &_fontextFix);
break;
case TOKEN_PAINT_WHOLE_CELL:
- parser.ScanStr(params, "%b", &_wholeCell);
+ parser.scanStr(params, "%b", &_wholeCell);
break;
case TOKEN_SPACE_WIDTH:
- parser.ScanStr(params, "%d", &spaceWidth);
+ parser.scanStr(params, "%d", &spaceWidth);
break;
case TOKEN_EXPAND_WIDTH:
- parser.ScanStr(params, "%d", &expandWidth);
+ parser.scanStr(params, "%d", &expandWidth);
break;
case TOKEN_EDITOR_PROPERTY:
diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp
index 36231b5622..7eafd5fd90 100644
--- a/engines/wintermute/Base/BFontTT.cpp
+++ b/engines/wintermute/Base/BFontTT.cpp
@@ -460,7 +460,7 @@ HRESULT CBFontTT::loadBuffer(byte *buffer) {
int cmd;
CBParser parser(Game);
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_TTFONT) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_TTFONT) {
Game->LOG(0, "'TTFONT' keyword expected.");
return E_FAIL;
}
@@ -468,10 +468,10 @@ HRESULT CBFontTT::loadBuffer(byte *buffer) {
uint32 BaseColor = 0x00000000;
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_SIZE:
- parser.ScanStr(params, "%d", &_fontHeight);
+ parser.scanStr(params, "%d", &_fontHeight);
break;
case TOKEN_FACE:
@@ -483,19 +483,19 @@ HRESULT CBFontTT::loadBuffer(byte *buffer) {
break;
case TOKEN_BOLD:
- parser.ScanStr(params, "%b", &_isBold);
+ parser.scanStr(params, "%b", &_isBold);
break;
case TOKEN_ITALIC:
- parser.ScanStr(params, "%b", &_isItalic);
+ parser.scanStr(params, "%b", &_isItalic);
break;
case TOKEN_UNDERLINE:
- parser.ScanStr(params, "%b", &_isUnderline);
+ parser.scanStr(params, "%b", &_isUnderline);
break;
case TOKEN_STRIKE:
- parser.ScanStr(params, "%b", &_isStriked);
+ parser.scanStr(params, "%b", &_isStriked);
break;
case TOKEN_CHARSET:
@@ -504,14 +504,14 @@ HRESULT CBFontTT::loadBuffer(byte *buffer) {
case TOKEN_COLOR: {
int r, g, b;
- parser.ScanStr(params, "%d,%d,%d", &r, &g, &b);
+ parser.scanStr(params, "%d,%d,%d", &r, &g, &b);
BaseColor = DRGBA(r, g, b, D3DCOLGetA(BaseColor));
}
break;
case TOKEN_ALPHA: {
int a;
- parser.ScanStr(params, "%d", &a);
+ parser.scanStr(params, "%d", &a);
BaseColor = DRGBA(D3DCOLGetR(BaseColor), D3DCOLGetG(BaseColor), D3DCOLGetB(BaseColor), a);
}
break;
@@ -560,26 +560,26 @@ HRESULT CBFontTT::parseLayer(CBTTFontLayer *layer, byte *buffer) {
int cmd;
CBParser parser(Game);
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_OFFSET_X:
- parser.ScanStr(params, "%d", &layer->_offsetX);
+ parser.scanStr(params, "%d", &layer->_offsetX);
break;
case TOKEN_OFFSET_Y:
- parser.ScanStr(params, "%d", &layer->_offsetY);
+ parser.scanStr(params, "%d", &layer->_offsetY);
break;
case TOKEN_COLOR: {
int r, g, b;
- parser.ScanStr(params, "%d,%d,%d", &r, &g, &b);
+ parser.scanStr(params, "%d,%d,%d", &r, &g, &b);
layer->_color = DRGBA(r, g, b, D3DCOLGetA(layer->_color));
}
break;
case TOKEN_ALPHA: {
int a;
- parser.ScanStr(params, "%d", &a);
+ parser.scanStr(params, "%d", &a);
layer->_color = DRGBA(D3DCOLGetR(layer->_color), D3DCOLGetG(layer->_color), D3DCOLGetB(layer->_color), a);
}
break;
diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp
index b5dce4f041..58b0b5384b 100644
--- a/engines/wintermute/Base/BFrame.cpp
+++ b/engines/wintermute/Base/BFrame.cpp
@@ -173,10 +173,10 @@ HRESULT CBFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) {
CBPlatform::SetRectEmpty(&rect);
char *surface_file = NULL;
- while ((cmd = parser.GetCommand((char **)&buffer, commands, &params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, &params)) > 0) {
switch (cmd) {
case TOKEN_DELAY:
- parser.ScanStr(params, "%d", &_delay);
+ parser.scanStr(params, "%d", &_delay);
break;
case TOKEN_IMAGE:
@@ -184,56 +184,56 @@ HRESULT CBFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) {
break;
case TOKEN_TRANSPARENT:
- parser.ScanStr(params, "%d,%d,%d", &r, &g, &b);
+ parser.scanStr(params, "%d,%d,%d", &r, &g, &b);
custoTrans = true;
break;
case TOKEN_RECT:
- parser.ScanStr(params, "%d,%d,%d,%d", &rect.left, &rect.top, &rect.right, &rect.bottom);
+ parser.scanStr(params, "%d,%d,%d,%d", &rect.left, &rect.top, &rect.right, &rect.bottom);
break;
case TOKEN_HOTSPOT:
- parser.ScanStr(params, "%d,%d", &hotspotX, &hotspotY);
+ parser.scanStr(params, "%d,%d", &hotspotX, &hotspotY);
break;
case TOKEN_MOVE:
- parser.ScanStr(params, "%d,%d", &_moveX, &_moveY);
+ parser.scanStr(params, "%d,%d", &_moveX, &_moveY);
break;
case TOKEN_2D_ONLY:
- parser.ScanStr(params, "%b", &is2DOnly);
+ parser.scanStr(params, "%b", &is2DOnly);
break;
case TOKEN_3D_ONLY:
- parser.ScanStr(params, "%b", &is3DOnly);
+ parser.scanStr(params, "%b", &is3DOnly);
break;
case TOKEN_MIRROR_X:
- parser.ScanStr(params, "%b", &mirrorX);
+ parser.scanStr(params, "%b", &mirrorX);
break;
case TOKEN_MIRROR_Y:
- parser.ScanStr(params, "%b", &mirrorY);
+ parser.scanStr(params, "%b", &mirrorY);
break;
case TOKEN_ALPHA_COLOR:
- parser.ScanStr(params, "%d,%d,%d", &ar, &ag, &ab);
+ parser.scanStr(params, "%d,%d,%d", &ar, &ag, &ab);
break;
case TOKEN_ALPHA:
- parser.ScanStr(params, "%d", &alpha);
+ parser.scanStr(params, "%d", &alpha);
break;
case TOKEN_EDITOR_SELECTED:
- parser.ScanStr(params, "%b", &editorSelected);
+ parser.scanStr(params, "%b", &editorSelected);
break;
case TOKEN_EDITOR_EXPANDED:
- parser.ScanStr(params, "%b", &_editorExpanded);
+ parser.scanStr(params, "%b", &_editorExpanded);
break;
case TOKEN_KILL_SOUND:
- parser.ScanStr(params, "%b", &_killSound);
+ parser.scanStr(params, "%b", &_killSound);
break;
case TOKEN_SUBFRAME: {
@@ -267,11 +267,11 @@ HRESULT CBFrame::loadBuffer(byte *buffer, int lifeTime, bool keepLoaded) {
break;
case TOKEN_KEYFRAME:
- parser.ScanStr(params, "%b", &_keyframe);
+ parser.scanStr(params, "%b", &_keyframe);
break;
case TOKEN_DECORATION:
- parser.ScanStr(params, "%b", &decoration);
+ parser.scanStr(params, "%b", &decoration);
break;
case TOKEN_EDITOR_PROPERTY:
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index f9819e9e27..a44c5c7e52 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -811,14 +811,14 @@ HRESULT CBGame::loadBuffer(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_GAME) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_GAME) {
Game->LOG(0, "'GAME' 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;
@@ -883,19 +883,19 @@ HRESULT CBGame::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_PERSONAL_SAVEGAMES:
- parser.ScanStr((char *)params, "%b", &_personalizedSave);
+ parser.scanStr((char *)params, "%b", &_personalizedSave);
break;
case TOKEN_SUBTITLES:
- parser.ScanStr((char *)params, "%b", &_subtitles);
+ parser.scanStr((char *)params, "%b", &_subtitles);
break;
case TOKEN_SUBTITLES_SPEED:
- parser.ScanStr((char *)params, "%d", &_subtitlesSpeed);
+ parser.scanStr((char *)params, "%d", &_subtitlesSpeed);
break;
case TOKEN_VIDEO_SUBTITLES:
- parser.ScanStr((char *)params, "%b", &_videoSubtitles);
+ parser.scanStr((char *)params, "%b", &_videoSubtitles);
break;
case TOKEN_PROPERTY:
@@ -907,34 +907,34 @@ HRESULT CBGame::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_THUMBNAIL_WIDTH:
- parser.ScanStr((char *)params, "%d", &_thumbnailWidth);
+ parser.scanStr((char *)params, "%d", &_thumbnailWidth);
break;
case TOKEN_THUMBNAIL_HEIGHT:
- parser.ScanStr((char *)params, "%d", &_thumbnailHeight);
+ parser.scanStr((char *)params, "%d", &_thumbnailHeight);
break;
case TOKEN_INDICATOR_X:
- parser.ScanStr((char *)params, "%d", &_indicatorX);
+ parser.scanStr((char *)params, "%d", &_indicatorX);
break;
case TOKEN_INDICATOR_Y:
- parser.ScanStr((char *)params, "%d", &_indicatorY);
+ parser.scanStr((char *)params, "%d", &_indicatorY);
break;
case TOKEN_INDICATOR_COLOR: {
int r, g, b, a;
- parser.ScanStr((char *)params, "%d,%d,%d,%d", &r, &g, &b, &a);
+ parser.scanStr((char *)params, "%d,%d,%d,%d", &r, &g, &b, &a);
_indicatorColor = DRGBA(r, g, b, a);
}
break;
case TOKEN_INDICATOR_WIDTH:
- parser.ScanStr((char *)params, "%d", &_indicatorWidth);
+ parser.scanStr((char *)params, "%d", &_indicatorWidth);
break;
case TOKEN_INDICATOR_HEIGHT:
- parser.ScanStr((char *)params, "%d", &_indicatorHeight);
+ parser.scanStr((char *)params, "%d", &_indicatorHeight);
break;
case TOKEN_SAVE_IMAGE:
@@ -942,11 +942,11 @@ HRESULT CBGame::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_SAVE_IMAGE_X:
- parser.ScanStr((char *)params, "%d", &_saveImageX);
+ parser.scanStr((char *)params, "%d", &_saveImageX);
break;
case TOKEN_SAVE_IMAGE_Y:
- parser.ScanStr((char *)params, "%d", &_saveImageY);
+ parser.scanStr((char *)params, "%d", &_saveImageY);
break;
case TOKEN_LOAD_IMAGE:
@@ -954,11 +954,11 @@ HRESULT CBGame::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_LOAD_IMAGE_X:
- parser.ScanStr((char *)params, "%d", &_loadImageX);
+ parser.scanStr((char *)params, "%d", &_loadImageX);
break;
case TOKEN_LOAD_IMAGE_Y:
- parser.ScanStr((char *)params, "%d", &_loadImageY);
+ parser.scanStr((char *)params, "%d", &_loadImageY);
break;
case TOKEN_LOCAL_SAVE_DIR:
@@ -966,7 +966,7 @@ HRESULT CBGame::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_COMPAT_KILL_METHOD_THREADS:
- parser.ScanStr((char *)params, "%b", &_compatKillMethodThreads);
+ parser.scanStr((char *)params, "%b", &_compatKillMethodThreads);
break;
}
}
@@ -3534,12 +3534,12 @@ HRESULT CBGame::loadSettings(const char *filename) {
int cmd;
CBParser parser(Game);
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SETTINGS) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SETTINGS) {
Game->LOG(0, "'SETTINGS' keyword expected in game settings file.");
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_GAME:
delete[] _settingsGameFile;
@@ -3552,39 +3552,39 @@ HRESULT CBGame::loadSettings(const char *filename) {
break;
case TOKEN_RESOLUTION:
- parser.ScanStr((char *)params, "%d,%d", &_settingsResWidth, &_settingsResHeight);
+ parser.scanStr((char *)params, "%d,%d", &_settingsResWidth, &_settingsResHeight);
break;
case TOKEN_REQUIRE_3D_ACCELERATION:
- parser.ScanStr((char *)params, "%b", &_settingsRequireAcceleration);
+ parser.scanStr((char *)params, "%b", &_settingsRequireAcceleration);
break;
case TOKEN_REQUIRE_SOUND:
- parser.ScanStr((char *)params, "%b", &_settingsRequireSound);
+ parser.scanStr((char *)params, "%b", &_settingsRequireSound);
break;
case TOKEN_HWTL_MODE:
- parser.ScanStr((char *)params, "%d", &_settingsTLMode);
+ parser.scanStr((char *)params, "%d", &_settingsTLMode);
break;
case TOKEN_ALLOW_WINDOWED_MODE:
- parser.ScanStr((char *)params, "%b", &_settingsAllowWindowed);
+ parser.scanStr((char *)params, "%b", &_settingsAllowWindowed);
break;
case TOKEN_ALLOW_DESKTOP_RES:
- parser.ScanStr((char *)params, "%b", &_settingsAllowDesktopRes);
+ parser.scanStr((char *)params, "%b", &_settingsAllowDesktopRes);
break;
case TOKEN_ALLOW_ADVANCED:
- parser.ScanStr((char *)params, "%b", &_settingsAllowAdvanced);
+ parser.scanStr((char *)params, "%b", &_settingsAllowAdvanced);
break;
case TOKEN_ALLOW_ACCESSIBILITY_TAB:
- parser.ScanStr((char *)params, "%b", &_settingsAllowAccessTab);
+ parser.scanStr((char *)params, "%b", &_settingsAllowAccessTab);
break;
case TOKEN_ALLOW_ABOUT_TAB:
- parser.ScanStr((char *)params, "%b", &_settingsAllowAboutTab);
+ parser.scanStr((char *)params, "%b", &_settingsAllowAboutTab);
break;
case TOKEN_REGISTRY_PATH:
@@ -3592,7 +3592,7 @@ HRESULT CBGame::loadSettings(const char *filename) {
break;
case TOKEN_RICH_SAVED_GAMES:
- parser.ScanStr((char *)params, "%b", &_richSavedGames);
+ parser.scanStr((char *)params, "%b", &_richSavedGames);
break;
case TOKEN_SAVED_GAME_EXT:
diff --git a/engines/wintermute/Base/BParser.cpp b/engines/wintermute/Base/BParser.cpp
index b5593a3e9c..4354c5620d 100644
--- a/engines/wintermute/Base/BParser.cpp
+++ b/engines/wintermute/Base/BParser.cpp
@@ -56,20 +56,20 @@ CBParser::~CBParser() {
//////////////////////////////////////////////////////////////////////
-char *CBParser::GetLastOffender() {
+char *CBParser::getLastOffender() {
return _lastOffender;
}
//////////////////////////////////////////////////////////////////////
-long CBParser::GetObject(char **buf, TokenDesc *tokens, char **name, char **data) {
- SkipCharacters(buf, _whiteSpace);
+long CBParser::getObject(char **buf, TokenDesc *tokens, char **name, char **data) {
+ skipCharacters(buf, _whiteSpace);
// skip comment lines.
while (**buf == ';') {
*buf = strchr(*buf, '\n');
_parserLine++;
- SkipCharacters(buf, _whiteSpace);
+ skipCharacters(buf, _whiteSpace);
}
if (! **buf) // at end of file
@@ -96,33 +96,33 @@ long CBParser::GetObject(char **buf, TokenDesc *tokens, char **name, char **data
}
// skip the token
*buf += strlen(tokens->token);
- SkipCharacters(buf, _whiteSpace);
+ skipCharacters(buf, _whiteSpace);
// get optional name
- *name = GetSubText(buf, '\'', '\''); // single quotes
- SkipCharacters(buf, _whiteSpace);
+ *name = getSubText(buf, '\'', '\''); // single quotes
+ skipCharacters(buf, _whiteSpace);
// get optional data
if (**buf == '=') // An assignment rather than a command/object.
- *data = GetAssignmentText(buf);
+ *data = getAssignmentText(buf);
else
- *data = GetSubText(buf, '{', '}');
+ *data = getSubText(buf, '{', '}');
return tokens->id;
}
//////////////////////////////////////////////////////////////////////
-long CBParser::GetCommand(char **buf, TokenDesc *tokens, char **params) {
+long CBParser::getCommand(char **buf, TokenDesc *tokens, char **params) {
if (!*buf) return PARSERR_TOKENNOTFOUND;
Game->miniUpdate();
char *name;
- return GetObject(buf, tokens, &name, params);
+ return getObject(buf, tokens, &name, params);
}
//////////////////////////////////////////////////////////////////////
-void CBParser::SkipCharacters(char **buf, const char *toSkip) {
+void CBParser::skipCharacters(char **buf, const char *toSkip) {
char ch;
while ((ch = **buf) != 0) {
if (ch == '\n') _parserLine++;
@@ -135,7 +135,7 @@ void CBParser::SkipCharacters(char **buf, const char *toSkip) {
//////////////////////////////////////////////////////////////////////
-char *CBParser::GetSubText(char **buf, char open, char close) {
+char *CBParser::getSubText(char **buf, char open, char close) {
if (**buf == 0 || **buf != open)
return 0;
++*buf; // skip opening delimiter
@@ -164,14 +164,14 @@ char *CBParser::GetSubText(char **buf, char open, char close) {
//////////////////////////////////////////////////////////////////////
-char *CBParser::GetAssignmentText(char **buf) {
+char *CBParser::getAssignmentText(char **buf) {
++*buf; // skip the '='
- SkipCharacters(buf, _whiteSpace);
+ skipCharacters(buf, _whiteSpace);
char *result = *buf;
if (*result == '"') {
- result = GetSubText(buf, '"', '"');
+ result = getSubText(buf, '"', '"');
} else {
// now, we need to find the next whitespace to end the data
char theChar;
@@ -192,7 +192,7 @@ char *CBParser::GetAssignmentText(char **buf) {
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
-char *CBParser::GetToken(char **buf) {
+char *CBParser::getToken(char **buf) {
static char token[100];
char *b = *buf, * t = token;
while (true) {
@@ -240,8 +240,8 @@ char *CBParser::GetToken(char **buf) {
//////////////////////////////////////////////////////////////////////
-float CBParser::GetTokenFloat(char **buf) {
- char *t = GetToken(buf);
+float CBParser::getTokenFloat(char **buf) {
+ char *t = getToken(buf);
if (!((*t >= '0' && *t <= '9') || *t == '-' || *t == '.')) {
// Error situation. We handle this by return 0.
return 0.;
@@ -252,8 +252,8 @@ float CBParser::GetTokenFloat(char **buf) {
//////////////////////////////////////////////////////////////////////
-int CBParser::GetTokenInt(char **buf) {
- char *t = GetToken(buf);
+int CBParser::getTokenInt(char **buf) {
+ char *t = getToken(buf);
if (!((*t >= '0' && *t <= '9') || *t == '-')) {
// Error situation. We handle this by return 0.
return 0;
@@ -264,14 +264,14 @@ int CBParser::GetTokenInt(char **buf) {
//////////////////////////////////////////////////////////////////////
-void CBParser::SkipToken(char **buf, char *tok, char * /*msg*/) {
- char *t = GetToken(buf);
+void CBParser::skipToken(char **buf, char *tok, char * /*msg*/) {
+ char *t = getToken(buf);
if (strcmp(t, tok)) return; // Error
}
//////////////////////////////////////////////////////////////////////
-int CBParser::ScanStr(const char *in, const char *format, ...) {
+int CBParser::scanStr(const char *in, const char *format, ...) {
va_list arg;
va_start(arg, format);
diff --git a/engines/wintermute/Base/BParser.h b/engines/wintermute/Base/BParser.h
index 07764a97da..f5aa0393e7 100644
--- a/engines/wintermute/Base/BParser.h
+++ b/engines/wintermute/Base/BParser.h
@@ -65,21 +65,22 @@ public:
};
public:
- int ScanStr(const char *in, const char *format, ...);
- char *GetLastOffender();
- void SkipToken(char **buf, char *tok, char *msg = NULL);
- int GetTokenInt(char **buf);
- float GetTokenFloat(char **buf);
- char *GetToken(char **buf);
- char *GetAssignmentText(char **buf);
- char *GetSubText(char **buf, char open, char close);
- void SkipCharacters(char **buf, const char *toSkip);
- long GetCommand(char **buf, TokenDesc *tokens, char **params);
- long GetObject(char **buf, TokenDesc *tokens, char **name, char **data);
- int _parserLine;
- char _lastOffender[255];
+ int scanStr(const char *in, const char *format, ...);
+ long getCommand(char **buf, TokenDesc *tokens, char **params);
CBParser(CBGame *inGame = NULL);
virtual ~CBParser();
+private:
+ char *getLastOffender();
+ void skipToken(char **buf, char *tok, char *msg = NULL);
+ int getTokenInt(char **buf);
+ float getTokenFloat(char **buf);
+ char *getToken(char **buf);
+ char *getAssignmentText(char **buf);
+ char *getSubText(char **buf, char open, char close);
+ void skipCharacters(char **buf, const char *toSkip);
+ long getObject(char **buf, TokenDesc *tokens, char **name, char **data);
+ int _parserLine;
+ char _lastOffender[255];
char *_whiteSpace;
};
diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp
index ea3ecda58e..878b73e5e3 100644
--- a/engines/wintermute/Base/BRegion.cpp
+++ b/engines/wintermute/Base/BRegion.cpp
@@ -146,7 +146,7 @@ HRESULT CBRegion::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;
}
@@ -158,7 +158,7 @@ HRESULT CBRegion::loadBuffer(byte *buffer, bool complete) {
for (i = 0; i < _points.GetSize(); i++) delete _points[i];
_points.RemoveAll();
- 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;
@@ -173,12 +173,12 @@ HRESULT CBRegion::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_ACTIVE:
- parser.ScanStr((char *)params, "%b", &_active);
+ parser.scanStr((char *)params, "%b", &_active);
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;
@@ -188,7 +188,7 @@ HRESULT CBRegion::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_EDITOR_SELECTED_POINT:
- parser.ScanStr((char *)params, "%d", &_editorSelectedPoint);
+ parser.scanStr((char *)params, "%d", &_editorSelectedPoint);
break;
case TOKEN_PROPERTY:
diff --git a/engines/wintermute/Base/BScriptHolder.cpp b/engines/wintermute/Base/BScriptHolder.cpp
index a740fde2fc..131cec631f 100644
--- a/engines/wintermute/Base/BScriptHolder.cpp
+++ b/engines/wintermute/Base/BScriptHolder.cpp
@@ -357,7 +357,7 @@ HRESULT CBScriptHolder::parseProperty(byte *buffer, bool complete) {
CBParser parser(Game);
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_PROPERTY) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_PROPERTY) {
Game->LOG(0, "'PROPERTY' keyword expected.");
return E_FAIL;
}
@@ -367,7 +367,7 @@ HRESULT CBScriptHolder::parseProperty(byte *buffer, bool complete) {
char *PropName = NULL;
char *PropValue = 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_NAME:
delete[] PropName;
diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp
index 859dfb74aa..5adbaf9d14 100644
--- a/engines/wintermute/Base/BSprite.cpp
+++ b/engines/wintermute/Base/BSprite.cpp
@@ -214,7 +214,7 @@ HRESULT CBSprite::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC
if (complete) {
- if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SPRITE) {
+ if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_SPRITE) {
Game->LOG(0, "'SPRITE' keyword expected.");
return E_FAIL;
}
@@ -223,14 +223,14 @@ HRESULT CBSprite::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC
int frame_count = 1;
CBFrame *frame;
- while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
case TOKEN_CONTINUOUS:
- parser.ScanStr((char *)params, "%b", &_continuous);
+ parser.scanStr((char *)params, "%b", &_continuous);
break;
case TOKEN_EDITOR_MUTED:
- parser.ScanStr((char *)params, "%b", &_editorMuted);
+ parser.scanStr((char *)params, "%b", &_editorMuted);
break;
case TOKEN_SCRIPT:
@@ -238,15 +238,15 @@ HRESULT CBSprite::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC
break;
case TOKEN_LOOPING:
- parser.ScanStr((char *)params, "%b", &_looping);
+ parser.scanStr((char *)params, "%b", &_looping);
break;
case TOKEN_PRECISE:
- parser.ScanStr((char *)params, "%b", &_precise);
+ parser.scanStr((char *)params, "%b", &_precise);
break;
case TOKEN_STREAMED:
- parser.ScanStr((char *)params, "%b", &_streamed);
+ parser.scanStr((char *)params, "%b", &_streamed);
if (_streamed && lifeTime == -1) {
lifeTime = 500;
cacheType = CACHE_ALL;
@@ -254,7 +254,7 @@ HRESULT CBSprite::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC
break;
case TOKEN_STREAMED_KEEP_LOADED:
- parser.ScanStr((char *)params, "%b", &_streamedKeepLoaded);
+ parser.scanStr((char *)params, "%b", &_streamedKeepLoaded);
break;
case TOKEN_NAME:
@@ -270,15 +270,15 @@ HRESULT CBSprite::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteC
break;
case TOKEN_EDITOR_BG_OFFSET_X:
- parser.ScanStr((char *)params, "%d", &_editorBgOffsetX);
+ parser.scanStr((char *)params, "%d", &_editorBgOffsetX);
break;
case TOKEN_EDITOR_BG_OFFSET_Y:
- parser.ScanStr((char *)params, "%d", &_editorBgOffsetY);
+ parser.scanStr((char *)params, "%d", &_editorBgOffsetY);
break;
case TOKEN_EDITOR_BG_ALPHA:
- parser.ScanStr((char *)params, "%d", &_editorBgAlpha);
+ parser.scanStr((char *)params, "%d", &_editorBgAlpha);
_editorBgAlpha = MIN(_editorBgAlpha, 255);
_editorBgAlpha = MAX(_editorBgAlpha, 0);
break;
diff --git a/engines/wintermute/Base/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp
index 02395da74a..b3d40d7c67 100644
--- a/engines/wintermute/Base/BSubFrame.cpp
+++ b/engines/wintermute/Base/BSubFrame.cpp
@@ -120,55 +120,55 @@ HRESULT CBSubFrame::loadBuffer(byte *Buffer, int LifeTime, bool KeepLoaded) {
delete _surface;
_surface = NULL;
- while ((cmd = parser.GetCommand((char **)&Buffer, commands, &params)) > 0) {
+ while ((cmd = parser.getCommand((char **)&Buffer, commands, &params)) > 0) {
switch (cmd) {
case TOKEN_IMAGE:
surface_file = params;
break;
case TOKEN_TRANSPARENT:
- parser.ScanStr(params, "%d,%d,%d", &r, &g, &b);
+ parser.scanStr(params, "%d,%d,%d", &r, &g, &b);
custo_trans = true;
break;
case TOKEN_RECT:
- parser.ScanStr(params, "%d,%d,%d,%d", &rect.left, &rect.top, &rect.right, &rect.bottom);
+ parser.scanStr(params, "%d,%d,%d,%d", &rect.left, &rect.top, &rect.right, &rect.bottom);
break;
case TOKEN_HOTSPOT:
- parser.ScanStr(params, "%d,%d", &_hotspotX, &_hotspotY);
+ parser.scanStr(params, "%d,%d", &_hotspotX, &_hotspotY);
break;
case TOKEN_2D_ONLY:
- parser.ScanStr(params, "%b", &_2DOnly);
+ parser.scanStr(params, "%b", &_2DOnly);
break;
case TOKEN_3D_ONLY:
- parser.ScanStr(params, "%b", &_3DOnly);
+ parser.scanStr(params, "%b", &_3DOnly);
break;
case TOKEN_MIRROR_X:
- parser.ScanStr(params, "%b", &_mirrorX);
+ parser.scanStr(params, "%b", &_mirrorX);
break;
case TOKEN_MIRROR_Y:
- parser.ScanStr(params, "%b", &_mirrorY);
+ parser.scanStr(params, "%b", &_mirrorY);
break;
case TOKEN_DECORATION:
- parser.ScanStr(params, "%b", &_decoration);
+ parser.scanStr(params, "%b", &_decoration);
break;
case TOKEN_ALPHA_COLOR:
- parser.ScanStr(params, "%d,%d,%d", &ar, &ag, &ab);
+ parser.scanStr(params, "%d,%d,%d", &ar, &ag, &ab);
break;
case TOKEN_ALPHA:
- parser.ScanStr(params, "%d", &alpha);
+ parser.scanStr(params, "%d", &alpha);
break;
case TOKEN_EDITOR_SELECTED:
- parser.ScanStr(params, "%b", &_editorSelected);
+ parser.scanStr(params, "%b", &_editorSelected);
break;
case TOKEN_EDITOR_PROPERTY:
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-06 18:53:55 +0000