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

Compare commits

base: MickSlash:624455705f0a1f2a09eeb5d086edae2da133bf06
Branches Tags
MickSlash:master
MickSlash:test_ci
MickSlash:inventory_pr
MickSlash:0.2.5
MickSlash:v0.2.4
MickSlash:v0.2.3
MickSlash:v0.2.2
..
compare: MickSlash:05e6c103f8fc8f5539f2ea29f83c78e0a04660ef
Branches Tags
MickSlash:master
MickSlash:test_ci
MickSlash:inventory_pr
MickSlash:0.2.5
MickSlash:v0.2.4
MickSlash:v0.2.3
MickSlash:v0.2.2

No commits in common. "624455705f0a1f2a09eeb5d086edae2da133bf06" and "05e6c103f8fc8f5539f2ea29f83c78e0a04660ef" have entirely different histories.
624455705f ... 05e6c103f8

3 changed files with 9 additions and 9 deletions
Show Stats Expand all files Collapse all files

4
dll/defines.h
View File

@ -1,6 +1,6 @@
//TODO: put these in a common .h //TODO: put these in a common .h
#define CLIENT_HSTEAMUSER 1 #define CLIENT_HSTEAMUSER 12
#define SERVER_HSTEAMUSER 1 #define SERVER_HSTEAMUSER 13
#define DEFAULT_NAME "Goldberg" #define DEFAULT_NAME "Goldberg"
#define PROGRAM_NAME "Goldberg SteamEmu" #define PROGRAM_NAME "Goldberg SteamEmu"

12
dll/steam_client.cpp
View File

@ -445,7 +445,7 @@ void *Steam_Client::GetISteamGenericInterface( HSteamUser hSteamUser, HSteamPipe
if (!steam_pipes.count(hSteamPipe)) return NULL; if (!steam_pipes.count(hSteamPipe)) return NULL;
bool server = false; bool server = false;
if (steam_pipes[hSteamPipe] == Steam_Pipe::SERVER) { if (hSteamUser == SERVER_HSTEAMUSER) {
server = true; server = true;
} else { } else {
if ((strstr(pchVersion, "SteamNetworkingUtils") != pchVersion) && (strstr(pchVersion, "SteamUtils") != pchVersion)) { if ((strstr(pchVersion, "SteamNetworkingUtils") != pchVersion) && (strstr(pchVersion, "SteamUtils") != pchVersion)) {
@ -620,7 +620,7 @@ ISteamApps *Steam_Client::GetISteamApps( HSteamUser hSteamUser, HSteamPipe hStea
Steam_Apps *steam_apps_temp; Steam_Apps *steam_apps_temp;
if (steam_pipes[hSteamPipe] == Steam_Pipe::SERVER) { if (hSteamUser == SERVER_HSTEAMUSER) {
steam_apps_temp = steam_gameserver_apps; steam_apps_temp = steam_gameserver_apps;
} else { } else {
steam_apps_temp = steam_apps; steam_apps_temp = steam_apps;
@ -654,7 +654,7 @@ ISteamNetworking *Steam_Client::GetISteamNetworking( HSteamUser hSteamUser, HSte
Steam_Networking *steam_networking_temp; Steam_Networking *steam_networking_temp;
if (steam_pipes[hSteamPipe] == Steam_Pipe::SERVER) { if (hSteamUser == SERVER_HSTEAMUSER) {
steam_networking_temp = steam_gameserver_networking; steam_networking_temp = steam_gameserver_networking;
} else { } else {
steam_networking_temp = steam_networking; steam_networking_temp = steam_networking;
@ -777,7 +777,7 @@ ISteamHTTP *Steam_Client::GetISteamHTTP( HSteamUser hSteamuser, HSteamPipe hStea
{ {
PRINT_DEBUG("GetISteamHTTP %s\n", pchVersion); PRINT_DEBUG("GetISteamHTTP %s\n", pchVersion);
if (!steam_pipes.count(hSteamPipe) || !hSteamuser) return NULL; if (!steam_pipes.count(hSteamPipe) || !hSteamuser) return NULL;
if (steam_pipes[hSteamPipe] == Steam_Pipe::SERVER) { if (hSteamuser == SERVER_HSTEAMUSER) {
return steam_gameserver_http; return steam_gameserver_http;
} }
@ -834,7 +834,7 @@ ISteamUGC *Steam_Client::GetISteamUGC( HSteamUser hSteamUser, HSteamPipe hSteamP
if (!steam_pipes.count(hSteamPipe) || !hSteamUser) return NULL; if (!steam_pipes.count(hSteamPipe) || !hSteamUser) return NULL;
Steam_UGC *steam_ugc_temp; Steam_UGC *steam_ugc_temp;
if (steam_pipes[hSteamPipe] == Steam_Pipe::SERVER) { if (hSteamUser == SERVER_HSTEAMUSER) {
steam_ugc_temp = steam_gameserver_ugc; steam_ugc_temp = steam_gameserver_ugc;
} else { } else {
steam_ugc_temp = steam_ugc; steam_ugc_temp = steam_ugc;
@ -962,7 +962,7 @@ ISteamInventory *Steam_Client::GetISteamInventory( HSteamUser hSteamuser, HSteam
SteamCallBacks *callbacks_temp; SteamCallBacks *callbacks_temp;
SteamCallResults *callback_results_temp; SteamCallResults *callback_results_temp;
if (steam_pipes[hSteamPipe] == Steam_Pipe::SERVER) { if (hSteamuser == SERVER_HSTEAMUSER) {
steam_inventory_temp = steam_gameserver_inventory; steam_inventory_temp = steam_gameserver_inventory;
} else { } else {
steam_inventory_temp = steam_inventory; steam_inventory_temp = steam_inventory;

2
dll/steam_client.h
View File

@ -136,7 +136,7 @@ public:
std::thread background_keepalive; std::thread background_keepalive;
bool steamclient_server_inited = false; bool steamclient_server_inited = false;
unsigned steam_pipe_counter = 1; unsigned steam_pipe_counter = 2;
std::map<HSteamPipe, enum Steam_Pipe> steam_pipes; std::map<HSteamPipe, enum Steam_Pipe> steam_pipes;
Steam_Client(); Steam_Client();