|
 |
8c8a0de |
diff -up alienblaster/src/options.cc~ alienblaster/src/options.cc
|
|
|
8c8a0de |
--- alienblaster/src/options.cc~ 2007-07-22 21:13:29.000000000 +0200
|
|
|
8c8a0de |
+++ alienblaster/src/options.cc 2007-07-22 21:13:29.000000000 +0200
|
|
|
8c8a0de |
@@ -48,7 +48,7 @@ Options::Options(const string lFilename)
|
|
|
8c8a0de |
string newLine;
|
|
|
8c8a0de |
getline( inputFile, newLine );
|
|
|
8c8a0de |
// search delimiter
|
|
|
8c8a0de |
- unsigned int pos = newLine.find("=");
|
|
|
8c8a0de |
+ string::size_type pos = newLine.find("=");
|
|
|
8c8a0de |
// comment line or no delimiter found
|
|
|
8c8a0de |
if (( newLine[0] != '#' ) && ( pos != string::npos )) {
|
|
|
8c8a0de |
string key = newLine.substr(0,pos);
|
|
|
8c8a0de |
diff -up alienblaster/src/font.cc~ alienblaster/src/font.cc
|
|
|
8c8a0de |
--- alienblaster/src/font.cc~ 2007-07-22 21:14:44.000000000 +0200
|
|
|
8c8a0de |
+++ alienblaster/src/font.cc 2007-07-22 21:14:44.000000000 +0200
|
|
|
8c8a0de |
@@ -84,7 +84,7 @@ void Font::drawInt(SDL_Surface *screen,
|
|
|
8c8a0de |
destR.w = charWidth;
|
|
|
8c8a0de |
destR.h = charHeight;
|
|
|
8c8a0de |
|
|
|
8c8a0de |
- unsigned int charsetpos = charset.find( (char)((val % 10) + '0') );
|
|
|
8c8a0de |
+ string::size_type charsetpos = charset.find( (char)((val % 10) + '0') );
|
|
|
8c8a0de |
if (charsetpos != string::npos ) {
|
|
|
8c8a0de |
srcR.x = charsetpos * charWidth;
|
|
|
8c8a0de |
} else {
|
|
|
8c8a0de |
@@ -127,7 +127,7 @@ void Font::drawStr(SDL_Surface *screen,
|
|
|
8c8a0de |
SDL_Rect srcR;
|
|
|
8c8a0de |
|
|
|
8c8a0de |
int x = 0;
|
|
|
8c8a0de |
- unsigned int charsetpos;
|
|
|
8c8a0de |
+ string::size_type charsetpos;
|
|
|
8c8a0de |
for(unsigned int i=0; i < text.size(); ++i) {
|
|
|
8c8a0de |
x = 0;
|
|
|
8c8a0de |
charsetpos = charset.find(text[i]);
|