MickSlash
/
goldberg_emulator
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Make the inventory result callback respect the result timeout.

merge-requests/6/head
Mr_Goldberg 2019-05-03 21:54:32 -04:00
parent 2ba58d9f78
commit 106d4025bb
No known key found for this signature in database
GPG Key ID: 8597D87419DEF278
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dll/steam_inventory.h
View File

@ -46,7 +46,7 @@ public ISteamInventory
std::vector<struct Steam_Inventory_Requests> inventory_requests; std::vector<struct Steam_Inventory_Requests> inventory_requests;
SteamInventoryResult_t new_inventory_result(const SteamItemInstanceID_t *pInstanceIDs=NULL, uint32 unCountInstanceIDs=0) struct Steam_Inventory_Requests *new_inventory_result(const SteamItemInstanceID_t *pInstanceIDs=NULL, uint32 unCountInstanceIDs=0)
{ {
static SteamInventoryResult_t result; static SteamInventoryResult_t result;
++result; ++result;
@ -60,7 +60,8 @@ SteamInventoryResult_t new_inventory_result(const SteamItemInstanceID_t *pInstan
request.time_created = std::chrono::system_clock::now(); request.time_created = std::chrono::system_clock::now();
inventory_requests.push_back(request); inventory_requests.push_back(request);
return request.inventory_result;
return &(inventory_requests.back());
} }
struct Steam_Inventory_Requests *get_inventory_result(SteamInventoryResult_t resultHandle) struct Steam_Inventory_Requests *get_inventory_result(SteamInventoryResult_t resultHandle)
@ -122,6 +123,7 @@ bool GetResultItems( SteamInventoryResult_t resultHandle,
if (!request->result_done()) return false; if (!request->result_done()) return false;
if (punOutItemsArraySize) *punOutItemsArraySize = 0; if (punOutItemsArraySize) *punOutItemsArraySize = 0;
PRINT_DEBUG("GetResultItems good\n");
return true; return true;
} }
@ -205,24 +207,24 @@ bool GetAllItems( SteamInventoryResult_t *pResultHandle )
PRINT_DEBUG("GetAllItems\n"); PRINT_DEBUG("GetAllItems\n");
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
if (pResultHandle) { if (pResultHandle) {
SteamInventoryResult_t handle = new_inventory_result(); struct Steam_Inventory_Requests *request = new_inventory_result();
{ {
// SteamInventoryFullUpdate_t callbacks are triggered when GetAllItems // SteamInventoryFullUpdate_t callbacks are triggered when GetAllItems
// successfully returns a result which is newer / fresher than the last // successfully returns a result which is newer / fresher than the last
// known result. // known result.
//TODO: should this always be returned for each get all item calls? //TODO: should this always be returned for each get all item calls?
struct SteamInventoryFullUpdate_t data; struct SteamInventoryFullUpdate_t data;
data.m_handle = handle; data.m_handle = request->inventory_result;
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data)); callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), request->timeout);
} }
{ {
struct SteamInventoryResultReady_t data; struct SteamInventoryResultReady_t data;
data.m_handle = handle; data.m_handle = request->inventory_result;
data.m_result = k_EResultOK; data.m_result = k_EResultOK;
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data)); callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), request->timeout);
} }
*pResultHandle = handle; *pResultHandle = request->inventory_result;
return true; return true;
} }
@ -244,15 +246,15 @@ bool GetItemsByID( SteamInventoryResult_t *pResultHandle, STEAM_ARRAY_COUNT( unC
PRINT_DEBUG("GetItemsByID\n"); PRINT_DEBUG("GetItemsByID\n");
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
if (pResultHandle) { if (pResultHandle) {
SteamInventoryResult_t handle = new_inventory_result(pInstanceIDs, unCountInstanceIDs); struct Steam_Inventory_Requests *request = new_inventory_result(pInstanceIDs, unCountInstanceIDs);
{ {
struct SteamInventoryResultReady_t data; struct SteamInventoryResultReady_t data;
data.m_handle = handle; data.m_handle = request->inventory_result;
data.m_result = k_EResultOK; data.m_result = k_EResultOK;
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data)); callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), request->timeout);
} }
*pResultHandle = handle; *pResultHandle = request->inventory_result;
return true; return true;
} }
@ -328,15 +330,15 @@ bool DeserializeResult( SteamInventoryResult_t *pOutResultHandle, STEAM_BUFFER_C
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
//TODO //TODO
if (pOutResultHandle) { if (pOutResultHandle) {
SteamInventoryResult_t handle = new_inventory_result(); struct Steam_Inventory_Requests *request = new_inventory_result();
{ {
struct SteamInventoryResultReady_t data; struct SteamInventoryResultReady_t data;
data.m_handle = handle; data.m_handle = request->inventory_result;
data.m_result = k_EResultOK; data.m_result = k_EResultOK;
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data)); callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), request->timeout);
} }
*pOutResultHandle = handle; *pOutResultHandle = request->inventory_result;
return true; return true;
} }