incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move flags enums into the structs they're scoped to

Browse Source
This commit is contained in:
Martin Michelsen
2022-04-01 21:21:46 -07:00
parent aa1a2e852b
commit 37b8f1cffa
13 changed files with 152 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Lobby.hh
+14 -12
View File
@@ -9,18 +9,18 @@
#include "Map.hh"
#include "RareItemSet.hh"
enum LobbyFlag {
IS_GAME = 0x01,
CHEATS_ENABLED = 0x02, // game only
PUBLIC = 0x04, // lobby only
EPISODE_3 = 0x08, // lobby & game
QUEST_IN_PROGRESS = 0x10, // game only
JOINABLE_QUEST_IN_PROGRESS = 0x20, // game only
DEFAULT = 0x40, // lobby only; not set for games and private lobbies
PERSISTENT = 0x80, // if not set, lobby is deleted when empty
};
struct Lobby {
enum Flag {
GAME = 0x01,
CHEATS_ENABLED = 0x02, // game only
PUBLIC = 0x04, // lobby only
EPISODE_3_ONLY = 0x08, // lobby & game
QUEST_IN_PROGRESS = 0x10, // game only
JOINABLE_QUEST_IN_PROGRESS = 0x20, // game only
DEFAULT = 0x40, // lobby only; not set for games and private lobbies
PERSISTENT = 0x80, // if not set, lobby is deleted when empty
};
uint32_t lobby_id;
uint32_t min_level;
@@ -59,7 +59,9 @@ struct Lobby {
Lobby();
bool is_game() const;
inline bool is_game() const {
return this->flags & Flag::GAME;
}
void reassign_leader_on_client_departure(size_t leaving_client_id);
size_t count_clients() const;