summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-01-07 00:23:22 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-01-07 00:23:22 +0000
commit3fe5d486bf33d4658ab75b49fe878a9a0394d835 (patch)
tree883a1912f751353c0f0d349b0077362b6e3f23f6 /src/main.cpp
parentd818bc97c2d1b570ff11197f80d0b0ad471f0af7 (diff)
downloadmana-3fe5d486bf33d4658ab75b49fe878a9a0394d835.tar.gz
mana-3fe5d486bf33d4658ab75b49fe878a9a0394d835.tar.bz2
mana-3fe5d486bf33d4658ab75b49fe878a9a0394d835.tar.xz
mana-3fe5d486bf33d4658ab75b49fe878a9a0394d835.zip
Synchronized player attributes with wiki Attributes page and removed Job XP.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 8163cde3..b9eeaeb5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -218,7 +218,7 @@ void initConfiguration(const Options &options)
/**
* Do all initialization stuff.
*/
-void init_engine()
+void initEngine()
{
// Initialize SDL
logger->log("Initializing SDL...");
@@ -273,11 +273,11 @@ void init_engine()
graphics = new Graphics();
#endif
- int width = (int)config.getValue("screenwidth", defaultScreenWidth);
- int height = (int)config.getValue("screenheight", defaultScreenHeight);
+ int width = (int) config.getValue("screenwidth", defaultScreenWidth);
+ int height = (int) config.getValue("screenheight", defaultScreenHeight);
int bpp = 0;
- bool fullscreen = ((int)config.getValue("screen", 0) == 1);
- bool hwaccel = ((int)config.getValue("hwaccel", 0) == 1);
+ bool fullscreen = ((int) config.getValue("screen", 0) == 1);
+ bool hwaccel = ((int) config.getValue("hwaccel", 0) == 1);
// Try to set the desired video mode
if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel))
@@ -511,16 +511,14 @@ int main(int argc, char *argv[])
logger->setLogFile(homeDir + std::string("/tmw.log"));
logger->setLogToStandardOut(config.getValue("logToStandardOut", 0));
- initXML();
- initConfiguration(options);
-
-
// Log the tmw version
#ifdef PACKAGE_VERSION
logger->log("The Mana World v%s", PACKAGE_VERSION);
#endif
- init_engine();
+ initXML();
+ initConfiguration(options);
+ initEngine();
Window *currentDialog = NULL;
Image *login_wallpaper = NULL;