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

add support for 12/2000 DC prototype

Browse Source
This commit is contained in:
Martin Michelsen
2023-11-27 14:40:42 -08:00
parent f2c3d256f3
commit 0a522e6ac4
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
notes/dc-proto-connection-addresses.txt
+1 -1
View File
@@ -1,5 +1,5 @@
DC NTE: pso02.dricas.ne.jp DC NTE: pso02.dricas.ne.jp
Nov 2000 proto: test1.st-pso.games.sega.net Nov 2000 proto: test1.st-pso.games.sega.net
Dec 2000 proto: sg107634.csrd.sega.co.jp Dec 2000 proto: sg107634.csrd.sega.co.jp OR master.pso.dream-key.com
Jan 2001 proto: master.pso.dream-key.com Jan 2001 proto: master.pso.dream-key.com
Aug 2001 proto (v2): ??? Aug 2001 proto (v2): ???
src/ReceiveSubcommands.cc
+14 -5
View File
@@ -62,7 +62,12 @@ static void forward_subcommand(
throw runtime_error("Episode 3 command sent by non-Episode 3 client"); throw runtime_error("Episode 3 command sent by non-Episode 3 client");
} }
auto l = c->require_lobby(); auto l = c->lobby.lock();
if (!l) {
c->log.warning("Not in any lobby; dropping command");
return;
}
if (command_is_private(command)) { if (command_is_private(command)) {
if (flag >= l->max_clients) { if (flag >= l->max_clients) {
return; return;
@@ -671,11 +676,11 @@ static void on_set_player_visible(shared_ptr<Client> c, uint8_t command, uint8_t
if (cmd.header.client_id == c->lobby_client_id) { if (cmd.header.client_id == c->lobby_client_id) {
forward_subcommand(c, command, flag, data, size, 0x1F, 0x21); forward_subcommand(c, command, flag, data, size, 0x1F, 0x21);
auto l = c->require_lobby(); auto l = c->lobby.lock();
if (!l->is_game() && !is_v1(c->version())) { if (l && !l->is_game() && !is_v1(c->version())) {
send_arrow_update(l); send_arrow_update(l);
} }
if (!l->is_game() && l->check_flag(Lobby::Flag::IS_OVERFLOW)) { if (l && !l->is_game() && l->check_flag(Lobby::Flag::IS_OVERFLOW)) {
send_message_box(c, "$C6All lobbies are full.\n\n$C7You are in a private lobby. You can use the\nteleporter to join other lobbies if there is space\navailable."); send_message_box(c, "$C6All lobbies are full.\n\n$C7You are in a private lobby. You can use the\nteleporter to join other lobbies if there is space\navailable.");
send_lobby_message_box(c, ""); send_lobby_message_box(c, "");
} }
@@ -2970,7 +2975,11 @@ SubcommandDefinition subcommand_definitions[0x100] = {
}; };
static void handle_subcommand_dc_prototypes(shared_ptr<Client> c, uint8_t command, uint8_t flag, const void* data, size_t size) { static void handle_subcommand_dc_prototypes(shared_ptr<Client> c, uint8_t command, uint8_t flag, const void* data, size_t size) {
auto l = c->require_lobby(); auto l = c->lobby.lock();
if (!l) {
return;
}
if (l->is_game()) { if (l->is_game()) {
// DC NTE doesn't send 6F when it's done loading, so treat this command as // DC NTE doesn't send 6F when it's done loading, so treat this command as
// 6F instead. // 6F instead.