5 files changed, 8 insertions, 11 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 7873d7db..750725db 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -456,13 +456,9 @@ static bool saveScreenshot()
 
 void Game::optionChanged(const std::string &name)
 {
-    int fpsLimit = (int) config.getValue("fpslimit", 0);
+    int fpsLimit = (int) config.getValue("fpslimit", 60);
 
-    // Calculate new minimum frame time. If one isn't set, use 60 FPS.
-    // (1000 / 60 is 16.66) Since the client can go well above the refresh
-    // rates for monitors now in OpenGL mode, this cutoff is done to help
-    // conserve on CPU time.
-    mMinFrameTime = fpsLimit ? 1000 / fpsLimit : 16;
+    mMinFrameTime = fpsLimit ? 1000 / fpsLimit : 0;
 
     // Reset draw time to current time
     mDrawTime = tick_time * 10;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index e8db997e..8f3d7399 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -115,7 +115,7 @@ Setup_Video::Setup_Video():
     mPickupChatEnabled(config.getValue("showpickupchat", true)),
     mPickupParticleEnabled(config.getValue("showpickupparticle", false)),
     mOpacity(config.getValue("guialpha", 0.8)),
-    mFps((int) config.getValue("fpslimit", 0)),
+    mFps((int) config.getValue("fpslimit", 60)),
     mSpeechMode((int) config.getValue("speech", 3)),
     mModeListModel(new ModeListModel),
     mModeList(new ListBox(mModeListModel)),
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 0c5bde22..7323008b 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -101,11 +101,13 @@ LocalPlayer::LocalPlayer(int id, int job, Map *map):
     mStatPoint(0), mSkillPoint(0),
     mStatsPointsToAttribute(0),
     mEquipment(new Equipment),
+#endif
+    mInStorage(false),
+#ifdef EATHENA_SUPPORT
     mXp(0),
     mTargetTime(-1),
 #endif
     mLastTarget(-1),
-    mInStorage(false),
     mLevel(1),
     mMoney(0),
     mTotalWeight(1), mMaxWeight(1),
diff --git a/src/localplayer.h b/src/localplayer.h
index 1f3be912..b7d39a4c 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -479,8 +479,7 @@ class LocalPlayer : public Player
         const std::auto_ptr<Equipment> mEquipment;
 
     protected:
-        virtual void
-        handleStatusEffect(StatusEffect *effect, int effectId);
+        virtual void handleStatusEffect(StatusEffect *effect, int effectId);
 
         void walk(unsigned char dir);
 
diff --git a/src/main.cpp b/src/main.cpp
index 3cd25bdb..5ae86d54 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -356,7 +356,7 @@ static void initConfiguration(const Options &options)
     config.setValue("remember", 1);
     config.setValue("sfxVolume", 100);
     config.setValue("musicVolume", 60);
-    config.setValue("fpslimit", 0);
+    config.setValue("fpslimit", 60);
     std::string defaultUpdateHost = branding.getValue("defaultUpdateHost",
         "http://updates.themanaworld.org");
     config.setValue("updatehost", defaultUpdateHost);