save

onon1101 · May 2, 2024 · dd813b2 · dd813b2
1 parent 954bfe8
commit dd813b2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/App.cpp b/src/App.cpp
@@ -123,7 +123,7 @@ void App::Update() {
     }
 
     if (Util::Input::IsKeyDown(Util::Keycode::T)) {
-        m_MainCharacter->GetToolMod()->RemoveTool("WEAPON", "Spear");
+        //        m_MainCharacter->GetToolMod()->RemoveTool("WEAPON", "Spear");
     }
 
     if (Util::Input::IsKeyDown(Util::Keycode::N)) {
@@ -153,7 +153,9 @@ void App::Update() {
         m_MainCharacter->PrepareThrowOut(false);
         for (const auto& elem : m_MapTableCodeDire) {
             if (Util::Input::IsKeyDown(elem.first)) {
-                Game::Actions::ThrowOutWeapon(m_DungeonMap.get(), elem.second);
+                //                Game::Actions::ThrowOutWeapon(m_DungeonMap.get(),
+                //                elem.second);
+                Game::Systems::HPIS::ThrowOut(elem.second);
             }
         }
         m_ThrowMode = false;

diff --git a/src/Game/Systems/HEIS.cpp b/src/Game/Systems/HEIS.cpp
@@ -2,6 +2,7 @@
 // Created by adven on 2024/5/1.
 //
 #include "HEIS.h"
+#include "Game/System.h"
 #include "Game_config.h"
 #include "Graphs/Dagger.h"
 #include "Helper.hpp"
@@ -27,20 +28,22 @@ auto Game::Systems::HEIS::MakeTile(
     auto&& currGP = static_cast<glm::ivec2>(playerGP);
 
     // is wall
-    while (true) {
+    while (m_Map->GetMapData()->IsPositionWall(currGP + direGP)) {
         mi = Settings::Helper::GamePosToMapIdx(currGP);
 
-        // is wall?
-        if (m_Map->GetMapData()->IsPositionWall(currGP + direGP)) {
-            break;
-        }
-
         if (m_Map->GetMapData()->IsHasEntity(mi)) {
             m_Map->RemoveEnemy(mi);
-            currGP += direGP;
         }
+
+        currGP += direGP;
+
+        //        // is wall?
+        //        if (m_Map->GetMapData()->IsPositionWall(currGP + direGP)) {
+        //            break;
+        //        }
     }
 
+    // renderer weapon on floor
     const auto pixelSize =
         ToolBoxs::CountImagePixel(Game::Config::IMAGE_DAGGER_PATH, 1, 2);
     const auto image = std::make_shared<SpriteSheet>(
@@ -54,6 +57,8 @@ auto Game::Systems::HEIS::MakeTile(
     );
     const auto object = std::make_shared<Graphs::DaggerGameObj>();
     object->SetDrawable(image);
+
+    System::AddWeapon(object, mi);
 }
 
 Dungeon::Map* Game::Systems::HEIS::m_Map = nullptr;