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

fix incorrect box drop areas in rare tables

Browse Source
This commit is contained in:
Martin Michelsen
2025-02-22 15:39:08 -08:00
parent fa22c3563d
commit 104e31028b
16 changed files with 2382 additions and 2368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ChatCommands.cc
+5 -5
View File
@@ -1515,7 +1515,7 @@ ChatCommandDefinition cc_next(
a.check_is_game(true);
a.check_cheats_enabled(s->cheat_flags.warp);
size_t limit = floor_limit_for_episode(l->episode);
size_t limit = FloorDefinition::limit_for_episode(l->episode);
if (limit == 0) {
return;
}
@@ -1528,7 +1528,7 @@ ChatCommandDefinition cc_next(
throw precondition_failed("$C6You must be in a\ngame to use this\ncommand");
}
size_t limit = floor_limit_for_episode(a.ses->lobby_episode);
size_t limit = FloorDefinition::limit_for_episode(a.ses->lobby_episode);
if (limit == 0) {
return;
}
@@ -2693,7 +2693,7 @@ static void server_command_warp(const ServerArgs& a, bool is_warpall) {
return;
}
size_t limit = floor_limit_for_episode(l->episode);
size_t limit = FloorDefinition::limit_for_episode(l->episode);
if (limit == 0) {
return;
} else if (floor > limit) {
@@ -2777,14 +2777,14 @@ ChatCommandDefinition cc_where(
auto l = a.c->require_lobby();
send_text_message_printf(a.c, "$C7%01" PRIX32 ":%s X:%" PRId32 " Z:%" PRId32,
a.c->floor,
short_name_for_floor(l->episode, a.c->floor),
FloorDefinition::get(l->episode, a.c->floor).short_name,
static_cast<int32_t>(a.c->pos.x.load()),
static_cast<int32_t>(a.c->pos.z.load()));
for (auto lc : l->clients) {
if (lc && (lc != a.c)) {
string name = lc->character()->disp.name.decode(lc->language());
send_text_message_printf(a.c, "$C6%s$C7 %01" PRIX32 ":%s",
name.c_str(), lc->floor, short_name_for_floor(l->episode, lc->floor));
name.c_str(), lc->floor, FloorDefinition::get(l->episode, lc->floor).short_name);
}
}
},