@@ -16,9 +16,11 @@ namespace GW {
16
16
17
17
enum class CallTargetType : uint32_t ;
18
18
enum class WorldActionId : uint32_t ;
19
- enum class TransactionType : uint32_t ;
20
19
typedef uint32_t AgentID;
21
20
21
+ namespace Merchant {
22
+ enum class TransactionType : uint32_t ;
23
+ }
22
24
namespace Constants {
23
25
enum class Language ;
24
26
enum class MapID : uint32_t ;
@@ -205,11 +207,17 @@ namespace GW {
205
207
uint32_t field100_0x1a8;
206
208
207
209
bool IsCreated () const {
208
- return (field91_0x184 & 4 ) != 0 ;
210
+ return (field91_0x184 & 0x4 ) != 0 ;
209
211
}
210
-
211
212
bool IsVisible () const {
212
- return visibility_flags == 0 ;
213
+ return !IsHidden ();
214
+ }
215
+ bool IsHidden () const {
216
+ return (field91_0x184 & 0x200 ) != 0 ;
217
+ }
218
+
219
+ bool IsDisabled () const {
220
+ return (field91_0x184 & 0x10 ) != 0 ;
213
221
}
214
222
};
215
223
static_assert (sizeof (Frame) == 0x1ac );
@@ -432,7 +440,7 @@ namespace GW {
432
440
SkillbarMgr::SkillTemplate* skill_template;
433
441
};
434
442
struct kVendorWindow {
435
- TransactionType transaction_type;
443
+ Merchant:: TransactionType transaction_type;
436
444
uint32_t unk;
437
445
uint32_t merchant_agent_id;
438
446
uint32_t is_pending;
@@ -442,7 +450,7 @@ namespace GW {
442
450
uint32_t price;
443
451
};
444
452
struct kVendorItems {
445
- TransactionType transaction_type;
453
+ Merchant:: TransactionType transaction_type;
446
454
uint32_t item_ids_count;
447
455
uint32_t * item_ids_buffer1; // world->merchant_items.buffer
448
456
uint32_t * item_ids_buffer2; // world->merchant_items2.buffer
@@ -1129,7 +1137,8 @@ namespace GW {
1129
1137
GWCA_API bool SetFrameLimit (uint32_t value);
1130
1138
1131
1139
// GWCA_API void SetPreference(Preference pref, uint32_t value);
1132
- GWCA_API bool SetFrameVisible (UI::Frame* frame, bool is_visible);
1140
+ GWCA_API bool SetFrameVisible (UI::Frame* frame, bool flag);
1141
+ GWCA_API bool SetFrameDisabled (UI::Frame* frame, bool flag);
1133
1142
1134
1143
GWCA_API bool TriggerFrameRedraw (UI::Frame* frame);
1135
1144
0 commit comments