FIX - useless code

deadbaed · Jun 14, 2020 · 0bf3b93 · 0bf3b93
1 parent d71b949
commit 0bf3b93
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 45 deletions.
diff --git a/Application/main.cpp b/Application/main.cpp
@@ -21,10 +21,10 @@
 #include <exception>
 
 /* Win32: Remove the console application */
-//#ifdef _IRR_WINDOWS_
-//#pragma comment(lib, "Irrlicht.lib")
-//#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
-//#endif
+#ifdef _IRR_WINDOWS_
+#pragma comment(lib, "Irrlicht.lib")
+#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
+#endif
 
 int main(void) {
 

diff --git a/GameScene/SceneManager.cpp b/GameScene/SceneManager.cpp
@@ -20,13 +20,8 @@ void SceneManager::LoadScene(const std::string name) {
         if (i->get()->GetId() == name) {
             if (_current_scene) {
                 if (_ctrl->_scene_mgr->getSceneLoaderCount() > 0) {
-                        std::cout << "name " << name << std::endl;
-                        std::cout << _current_scene->GetId() << std::endl;
-//                    if (_current_scene->GetId() != "gameScene" && name != "pauseScene" || _current_scene->GetId() != "pauseScene" && name != "gameScene") {
-//                        _ctrl->_scene_mgr->clear();
                         _ctrl->_scene_mgr->clear();
                         _ctrl->_env->clear();
-//                    }
                 }
             }
             _current_scene = i->get();

diff --git a/Menu/EndScene.cpp b/Menu/EndScene.cpp
@@ -35,18 +35,7 @@ void EndScene::Init(void)
 }
 void EndScene::Update(void)
 {
-    int idx = 0;
-
     _ctrl->_driver->beginScene(true, true, SColor(100, 150, 150, 150));
-    for (auto i = _obj_list.begin(); i != _obj_list.end(); i++) {
-        if (i->get()->GetStatus() == IGameObject::status_e::DELETED)
-            _obj_list.erase(i);
-    }
-
-    for (auto i = _obj_list.begin(); i != _obj_list.end(); i++) {
-        i->get()->Update(_obj_list);
-    }
-
     if (this->_exit->updateButton(this->_ctrl->_context))
         this->_buttonSound->Play();
     if (this->_restart->updateButton(this->_ctrl->_context))
@@ -56,9 +45,9 @@ void EndScene::Update(void)
 void EndScene::Render(void)
 {
     _ctrl->_driver->draw2DImage(_background, core::position2d<s32>(0,0), core::rect<s32>(0,0,1280,720), 0, video::SColor(255,255,255,255), true);
-    for (auto i = _obj_list.begin(); i != _obj_list.end(); i++)
-        if (i->get()->GetStatus() != IGameObject::status_e::DELETED)
-            i->get()->Render();
+//    for (auto i = _obj_list.begin(); i != _obj_list.end(); i++)
+//        if (i->get()->GetStatus() != IGameObject::status_e::DELETED)
+//            i->get()->Render();
     _ctrl->_scene_mgr->drawAll();
     this->_ctrl->_env->drawAll();
 }

diff --git a/Menu/SelectSkin.cpp b/Menu/SelectSkin.cpp
@@ -38,18 +38,7 @@ void SelectSkin::Init(void)
 void SelectSkin::Update(void)
 {
     SelectPlayer();
-    int idx = 0;
-
     _ctrl->_driver->beginScene(true, true, SColor(100, 150, 150, 150));
-   /* for (auto i = _obj_list.begin(); i != _obj_list.end(); i++) {
-        if (i->get()->GetStatus() == IGameObject::status_e::DELETED)
-            _obj_list.erase(i);
-    }
-
-    for (auto i = _obj_list.begin(); i != _obj_list.end(); i++) {
-        i->get()->Update(_obj_list);
-    }*/
-
     if (this->_first_skin->updateButton(this->_ctrl->_context))
         this->_buttonSound->Play();
     if (this->_second_skin->updateButton(this->_ctrl->_context))

diff --git a/Menu/SelectSkins.cpp b/Menu/SelectSkins.cpp
@@ -44,18 +44,7 @@ void SelectSkins::Update(void)
 {
     SelectPlayerOne();
     SelectPlayerTwo();
-    int idx = 0;
-
     _ctrl->_driver->beginScene(true, true, SColor(100, 150, 150, 150));
-   /* for (auto i = _obj_list.begin(); i != _obj_list.end(); i++) {
-        if (i->get()->GetStatus() == IGameObject::status_e::DELETED)
-            _obj_list.erase(i);
-    }
-
-    for (auto i = _obj_list.begin(); i != _obj_list.end(); i++) {
-        i->get()->Update(_obj_list);
-    }*/
-
     if (this->_first_skin_one->updateButton(this->_ctrl->_context))
         this->_buttonSound->Play();
     if (this->_second_skin_one->updateButton(this->_ctrl->_context))