From 749c0a5c2f4ec563493387aa7c41ec87b3c3b092 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 10 Sep 2020 12:35:06 +0200 Subject: [PATCH] Removed onc_open_loot_winow_request, onc_open_container_winow_request, and onc_open_vendor_winow_request signals from Entity, onc_open_winow_request with a window_id parameter took their place. --- entities/entity.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/entities/entity.cpp b/entities/entity.cpp index 226bbca..edb39c6 100644 --- a/entities/entity.cpp +++ b/entities/entity.cpp @@ -2831,17 +2831,7 @@ void Entity::ssend_open_window(int window_id) { ORPC(copen_window, window_id); } void Entity::copen_window(int window_id) { - switch (window_id) { - case EntityEnums::ENTITY_WINDOW_LOOT: - emit_signal("onc_open_loot_winow_request"); - break; - case EntityEnums::ENTITY_WINDOW_CONTAINER: - emit_signal("onc_open_container_winow_request"); - break; - case EntityEnums::ENTITY_WINDOW_VENDOR: - emit_signal("onc_open_vendor_winow_request"); - break; - } + emit_signal("onc_open_winow_request", window_id); } //XP Operations @@ -6497,9 +6487,7 @@ void Entity::_bind_methods() { ADD_SIGNAL(MethodInfo("cskill_changed", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::OBJECT, "skill", PROPERTY_HINT_RESOURCE_TYPE, "EntitySkill"))); //Windows - ADD_SIGNAL(MethodInfo("onc_open_loot_winow_request")); - ADD_SIGNAL(MethodInfo("onc_open_container_winow_request")); - ADD_SIGNAL(MethodInfo("onc_open_vendor_winow_request")); + ADD_SIGNAL(MethodInfo("onc_open_winow_request", PropertyInfo(Variant::INT, "window_id"))); //setup BIND_VMETHOD(MethodInfo("_setup"));