diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-03-08 15:24:31 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-03-08 15:24:31 +0000 |
| commit | b56c5b7a6fa8330b09bb65f270b5a6a7281367d3 (patch) | |
| tree | 08daf9c890a11ba5451bc2276b7bda4686951bf0 | |
| parent | 343896eeaa97009fb06096dc5bcc097bf1bd287d (diff) | |
gcc 4.2 fixes
| -rw-r--r-- | src/filesystem/inifile.cc | 2 | ||||
| -rw-r--r-- | src/game/game.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/filesystem/inifile.cc b/src/filesystem/inifile.cc index eccded4..8b6e8ad 100644 --- a/src/filesystem/inifile.cc +++ b/src/filesystem/inifile.cc @@ -102,7 +102,7 @@ bool IniFile::getline() { bool IniFile::got_key_string(char * const keylabel, std::string & valuestring) { //condebug << "IniFile got_value_string " << keylabel << " " << last_read_was_key << std::endl; - if (last_read_was_key && key_current == keylabel) { + if (last_read_was_key && (key_current.compare(keylabel) == 0 )) { valuestring.assign(value_current); return true; } else { diff --git a/src/game/game.cc b/src/game/game.cc index 290b80c..fda9569 100644 --- a/src/game/game.cc +++ b/src/game/game.cc @@ -131,7 +131,7 @@ void Game::init() while (f.getline()) { if (f.got_key()) { - if (f.section() == "star") { + if (f.section().compare("start") == 0) { if (f.got_key_string("name", tmp)) { star->entity_name = tmp; @@ -155,7 +155,7 @@ void Game::init() } else con_warn << f.name() << " unknown key '" << f.key() << "' at line " << f.line() << std::endl; - } else if (f.section() == "entity") { + } else if (f.section().compare("entity") == 0) { if (f.got_key_string("name", tmp)) { entity->entity_name = tmp; |