aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2007-02-14 00:36:06 +0000
committerEugene Sandulenko2007-02-14 00:36:06 +0000
commitd910b545c58977532c44ffd8d879c6a9f9affae3 (patch)
tree9bd0226e9279c8f2c0f7a1920075ad283db0f42a
parent75ae7cdb730859838097aec1374cad81d9040ec6 (diff)
downloadscummvm-rg350-d910b545c58977532c44ffd8d879c6a9f9affae3.tar.gz
scummvm-rg350-d910b545c58977532c44ffd8d879c6a9f9affae3.tar.bz2
scummvm-rg350-d910b545c58977532c44ffd8d879c6a9f9affae3.zip
More skip_whitespace -> Common::ltrim(). For real now.
svn-id: r25577
-rw-r--r--engines/parallaction/animation.cpp4
-rw-r--r--engines/parallaction/defs.h1
-rw-r--r--engines/parallaction/dialogue.cpp2
-rw-r--r--engines/parallaction/graphics.cpp4
-rw-r--r--engines/parallaction/table.cpp4
5 files changed, 7 insertions, 8 deletions
diff --git a/engines/parallaction/animation.cpp b/engines/parallaction/animation.cpp
index e780c425fc..4ef3b0b63e 100644
--- a/engines/parallaction/animation.cpp
+++ b/engines/parallaction/animation.cpp
@@ -313,7 +313,7 @@ int16 scriptFillBuffers(ArchivedFile *file) {
vCE = readArchivedFileText(vCA, 200, file);
if (vCE == 0) return 0;
- skip_whitespace(vCE);
+ Common::ltrim(vCE);
} while (strlen(vCE) == 0 || vCE[0] == '#');
while (strlen(vCE) > 0 && _si < 20) {
@@ -327,7 +327,7 @@ int16 scriptFillBuffers(ArchivedFile *file) {
}
- vCE = skip_whitespace(vCE);
+ vCE = Common::ltrim(vCE);
_si++;
}
diff --git a/engines/parallaction/defs.h b/engines/parallaction/defs.h
index dc64c53b4f..349f9c9761 100644
--- a/engines/parallaction/defs.h
+++ b/engines/parallaction/defs.h
@@ -99,7 +99,6 @@ void memFree(void *m);
void errorFileNotFound(const char*);
void beep();
-char *skip_whitespace(char *s);
enum {
kDebugDisk = 1 << 0,
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index cc89362623..5940a612ce 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -182,7 +182,7 @@ char *parseDialogueString() {
vD0 = parseNextLine(vC8, 200);
if (vD0 == 0) return NULL;
- vD0 = skip_whitespace(vD0);
+ vD0 = Common::ltrim(vD0);
} while (strlen(vD0) == 0);
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 2400d90d3c..f6da8dd46c 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -724,7 +724,7 @@ bool Graphics::displayWrappedString(char *text, uint16 x, uint16 y, uint16 maxwi
rx += getStringWidth(token) + getStringWidth(" ");
linewidth += getStringWidth(" ");
- text = skip_whitespace(text);
+ text = Common::ltrim(text);
}
// printf("done\n");
@@ -781,7 +781,7 @@ void Graphics::getStringExtent(char *text, uint16 maxwidth, int16* width, int16*
}
w += getStringWidth(" ");
- text = skip_whitespace(text);
+ text = Common::ltrim(text);
}
if (*width < w) *width = w;
diff --git a/engines/parallaction/table.cpp b/engines/parallaction/table.cpp
index eba21faba7..7df6120d7b 100644
--- a/engines/parallaction/table.cpp
+++ b/engines/parallaction/table.cpp
@@ -46,7 +46,7 @@ uint16 tableFillBuffers(Common::SeekableReadStream &stream) {
line = stream.readLine(buf, 200);
if (line == NULL) return 0;
- line = skip_whitespace(line);
+ line = Common::ltrim(line);
} while (strlen(line) == 0 || line[0] == '#');
uint16 count = 0;
@@ -61,7 +61,7 @@ uint16 tableFillBuffers(Common::SeekableReadStream &stream) {
}
- line = skip_whitespace(line);
+ line = Common::ltrim(line);
count++;
}