Skip to content

Commit 4703176

Browse files
committed
Updated GWCA
1 parent 23d82ba commit 4703176

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

Dependencies/GWCA/bin/gwca.dll

1.5 KB
Binary file not shown.

Dependencies/GWCA/include/GWCA/Managers/MerchantMgr.h

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ namespace GW {
3030
CollectorBuy,
3131
CrafterBuy,
3232
WeaponsmithCustomize,
33+
DonateFaction = 0x6,
3334

3435
MerchantSell = 0xB,
3536
TraderBuy,

Dependencies/GWCA/include/GWCA/Managers/PlayerMgr.h

-3
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,5 @@ namespace GW {
5353
GWCA_API Title* GetActiveTitle();
5454

5555
GWCA_API TitleClientData* GetTitleData(Constants::TitleID title_id);
56-
57-
// Donate 5000 faction points to Luxon (1) or Kurzick (0). Must be talking to faction NPC.
58-
GWCA_API bool DepositFaction(uint32_t allegiance);
5956
};
6057
}

Dependencies/GWCA/include/GWCA/Managers/UIMgr.h

+16-7
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ namespace GW {
1616

1717
enum class CallTargetType : uint32_t;
1818
enum class WorldActionId : uint32_t;
19-
enum class TransactionType : uint32_t;
2019
typedef uint32_t AgentID;
2120

21+
namespace Merchant {
22+
enum class TransactionType : uint32_t;
23+
}
2224
namespace Constants {
2325
enum class Language;
2426
enum class MapID : uint32_t;
@@ -205,11 +207,17 @@ namespace GW {
205207
uint32_t field100_0x1a8;
206208

207209
bool IsCreated() const {
208-
return (field91_0x184 & 4) != 0;
210+
return (field91_0x184 & 0x4) != 0;
209211
}
210-
211212
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;
213221
}
214222
};
215223
static_assert(sizeof(Frame) == 0x1ac);
@@ -432,7 +440,7 @@ namespace GW {
432440
SkillbarMgr::SkillTemplate* skill_template;
433441
};
434442
struct kVendorWindow {
435-
TransactionType transaction_type;
443+
Merchant::TransactionType transaction_type;
436444
uint32_t unk;
437445
uint32_t merchant_agent_id;
438446
uint32_t is_pending;
@@ -442,7 +450,7 @@ namespace GW {
442450
uint32_t price;
443451
};
444452
struct kVendorItems {
445-
TransactionType transaction_type;
453+
Merchant::TransactionType transaction_type;
446454
uint32_t item_ids_count;
447455
uint32_t* item_ids_buffer1; // world->merchant_items.buffer
448456
uint32_t* item_ids_buffer2; // world->merchant_items2.buffer
@@ -1129,7 +1137,8 @@ namespace GW {
11291137
GWCA_API bool SetFrameLimit(uint32_t value);
11301138

11311139
//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);
11331142

11341143
GWCA_API bool TriggerFrameRedraw(UI::Frame* frame);
11351144

Dependencies/GWCA/lib/gwca.lib

40 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)