CheckWarpPointからサーバー情報を削除

diff --git a/client/3d/FieldPlayer.cpp b/client/3d/FieldPlayer.cpp
index 8a40912..6b3a54d 100644 (file)
--- a/client/3d/FieldPlayer.cpp
+++ b/client/3d/FieldPlayer.cpp
@@ -378,7 +378,7 @@ void FieldPlayer::InputFromUser()
         : 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 --git a/client/3d/Stage.cpp b/client/3d/Stage.cpp
index d190fc5..04d3b0a 100644 (file)
--- a/client/3d/Stage.cpp
+++ b/client/3d/Stage.cpp
@@ -30,11 +30,10 @@ Stage::Stage(const tstring& model_name) :
         float x = it->second.get<float>("x", 0);
         float y = it->second.get<float>("y", 0);
         float z = it->second.get<float>("z", 0);
-               auto host = it->second.get<std::string>("host",unicode::ToString(_T("127.0.0.1")));
-        warp_points_.push_back(std::make_pair<VECTOR,std::string>(VGet(x, y, z),host));
+        warp_points_.push_back(VGet(x, y, z));
     }
     if (start_points_.empty()) {
-        warp_points_.push_back(std::make_pair<VECTOR,std::string>(VGet(0,0,0),"127.0.0.1"));
+        warp_points_.push_back(VGet(0,0,0));
     }
 
     auto skymap_name = map_handle_.property().get<std::string>("stage.skydome", unicode::ToString(_T("skydome:入道雲のある風景")));
@@ -76,30 +75,30 @@ bool Stage::GetFloorY(const VECTOR& v1, const VECTOR& v2, float* y) const
     return coll_info.HitFlag;
 }
 
-std::pair<bool,std::string> Stage::CheckWarpPoint(const VECTOR& v)
+bool Stage::CheckWarpPoint(const VECTOR& v)
 {
        if(
-               warp_points_[0].first.x == 0 &&
-               warp_points_[0].first.y == 0 &&
-               warp_points_[0].first.z == 0)return std::make_pair<bool,std::string>(false,"");
+               warp_points_[0].x == 0 &&
+               warp_points_[0].y == 0 &&
+               warp_points_[0].z == 0)return false;
        auto it = warp_points_.begin();
        auto vec = VGet(0,200,0);
        VECTOR check_vec = VGet(0,0,0);
 
        for(it;it != warp_points_.end(); ++it)
        {
-               check_vec = v - VGet(it->first.x,it->first.y-100,it->first.z);
+               check_vec = v - VGet(it->x,it->y-100,it->z);
                auto s = VSize(check_vec);
                auto t = VSize(vec*cos(VRad(check_vec,vec)));
                if((s * s) - (t * t) <= ( 8 * 8 ))
                {
-                       return std::make_pair<bool,std::string>(true,it->second);
+                       return true;
                }
        }
-       return std::make_pair<bool,std::string>(false,"");
+       return false;
 }
 
-void Stage::SetHostChangeFlag(std::pair<bool,std::string> flag)
+void Stage::SetHostChangeFlag(bool flag)
 {
        host_change_flag_ = flag;
 }
@@ -260,7 +259,7 @@ float Stage::min_height() const
     return min_height_;
 }
 
-const std::pair<bool,std::string>& Stage::host_change_flag() const
+const bool& Stage::host_change_flag() const
 {
        return host_change_flag_;
 }
\ No newline at end of file

diff --git a/client/3d/Stage.hpp b/client/3d/Stage.hpp
index 10144cc..b03698e 100644 (file)
--- a/client/3d/Stage.hpp
+++ b/client/3d/Stage.hpp
@@ -18,7 +18,7 @@ class Stage {
 
         float GetFloorY(const VECTOR& v1, const VECTOR& v2) const;
         bool GetFloorY(const VECTOR& v1, const VECTOR& v2, float* y) const;
-               std::pair<bool,std::string> CheckWarpPoint(const VECTOR& v);
+               bool CheckWarpPoint(const VECTOR& v);
 
         std::pair<bool, VECTOR> FloorExists(const VECTOR& foot_pos, float model_height, float collision_depth_limit) const;
         bool IsFlatFloor(const VECTOR& foot_pos, const VECTOR& direction) const;
@@ -32,10 +32,10 @@ class Stage {
         float min_height() const;
 
         const std::vector<VECTOR>& start_points() const;
-               const std::vector<std::pair<VECTOR,std::string>>& warp_points() const;
-               const std::pair<bool,std::string>& host_change_flag() const;
+               const std::vector<VECTOR>& warp_points() const;
+               const bool& host_change_flag() const;
 
-               void SetHostChangeFlag(std::pair<bool,std::string> flag);
+               void SetHostChangeFlag(bool flag);
 
         void UpdateSkymapPosition(const VECTOR& pos);
 
@@ -46,9 +46,9 @@ class Stage {
         ModelHandle skymap_handle_;
 
         std::vector<VECTOR> start_points_;
-               std::vector<std::pair<VECTOR,std::string>> warp_points_;
+               std::vector<VECTOR> warp_points_;
 
-               std::pair<bool,std::string> host_change_flag_;
+               bool host_change_flag_;
 };
 
 typedef std::shared_ptr<Stage> StagePtr;

diff --git a/client/scene/MainLoop.cpp b/client/scene/MainLoop.cpp
index c241574..333ef3b 100644 (file)
--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -126,9 +126,9 @@ void MainLoop::ProcessInput(InputManager *input)
 
 BasePtr MainLoop::NextScene()
 {
-       if(world_manager_->stage()->host_change_flag().first)
+       if(world_manager_->stage()->host_change_flag())
        {
-               account_manager_->set_host(world_manager_->stage()->host_change_flag().second);
+               //account_manager_->set_host(world_manager_->stage()->host_change_flag().second);
                return BasePtr(new scene::ServerChange(manager_accessor_));
        }else{
                return nullptr;

diff --git a/client/scene/ServerChange.cpp b/client/scene/ServerChange.cpp
index e99d9e4..5d889b2 100644 (file)
--- a/client/scene/ServerChange.cpp
+++ b/client/scene/ServerChange.cpp
@@ -38,7 +38,7 @@ void ServerChange::Draw()
 
 BasePtr ServerChange::NextScene()
 {
-       if(world_manager_->stage()->host_change_flag().first)
+       if(world_manager_->stage()->host_change_flag())
        {
                //account_manager_->set_host(world_manager_->stage()->host_change_flag().second);
                return BasePtr(new scene::MainLoop(manager_accessor_));