mirror of
https://github.com/CraftyBoss/SuperMarioOdysseyOnline.git
synced 2024-11-26 13:13:04 +00:00
69d6a732c7
- change: general game mode management more abstract and less H&S oriented
- change: split 8bit updateType into 4bit game mode and 4bit update type.
- change: don't process packets from other game modes (legacy mode for backwards compatibility)
- change: cache game mode of other players in puppet, resend GameModeInf on detected game mode change
- change: send gamemode NONE when H&S is selected but not active
- change: improved distance calculations in squared distance space
- change: change from hider to seeker when dead even if there are no other players
- fix: add hours to the minutes for the H&S GameModeInf packet
- fix: set milliseconds and hours when receiving time from server
- fix: keep the new time from the server for longer than a single frame
- fix: reset H&S icon after receiving a new state from the server
- refac: move code to generate PlayerList into own abstract LayoutPlayerList class.
- refac: to_string() method for GameTime to simplify code in the Game Mode Icon class.
- refac: rename TagInf packet to GameModeInf packet
- refac: remove param from `SocketClient::tryGetPacket()` (unused)
- refac: move all H&S specific files into the same directory (out of layouts)
- refac: move GameModeTimer.cpp from source/server/hns/ to source/server/gamemode/
- refac: clean up some unused, duplicate or complicated imports
- [mod menu] change: use the game mode name in the options & menu title
- [mod menu] change: select the next game mode in the game mode select menu
- [mod menu] change: possibility to always change the gravity setting in the H&S config menu
- [mod menu] add: toggle options to control mario/cappy collision/bounciness
(cherry picked from commit a9b2c87aa0
)
(cherry picked from commit 918f61fbfd619d781d88dc74878d392c48cfa480)
(cherry picked from commit 96aff7dd7167d8244acef7884fa3503d4c3f868a)
(cherry picked from commit 0fb6413ec91bbf679e9f8cea1aa512159101fa46)
(cherry picked from commit ab78a812fd18781655ccf38e803f619ea427d1ac)
Co-authored-by: Robin C. Ladiges <rcl.git@blackpinguin.de>
39 lines
945 B
C++
39 lines
945 B
C++
#pragma once
|
|
|
|
#include "types.h"
|
|
#include "nn/result.h"
|
|
|
|
class SocketBase {
|
|
|
|
public:
|
|
SocketBase(const char* name);
|
|
|
|
virtual nn::Result init(const char* ip, u16 port) = 0;
|
|
virtual bool closeSocket();
|
|
virtual bool tryReconnect();
|
|
virtual struct Packet* tryGetPacket();
|
|
|
|
const char* getStateChar();
|
|
u8 getLogState();
|
|
s32 getFd();
|
|
|
|
void set_sock_flags(int flags);
|
|
|
|
const char* getIP() { return this->sock_ip; }
|
|
u16 getPort() { return this->port; }
|
|
void setName(const char* name) { strcpy(sockName, name); };
|
|
u32 socket_errno;
|
|
|
|
protected:
|
|
s32 socket_log(const char* str);
|
|
s32 socket_read_char(char* out);
|
|
|
|
char sockName[0x10] = {};
|
|
char sock_ip[MAX_HOSTNAME_LENGTH] = {};
|
|
|
|
u16 port;
|
|
u8 socket_log_state = SOCKET_LOG_UNINITIALIZED;
|
|
s32 socket_log_socket;
|
|
|
|
int sock_flags;
|
|
};
|