diff --git a/libxiv b/libxiv index ce7c99c..8139f39 160000 --- a/libxiv +++ b/libxiv @@ -1 +1 @@ -Subproject commit ce7c99c3de4853758bd37d46b3e582b27681797a +Subproject commit 8139f399fdcfd8b57f5a399ee2aa2d92baa7bf4a diff --git a/mdlviewer/include/mainwindow.h b/mdlviewer/include/mainwindow.h index 0582527..fde6db0 100644 --- a/mdlviewer/include/mainwindow.h +++ b/mdlviewer/include/mainwindow.h @@ -6,8 +6,15 @@ #include "renderer.hpp" enum class Slot { - Body, - Legs + Head = 3, + Hands = 5, + Legs = 7, + Feet = 8, + Body = 4, + Earring = 9, + Neck = 10, + Rings = 12, + Wrists = 11 }; enum class Race { @@ -36,8 +43,15 @@ struct GearInfo { }; inline std::unordered_map slotToName = { + {Slot::Head, "met"}, + {Slot::Hands, "glv"}, + {Slot::Legs, "dwn"}, + {Slot::Feet, "sho"}, {Slot::Body, "top"}, - {Slot::Legs, "dwn"} + {Slot::Earring, "ear"}, + {Slot::Neck, "nek"}, + {Slot::Rings, "rir"}, + {Slot::Wrists, "wrs"} }; class GameData; diff --git a/mdlviewer/src/mainwindow.cpp b/mdlviewer/src/mainwindow.cpp index d50594c..3f115bb 100644 --- a/mdlviewer/src/mainwindow.cpp +++ b/mdlviewer/src/mainwindow.cpp @@ -117,7 +117,7 @@ MainWindow::MainWindow(GameData& data) : data(data) { GearInfo info = {}; info.name = row.data[9].data; - info.slot = Slot::Body; + info.slot = (Slot)row.data[17].uint64Data; info.modelInfo.primaryID = parts[0]; gears.push_back(info);