Merge branch 'master' of git.sourceforge.jp:/gitroot/mmo/main

diff --cc client/3d/FieldPlayer.cpp
index daa679e,6b3a54d..450408c
--- 1/client/3d/FieldPlayer.cpp
--- 2/client/3d/FieldPlayer.cpp
+++ b/client/3d/FieldPlayer.cpp
@@@ -377,9 -377,8 +377,9 @@@ void FieldPlayer::InputFromUser(
          : prev_stat_.motion == motion.run_ ? 180.0f
          : 90.0f) * PHI_F / 180;
  
 +      /*
        auto warp_chk = stage_->CheckWarpPoint(current_stat_.pos);
-       if (warp_chk.first && input.GetKeyCount(InputManager::KEYBIND_ENTER) > 0 )
+       if (warp_chk && input.GetKeyCount(InputManager::KEYBIND_ENTER) > 0 )
        {
                stage_->SetHostChangeFlag(warp_chk);
        }

diff --cc client/scene/MainLoop.cpp
Simple merge