diff --git a/artifacts/scripting/headers/define_extra.h b/artifacts/scripting/headers/define_extra.h index c9089d01..5e6f722d 100644 --- a/artifacts/scripting/headers/define_extra.h +++ b/artifacts/scripting/headers/define_extra.h @@ -122,25 +122,22 @@ #define MSGBOX_CLEAN (0x20) // no buttons // Some possible defines for the 4th argument to HOOK_REMOVEINVOBJ -#define RMOBJ_DROP 4831349 // If the object is dropped manually by the player from the inventory screen -#define RMOBJ_TRADE 4683293 // If the object is offered up as a trade -#define RMOBJ_DROPMULTI 4571599 // When dropping a part of a stack (RMOBJ_DROP occurs first) +#define RMOBJ_ITEM_REMOVED_INVEN 4831349 // removing or destroying an item (obj_remove_from_inven_) +#define RMOBJ_ITEM_REMOVED 4548572 // (op_rm_obj_from_inven_) +#define RMOBJ_ITEM_REMOVED_MULTI 4563866 // (op_rm_mult_objs_from_inven_) +#define RMOBJ_ITEM_DESTROYED 4543215 // (op_destroy_object_) +#define RMOBJ_ITEM_DESTROY_MULTI 4571599 // (op_destroy_mult_objs_) +#define RMOBJ_ITEM_MOVE 4683293 // (item_move_func_) #define RMOBJ_CONSUME_DRUG 4666772 // (inven_action_cursor_) -//#define RMOBJ_CONTAINER 4683293 // same as RMOBJ_TRADE (item_move_func_) #define RMOBJ_USE_OBJ 4666865 // (inven_action_cursor_) #define RMOBJ_EQUIP_ARMOR 4658121 // (inven_pickup_) #define RMOBJ_EQUIP_WEAPON 4658675 // (switch_hand_) #define RMOBJ_UNLOAD_WEAPON 4667030 // (inven_action_cursor_) -//#define RMOBJ_LOAD_WEAPON 4831349 // same as RMOBJ_DROP (obj_remove_from_inven_) #define RMOBJ_USE_DRUG_ON 4834866 // (obj_use_item_on_) #define RMOBJ_STEAL_VIEW 4668206 // (loot_container_) -//#define RMOBJ_DROP_DYNAMITE 4666865 // same as RMOBJ_USE_OBJ -#define RMOBJ_ITEM_DESTROYED 4543215 // (op_destroy_object_) -#define RMOBJ_ITEM_REMOVED 4548572 // (op_rm_obj_from_inven_) #define RMOBJ_ARMOR_EQUIPED 4651961 // removing armor from the player's slot when entering INVENTORY/LOOT/BARTER/USE inventory #define RMOBJ_LEFT_HAND_EQUIPED 4651899 // removing item from the player's left slot when entering INVENTORY/LOOT/BARTER/USE inventory #define RMOBJ_RIGHT_HAND_EQUIPED 4651934 // removing item from the player's right slot when entering INVENTORY/LOOT/BARTER/USE inventory -#define RMOBJ_RM_MULT_OBJS 4563866 // (op_rm_mult_objs_from_inven_) #define RMOBJ_REPLACE_WEAPON 4658526 // (switch_hand_) #define RMOBJ_THROW 4266040 // (action_ranged_) #define RMOBJ_SUB_CONTAINER 4683191 // search and remove the item from nested containers in the inventory @@ -151,6 +148,14 @@ #define RMOBJ_BARTER_WEAPON 4675722 // removing weapon from NPC's slot before entering the barter screen #define RMOBJ_INVEN_DROP_CAPS 4667295 // if money/caps are dropped manually by the player from the inventory screen #define RMOBJ_DROP_INTO_CONTAINER 4678833 // when dropping items into a container item (bag/backpack) +// old defines +#define RMOBJ_RM_MULT_OBJS RMOBJ_ITEM_REMOVED_MULTI +#define RMOBJ_TRADE RMOBJ_ITEM_MOVE // If the object is offered up as a trade +#define RMOBJ_DROP RMOBJ_ITEM_REMOVED_INVEN // If the object is dropped manually by the player from the inventory screen +#define RMOBJ_DROPMULTI RMOBJ_ITEM_DESTROY_MULTI // When dropping a part of a stack (RMOBJ_ITEM_MOVE occurs first) +//#define RMOBJ_DROP_DYNAMITE RMOBJ_USE_OBJ +//#define RMOBJ_CONTAINER RMOBJ_ITEM_MOVE +//#define RMOBJ_LOAD_WEAPON RMOBJ_ITEM_REMOVED_INVEN // common prototype offsets for get/set_proto_data #define PROTO_PID (1) diff --git a/sfall/Modules/Graphics.cpp b/sfall/Modules/Graphics.cpp index 42ba0f12..b7423567 100644 --- a/sfall/Modules/Graphics.cpp +++ b/sfall/Modules/Graphics.cpp @@ -1039,9 +1039,9 @@ public: char windowTitle[128]; if (ResWidth != gWidth || ResHeight != gHeight) { - std::sprintf(windowTitle, "%s @sfall " VERSION_STRING " %ix%i >> %ix%i", (const char*)0x50AF08, ResWidth, ResHeight, gWidth, gHeight); + std::sprintf(windowTitle, "%s @sfall " VERSION_STRING " : %ix%i >> %ix%i", (const char*)0x50AF08, ResWidth, ResHeight, gWidth, gHeight); } else { - std::sprintf(windowTitle, "%s @sfall " VERSION_STRING, (const char*)0x50AF08); + std::sprintf(windowTitle, "%s @sfall " VERSION_STRING " : %ix%i", (const char*)0x50AF08, ResWidth, ResHeight); } SetWindowTextA(a, windowTitle);