package.pyを更新

[mmo/main.git] / client / scene / Dashboard.cpp

diff --git a/client/scene/Dashboard.cpp b/client/scene/Dashboard.cpp
index f570157..e0e3714 100644 (file)
--- a/client/scene/Dashboard.cpp
+++ b/client/scene/Dashboard.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "Dashboard.hpp"
+#include "Option.hpp"
 #include "../ManagerAccessor.hpp"
 #include "../AccountManager.hpp"
 #include "../CommandManager.hpp"
@@ -27,8 +28,6 @@ Dashboard::Dashboard(const ManagerAccessorPtr& manager_accessor,
       start_count_(0),
          end_count_(0)
 {
-       manager_accessor_->set_window_manager(WindowManagerWeakPtr());
-
     manager_accessor_->set_config_manager(config_manager_);
     manager_accessor_->set_card_manager(card_manager_);
     manager_accessor_->set_account_manager(account_manager_);
@@ -47,6 +46,9 @@ Dashboard::~Dashboard()
 
 void Dashboard::Begin()
 {
+       // TODO: \95`\89æ\82ðDashbord\82É\88Ú\8aÇ\82·\82é\82½\82ß\82ÉNull\82É\82µ\82Ä\82¢\82é\82ª\81A
+       // \95´\82ç\82í\82µ\82¢\82Ì\82Å\8fC\90³\97\\92è
+       manager_accessor_->set_window_manager(WindowManagerWeakPtr());
 }
 
 void Dashboard::Update()
@@ -98,6 +100,13 @@ void Dashboard::ProcessInput(InputManager* input)
                (!hover && (input->GetMouseLeftCount() == 1 || input->GetMouseRightCount() == 1))) {
                end_count_++;
        }
+
+    if (end_count_ > 10) {
+        next_scene_ = background_scene_;
+       } else if(input->GetKeyCount(KEY_INPUT_F1) == 1) {
+               next_scene_ = std::make_shared<Option>(manager_accessor_, background_scene_); 
+       }
+
 }
 
 void Dashboard::Draw()
@@ -158,16 +167,7 @@ void Dashboard::Draw()
 
 void Dashboard::End()
 {
-
+       manager_accessor_->set_window_manager(window_manager_);
 }
 
-BasePtr Dashboard::NextScene()
-{
-    if (end_count_ > 10) {
-               manager_accessor_->set_window_manager(window_manager_);
-        return background_scene_;
-    } else {
-        return BasePtr();
-    }
-}
 }
\ No newline at end of file