libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 18:24:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ZVISION: Change trimCommentsAndWhiteSpace to use a pointer instead of a reference.

Browse Source
This commit is contained in:
richiesams 2013-07-05 20:14:50 -05:00
parent 3822de2aec
commit 3f93f7d27f
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/zvision/scr_file_handling.cpp
View File

@ -46,7 +46,7 @@ void ScriptManager::parseScrFile(Common::String fileName) {
return;
}
trimCommentsAndWhiteSpace(line);
trimCommentsAndWhiteSpace(&line);
if (line.empty())
continue;
@ -69,7 +69,7 @@ void ScriptManager::parseScrFile(Common::String fileName) {
void ScriptManager::parsePuzzle(Puzzle &puzzle, Common::SeekableReadStream &stream) {
Common::String line = stream.readLine();
trimCommentsAndWhiteSpace(line);
trimCommentsAndWhiteSpace(&line);
while (!line.contains('}')) {
if (line.matchString("criteria {", true))
@ -86,7 +86,7 @@ Criteria ScriptManager::parseCriteria(Common::SeekableReadStream &stream) const
// Loop until we find the closing brace
Common::String line = stream.readLine();
trimCommentsAndWhiteSpace(line);
trimCommentsAndWhiteSpace(&line);
while (!line.contains('}')) {
// Split the string into tokens using ' ' as a delimiter
@ -120,7 +120,7 @@ Criteria ScriptManager::parseCriteria(Common::SeekableReadStream &stream) const
}
line = stream.readLine();
trimCommentsAndWhiteSpace(line);
trimCommentsAndWhiteSpace(&line);
}
return criteria;
@ -129,7 +129,7 @@ Criteria ScriptManager::parseCriteria(Common::SeekableReadStream &stream) const
void ScriptManager::parseResult(Common::SeekableReadStream &stream, Common::List<ResultAction *> &actionList) const {
// Loop until we find the closing brace
Common::String line = stream.readLine();
trimCommentsAndWhiteSpace(line);
trimCommentsAndWhiteSpace(&line);
// TODO: Re-order the if-then statements in order of highest occurrence
while (!line.contains('}')) {
@ -253,7 +253,7 @@ void ScriptManager::parseResult(Common::SeekableReadStream &stream, Common::List
}
line = stream.readLine();
trimCommentsAndWhiteSpace(line);
trimCommentsAndWhiteSpace(&line);
}
return;
@ -264,7 +264,7 @@ byte ScriptManager::parseFlags(Common::SeekableReadStream &stream) const {
// Loop until we find the closing brace
Common::String line = stream.readLine();
trimCommentsAndWhiteSpace(line);
trimCommentsAndWhiteSpace(&line);
while (!line.contains('}')) {
if (line.matchString("ONCE_PER_INST", true)) {

11
engines/zvision/utility.h
View File

@ -59,14 +59,15 @@ void writeFileContentsToFile(Common::String sourceFile, Common::String destFile)
*
* @param string The string to modify. It is modified in place
*/
void trimCommentsAndWhiteSpace(Common::String &string) {
for (int i = string.size(); i >= 0; --i) {
if (string[i] == '#') {
string.erase(i);
void trimCommentsAndWhiteSpace(Common::String *string) {
for (int i = string->size() - 1; i >= 0; i--) {
if ((*string)[i] == '#') {
string->erase(i);
}
}
string.trim();
string->trim();
}
}
} // End of namespace ZVision