Merge branch 'master' into scripting

wheybags · Mar 12, 2020 · 23d3730 · 23d3730
2 parents c5309f4 + a1a60c1
commit 23d3730
Show file tree

Hide file tree

Showing 58 changed files with 755 additions and 804 deletions.
diff --git a/apps/freeablo/CMakeLists.txt b/apps/freeablo/CMakeLists.txt
@@ -57,6 +57,7 @@ add_library(freeablo_lib # split into a library so I can link to it from tests
     faworld/missile/missile.cpp
     faworld/missile/missile.h
     faworld/missile/missileactorengagement.cpp
+    faworld/missile/missileattributes.cpp
     faworld/missile/missilecreation.cpp
     faworld/missile/missileenums.h
     faworld/missile/missilegraphic.cpp

diff --git a/apps/freeablo/engine/localinputhandler.cpp b/apps/freeablo/engine/localinputhandler.cpp
@@ -86,7 +86,7 @@ namespace Engine
                 {
                     auto type = EngineMain::get()->mGuiManager->isInventoryShown() ? FAWorld::Target::ItemTarget::ActionType::toCursor
                                                                                    : FAWorld::Target::ItemTarget::ActionType::autoEquip;
-                    mInputs.emplace_back(FAWorld::PlayerInput::TargetItemOnFloorData{item->getTile().position, type}, player->getId());
+                    mInputs.emplace_back(FAWorld::PlayerInput::TargetItemOnFloorData{item->getTile(), type}, player->getId());
                 }
                 else if (player->getLevel()->isDoor(clickedTile.pos) || !cursorItem.isEmpty())
                 {

diff --git a/apps/freeablo/farender/animationplayer.cpp b/apps/freeablo/farender/animationplayer.cpp
@@ -23,7 +23,7 @@ namespace FARender
             mFrameSequence.push_back(loader.load<int32_t>());
     }
 
-    void AnimationPlayer::save(FASaveGame::GameSaver& saver)
+    void AnimationPlayer::save(FASaveGame::GameSaver& saver) const
     {
         Serial::ScopedCategorySaver cat("AnimationPlayer", saver);
 

diff --git a/apps/freeablo/farender/animationplayer.h b/apps/freeablo/farender/animationplayer.h
@@ -25,7 +25,7 @@ namespace FARender
 
         AnimationPlayer() {}
         AnimationPlayer(FASaveGame::GameLoader& loader);
-        void save(FASaveGame::GameSaver& saver);
+        void save(FASaveGame::GameSaver& saver) const;
 
         std::pair<FARender::FASpriteGroup*, int32_t> getCurrentFrame();
         AnimationType getCurrentAnimationType() { return mPlayingAnimType; }

diff --git a/apps/freeablo/farender/renderer.cpp b/apps/freeablo/farender/renderer.cpp
@@ -108,6 +108,7 @@ namespace FARender
                 // struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, 0);
                 // struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, 0);
                 mConsoleFont = nk_font_atlas_add_from_file(&mNuklearGraphicsData.atlas, "resources/fonts/FreeMono/FreeMonoBold.ttf", 14, 0);
+
                 mNuklearGraphicsData.dev.font_tex =
                     nk_fa_font_stash_end(mSpriteManager, &mNuklearContext, mNuklearGraphicsData.atlas, mNuklearGraphicsData.dev.null);
                 // nk_style_load_all_cursors(ctx, atlas->cursors);

diff --git a/apps/freeablo/faworld/actor.cpp b/apps/freeablo/faworld/actor.cpp
@@ -126,7 +126,7 @@ namespace FAWorld
         mType = ActorType(loader.load<uint8_t>());
     }
 
-    void Actor::save(FASaveGame::GameSaver& saver)
+    void Actor::save(FASaveGame::GameSaver& saver) const
     {
         Serial::ScopedCategorySaver cat("Actor", saver);
 
@@ -240,10 +240,13 @@ namespace FAWorld
 
     void Actor::pickupItem(Target::ItemTarget target)
     {
-        auto& itemMap = getLevel()->getItemMap();
-        auto tile = target.item->getTile();
-        auto item = itemMap.takeItemAt(tile);
-        auto dropBack = [&]() { itemMap.dropItem(std::move(item), *this, tile); };
+        ItemMap& itemMap = getLevel()->getItemMap();
+        std::unique_ptr<Item> item = itemMap.takeItemAt(target.itemLocation);
+
+        if (!item)
+            return;
+
+        auto dropBack = [&]() { itemMap.dropItem(std::move(item), *this, target.itemLocation); };
         switch (target.action)
         {
             case Target::ItemTarget::ActionType::autoEquip:

diff --git a/apps/freeablo/faworld/actor.h b/apps/freeablo/faworld/actor.h
@@ -46,7 +46,7 @@ namespace FAWorld
         Actor(World& world, const DiabloExe::Npc& npc, const DiabloExe::DiabloExe& exe);
         Actor(World& world, FASaveGame::GameLoader& loader);
         virtual ~Actor();
-        virtual void save(FASaveGame::GameSaver& saver);
+        virtual void save(FASaveGame::GameSaver& saver) const;
 
         virtual int32_t getOnKilledExperience() const { return 0; }
         void pickupItem(Target::ItemTarget target);

diff --git a/apps/freeablo/faworld/actor/basestate.cpp b/apps/freeablo/faworld/actor/basestate.cpp
@@ -68,15 +68,14 @@ namespace FAWorld
                 {
                     Target::ItemTarget target = actor.mTarget.get<Target::ItemTarget>();
 
-                    auto tile = target.item->getTile();
-                    if (actor.getPos().isNear(Position(tile.position)))
+                    if (actor.getPos().isNear(Position(target.itemLocation)))
                     {
                         actor.pickupItem(target);
                         actor.mTarget.clear();
                     }
                     else
                     {
-                        actor.mMoveHandler.setDestination(tile.position, true);
+                        actor.mMoveHandler.setDestination(target.itemLocation, true);
                     }
 
                     break;