aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kyra/font.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kyra/font.cpp b/kyra/font.cpp
index c802fcb2e3..01428f1442 100644
--- a/kyra/font.cpp
+++ b/kyra/font.cpp
@@ -84,8 +84,8 @@ namespace Kyra {
uint32 Font::getStringWidth(const char* string, char terminator) {
uint32 strsize;
- for (strsize = 0; string[strsize] != terminator; ++strsize)
- ;
+ for (strsize = 0; string[strsize] != terminator && string[strsize] != '\0'; ++strsize)
+ ;
uint32 stringwidth = 0;
@@ -113,11 +113,11 @@ namespace Kyra {
// gets start of the word
for (; string[startpos] == ' '; ++startpos)
- ;
+ ;
// not counting size
for (*size = 0; string[startpos + *size] != ' ' && string[startpos + *size] != '\0'; ++(*size))
- ;
+ ;
++(*size);