diff options
| -rw-r--r-- | src/actions/actions.cpp | 11 | ||||
| -rw-r--r-- | src/dirs.cpp | 1 | ||||
| -rw-r--r-- | src/enums/state.h | 4 | ||||
| -rw-r--r-- | src/game.cpp | 1 | ||||
| -rw-r--r-- | src/gui/windows/minimap.cpp | 4 | ||||
| -rw-r--r-- | src/input/inputactionmap.h | 2 | ||||
| -rw-r--r-- | src/input/inputmanager.cpp | 2 | ||||
| -rw-r--r-- | src/input/inputmanager.h | 2 | ||||
| -rw-r--r-- | src/input/joystick.cpp | 2 | ||||
| -rw-r--r-- | src/input/keyboardconfig.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 8 | ||||
| -rw-r--r-- | src/net/eathena/partyrecv.cpp | 1 |
12 files changed, 28 insertions, 12 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index b76b64108..fc45b440f 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -247,10 +247,19 @@ static Item *getItemByInvIndex(const InputEvent &event, inv = PlayerInfo::getStorageInventory(); break; - default: case InventoryType::Inventory: inv = PlayerInfo::getInventory(); break; + case InventoryType::Trade: + case InventoryType::Npc: +#ifdef EATHENA_SUPPORT + case InventoryType::Cart: + case InventoryType::Vending: + case InventoryType::Mail: +#endif + case InventoryType::TypeEnd: + default: + break; } if (inv) return inv->getItem(index); diff --git a/src/dirs.cpp b/src/dirs.cpp index c3d70494f..4b374e86c 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -51,6 +51,7 @@ #ifdef WIN32 #include <SDL_syswm.h> #include "utils/specialfolder.h" +#undef ERROR #endif #include <sys/stat.h> diff --git a/src/enums/state.h b/src/enums/state.h index 581f6a352..4eb363c3c 100644 --- a/src/enums/state.h +++ b/src/enums/state.h @@ -25,6 +25,10 @@ #include "enums/simpletypes/enumdefines.h" +#ifdef WIN32 +#undef ERROR +#endif + enumStart(State) { ERROR = -1, diff --git a/src/game.cpp b/src/game.cpp index df1527a14..29c35a6dc 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -131,6 +131,7 @@ #ifdef WIN32 #include <sys/time.h> +#undef ERROR #endif #include "debug.h" diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 9c586c6f3..686b5ff8f 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -358,6 +358,10 @@ void Minimap::draw2(Graphics *const graphics) case ActorType::Homunculus: type = UserColorId::HOMUNCULUS; break; + + case ActorType::SkillUnit: + type = UserColorId::SKILLUNIT; + break; #endif case ActorType::Avatar: case ActorType::Unknown: diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 3496732aa..7beafa6c3 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -35,8 +35,6 @@ #include "actions/target.h" #include "actions/windows.h" -#include "enums/input/inputtype.h" - #include "input/inputactiondata.h" #include "input/inputcondition.h" #include "input/inputmanager.h" diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 5efc05f2f..94cac4b05 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -203,6 +203,8 @@ void InputManager::store() const case InputType::JOYSTICK: tmp = "j"; break; + case InputType::KEYBOARD: + case InputType::UNKNOWN: default: break; } diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h index 3fecd3c38..b32c0f37e 100644 --- a/src/input/inputmanager.h +++ b/src/input/inputmanager.h @@ -23,8 +23,6 @@ #include "input/inputfunction.h" -#include "enums/input/inputtype.h" - #include "events/inputevent.h" #include "utils/stringmap.h" diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp index f1c0660f2..19ded2815 100644 --- a/src/input/joystick.cpp +++ b/src/input/joystick.cpp @@ -27,8 +27,6 @@ #include "settings.h" #include "sdlshared.h" -#include "enums/input/inputtype.h" - #include "input/inputmanager.h" #include "utils/timer.h" diff --git a/src/input/keyboardconfig.cpp b/src/input/keyboardconfig.cpp index d2497e175..eadbbb624 100644 --- a/src/input/keyboardconfig.cpp +++ b/src/input/keyboardconfig.cpp @@ -24,8 +24,6 @@ #include "configuration.h" -#include "enums/input/inputtype.h" - #include "input/inputmanager.h" #include "utils/gettext.h" diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index b1aa87020..44931ae8a 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -91,9 +91,13 @@ size_t InventoryHandler::getSize(const InventoryTypeT type) const return 0; // Comes from server after items case InventoryType::Trade: return 12; - // GUILD_STORAGE + case InventoryType::Npc: +#ifdef EATHENA_SUPPORT + case InventoryType::Cart: + case InventoryType::Vending: + case InventoryType::Mail: +#endif case InventoryType::TypeEnd: - return 0; // Comes from server after items default: return 0; } diff --git a/src/net/eathena/partyrecv.cpp b/src/net/eathena/partyrecv.cpp index 3763eb1f5..ebe7e753c 100644 --- a/src/net/eathena/partyrecv.cpp +++ b/src/net/eathena/partyrecv.cpp @@ -21,7 +21,6 @@ #include "net/eathena/partyrecv.h" -#include "actormanager.h" #include "notifymanager.h" #include "party.h" |