Commit: 51a447f63de926e283a91174baf9751226018999 - main (git)

Commit MetaInfo

• Revisión: 51a447f63de926e283a91174baf9751226018999 (tree)
• Tiempo: 2012-09-16 22:35:37
• Autor: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

ステージ名をサーバー経由で受信するように変更

Cambiar Resumen

• modified: client/3d/FieldPlayer.cpp
• modified: client/CommandManager.cpp
• modified: client/CommandManager.hpp
• modified: client/WorldManager.cpp
• modified: client/scene/MainLoop.cpp
• modified: client/scene/Title.cpp
• modified: common/network/Command.cpp
• modified: common/network/Command.hpp
• modified: server/main.cpp

Diferencia incremental

--- a/client/3d/FieldPlayer.cpp
+++ b/client/3d/FieldPlayer.cpp
@@ -377,11 +377,13 @@ 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 )
 	{
 		stage_->SetHostChangeFlag(warp_chk);
 	}
+	*/
 
     int move_dir = 0;
     if (input.GetKeyCount(InputManager::KEYBIND_FORWARD) > 0)

--- a/client/CommandManager.cpp
+++ b/client/CommandManager.cpp
@@ -24,7 +24,7 @@ void CommandManager::Update()
     if (client_)
     {
         auto command = client_->PopCommand();
-
+		
 		if (command) {
 			unsigned int header =  command->header();
 
@@ -47,6 +47,14 @@ void CommandManager::Update()
 			}
 				break;
 
+			// サーバーデータ受信
+			case ClientReceiveServerInfo:
+			{
+				network::Utils::Deserialize(command->body(), & stage_);
+				status_ = STATUS_READY;
+			}
+			break;
+
 			case ClientReceiveJSON:
 			// case ClientReceiveChatLog:
 			{
@@ -104,7 +112,7 @@ void CommandManager::Update()
 void CommandManager::set_client(ClientUniqPtr client)
 {
     client_= std::move(client);
-	status_ = STATUS_CONNECTING;
+	// status_ = STATUS_CONNECTING;
 }
 
 
@@ -141,7 +149,12 @@ void CommandManager::SendJSON(const std::string& msg) {
     }
 }
 
-Status CommandManager::status() const
+CommandManager::Status CommandManager::status() const
 {
 	return status_;
 }
+
+std::string CommandManager::stage() const
+{
+	return stage_;
+}
\ No newline at end of file

--- a/client/CommandManager.hpp
+++ b/client/CommandManager.hpp
@@ -33,6 +33,7 @@ class CommandManager {
 
         void set_client(ClientUniqPtr client);
         unsigned int user_id();
+		std::string stage() const;
 
 		Status status() const;
 
@@ -40,6 +41,7 @@ class CommandManager {
         ManagerAccessorPtr manager_accessor_;
         ClientUniqPtr client_;
 		Status status_;
+		std::string stage_;
 };
 
 typedef std::shared_ptr<CommandManager> CommandManagerPtr;

Binary files a/client/WorldManager.cpp and b/client/WorldManager.cpp differ

--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -15,7 +15,7 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
       manager_accessor_(manager_accessor),
       player_manager_(std::make_shared<PlayerManager>(manager_accessor_)),
       card_manager_(manager_accessor->card_manager().lock()),
-      command_manager_(std::make_shared<CommandManager>(manager_accessor_)),
+      command_manager_(manager_accessor->command_manager().lock()),
       world_manager_(std::make_shared<WorldManager>(manager_accessor_)),
       account_manager_(manager_accessor->account_manager().lock()),
       config_manager_(manager_accessor->config_manager().lock()),
@@ -24,25 +24,10 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
 	  snapshot_number_(0)
 {
     manager_accessor_->set_player_manager(player_manager_);
-    manager_accessor_->set_command_manager(command_manager_);
     manager_accessor_->set_world_manager(world_manager_);
 
     inputbox_.ReloadTabs();
 
-    command_manager_->set_client(
-            ClientUniqPtr(
-                new network::Client(
-                        account_manager_->host(),
-                        config_manager_->port(),
-                        (uint16_t)config_manager_->udp_port(),
-                        account_manager_->public_key(),
-                        account_manager_->private_key(),
-                        "server_key.pub",
-                        config_manager_->upnp()
-                )
-            )
-    );
-
 	minimap_.UIPlacement(config_manager_->screen_width() - MINIMAP_MINSIZE - 12, 12);
     player_manager_->Init();
     world_manager_->Init();	

Binary files a/client/scene/Title.cpp and b/client/scene/Title.cpp differ

--- a/common/network/Command.cpp
+++ b/common/network/Command.cpp
@@ -151,4 +151,10 @@ ClientReceiveJSON::ClientReceiveJSON(const std::string& info_json, const std::st
 {
 }
 
+ClientReceiveServerInfo::ClientReceiveServerInfo(const std::string& stage) :
+	Command(header::ClientReceiveServerInfo, Utils::Serialize(stage))
+{
+
+}
+
 }

--- a/common/network/Command.hpp
+++ b/common/network/Command.hpp
@@ -158,4 +158,9 @@ typedef boost::weak_ptr<Session> SessionWeakPtr;
         ClientReceiveJSON(const std::string& info_json, const std::string& message_json);
     };
 
+	class ClientReceiveServerInfo : public Command {
+    public:
+        ClientReceiveServerInfo(const std::string& stage);
+	};
+
 }

--- a/server/main.cpp
+++ b/server/main.cpp
@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
     network::Server server(config);
 
     auto callback = std::make_shared<std::function<void(network::Command)>>(
-            [&server, &account, &sign](network::Command c){
+            [&server, &account, &sign, &config](network::Command c){
 
         // ログを出力
         auto msg = (boost::format("Receive: 0x%08x %dbyte") % c.header() % c.body().size()).str();
@@ -186,6 +186,9 @@ int main(int argc, char* argv[])
         case network::header::ServerStartEncryptedSession:
         {
             if (auto session = c.session().lock()) {
+				
+				session->Send(network::ClientReceiveServerInfo(config.stage()));
+
                 session->Send(network::ClientStartEncryptedSession());
                 session->EnableEncryption();