diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-01-13 23:38:31 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-01-13 23:38:31 +0000 |
| commit | 65c1d2b0b022de1340509738e65314474e2eb141 (patch) | |
| tree | 2bbda5306b2a03d1e68455456fe1e65edd4e157e /src/configuration.cpp | |
| parent | 0b6e2b1e4a256da0c2418af63df1c90e9a120690 (diff) | |
| download | mana-65c1d2b0b022de1340509738e65314474e2eb141.tar.gz mana-65c1d2b0b022de1340509738e65314474e2eb141.tar.bz2 mana-65c1d2b0b022de1340509738e65314474e2eb141.tar.xz mana-65c1d2b0b022de1340509738e65314474e2eb141.zip | |
Added heavily modified resource manager by zenogais that is currently using
Allegro to load/draw images. Only the login wallpaper is currently loaded
using the resource manager and the resource manager still waits with searching
for available files until they are asked for instead of indexing what is
available.
Diffstat (limited to 'src/configuration.cpp')
| -rw-r--r-- | src/configuration.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp index 759a1fa9..074de7c6 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -24,6 +24,8 @@ #include "configuration.h" #include <math.h> +#include <iostream> +#include <fstream> Configuration::OptionValue::OptionValue(): numericValue(0.0f) @@ -46,7 +48,7 @@ void Configuration::init(std::string filename) { iniOptions.clear(); while (inFile.good()) { - getline(inFile, inBuffer, '\n'); + std::getline(inFile, inBuffer, '\n'); if (inBuffer.substr(0, 1) != INI_COMMENTER) { // Replace spaces with void |