Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility typing to compile on Linux/MacOS #2

Open
wants to merge 1 commit into
base: multiplayer-for-godot4
Choose a base branch
from
Open

Compatibility typing to compile on Linux/MacOS #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion godotsteam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8248,7 +8248,9 @@ Vector2i Steam::getImageSize(int index) {
Vector2i size_of(0, 0);
bool success = false;
if (SteamUtils() != NULL) {
success = SteamUtils()->GetImageSize(index, &(uint32)size_of.x, &(uint32)size_of.y);
uint32_t size_x = size_of.x;
uint32_t size_y = size_of.y;
success = SteamUtils()->GetImageSize(index, &size_x, &size_y);
}
return size_of;
}
Expand Down
6 changes: 3 additions & 3 deletions steam_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ class SteamID : public RefCounted {
void setData(CSteamID value) {
data = value;
}
uint64 to_int() {
uint64_t to_int() {
return data.ConvertToUint64();
}
void from_int(uint64 i) {
void from_int(uint64_t i) {
data.SetFromUint64(i);
}
void from_CSteamID(CSteamID i) {
Expand Down Expand Up @@ -62,4 +62,4 @@ class SteamID : public RefCounted {

};

#endif // STEAM_ID
#endif // STEAM_ID
14 changes: 7 additions & 7 deletions steam_multiplayer_peer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SteamMultiplayerPeer::~SteamMultiplayerPeer() {
}
}

uint64 SteamMultiplayerPeer::get_lobby_id() {
uint64_t SteamMultiplayerPeer::get_lobby_id() {
return lobby_id.ConvertToUint64();
}

Expand Down Expand Up @@ -301,7 +301,7 @@ void SteamMultiplayerPeer::set_steam_id_peer(CSteamID steamId, int peer_id) {
} else if (con->peer_id == peer_id) {
//nothing happens, set peer that already exists
} else {
DEBUG_DATA_SIGNAL_V("THIS STEAM ID GOT WRONG PEER ID", steamId.ConvertToUint64());
DEBUG_DATA_SIGNAL_V("THIS STEAM ID GOT WRONG PEER ID", (uint64_t)steamId.ConvertToUint64());
DEBUG_DATA_SIGNAL_V("PEER ID WAS", con->peer_id);
DEBUG_DATA_SIGNAL_V("TRYING TO SET AS", peer_id);
}
Expand Down Expand Up @@ -361,20 +361,20 @@ void SteamMultiplayerPeer::lobby_created_scb(LobbyCreated_t *lobby_data, bool io
lobby_state = LOBBY_STATE::LOBBY_STATE_HOSTING;
int connect = lobby_data->m_eResult;
lobby_id = lobby_data->m_ulSteamIDLobby;
uint64 lobby = lobby_id.ConvertToUint64();
uint64_t lobby = lobby_id.ConvertToUint64();
emit_signal(SNAME("lobby_created"), connect, lobby); // why do I do this? edit: no really, why am I doing this?
}
}

Error SteamMultiplayerPeer::join_lobby(uint64 lobbyId) {
Error SteamMultiplayerPeer::join_lobby(uint64_t lobbyId) {
ERR_FAIL_COND_V_MSG(lobby_state != LOBBY_STATE::LOBBY_STATE_NOT_CONNECTED, ERR_ALREADY_IN_USE, "CANNOT JOIN A LOBBY WHILE IN A LOBBY!");

if (SteamMatchmaking() != NULL) {
lobby_state = LOBBY_STATE::LOBBY_STATE_CLIENT_PENDING;
this->lobby_id = lobbyId;
this->lobby_id.SetFromUint64(lobbyId);
// unique_id = SteamUser()->GetSteamID().GetAccountID();
unique_id = generate_unique_id();
SteamMatchmaking()->JoinLobby(CSteamID(lobbyId));
SteamMatchmaking()->JoinLobby(this->lobby_id);
}
return OK;
}
Expand Down Expand Up @@ -821,7 +821,7 @@ int SteamMultiplayerPeer::get_peer_id_from_steam64(uint64_t steamid) {
Dictionary SteamMultiplayerPeer::get_peer_map() {
Dictionary output;
for (auto E = connections_by_steamId64.begin(); E; ++E) {
output[E->value->peer_id] = E->value->steam_id.ConvertToUint64();
output[E->value->peer_id] = (uint64_t)E->value->steam_id.ConvertToUint64();
}
return output;
}
6 changes: 3 additions & 3 deletions steam_multiplayer_peer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SteamMultiplayerPeer : public MultiplayerPeer {

SteamMultiplayerPeer();
~SteamMultiplayerPeer();
uint64 get_lobby_id();
uint64_t get_lobby_id();

static void _bind_methods();

Expand Down Expand Up @@ -261,7 +261,7 @@ class SteamMultiplayerPeer : public MultiplayerPeer {
output["pending_unreliable"] = info.m_cbPendingUnreliable;
output["pending_reliable"] = info.m_cbPendingReliable;
output["sent_unacked_reliable"] = info.m_cbSentUnackedReliable;
output["queue_time"] = info.m_usecQueueTime;
output["queue_time"] = (uint64_t)info.m_usecQueueTime;

output["ping"] = info.m_nPing;
return output;
Expand All @@ -281,7 +281,7 @@ class SteamMultiplayerPeer : public MultiplayerPeer {
void removed_connection_peer(const CSteamID &steamId);

Error create_lobby(LOBBY_TYPE lobbyType, int max_players);
Error join_lobby(uint64 lobbyId);
Error join_lobby(uint64_t lobbyId);

STEAM_CALLBACK(SteamMultiplayerPeer, lobby_message_scb, LobbyChatMsg_t, callbackLobbyMessage);
STEAM_CALLBACK(SteamMultiplayerPeer, lobby_chat_update_scb, LobbyChatUpdate_t, callbackLobbyChatUpdate);
Expand Down