diff options
| author | untodesu <kirill@untode.su> | 2025-03-16 22:19:39 +0500 |
|---|---|---|
| committer | untodesu <kirill@untode.su> | 2025-03-16 22:19:39 +0500 |
| commit | d1d7521ee859f10e99fb3f82e710c8bbeb7c41c5 (patch) | |
| tree | 900e6a537bd5763636db8497404d3b28e6afcef2 /game/client | |
| parent | 68b0b663514d1a5dcf79cfbdeea544b5d69ed1ed (diff) | |
| download | voxelius-d1d7521ee859f10e99fb3f82e710c8bbeb7c41c5.tar.bz2 voxelius-d1d7521ee859f10e99fb3f82e710c8bbeb7c41c5.zip | |
Fix the bizzare CRC32 callback I forgot to remove
- This fixes bother not working
- Separated client and server splashes
- Added server splashes
Diffstat (limited to 'game/client')
| -rw-r--r-- | game/client/bother.cc | 1 | ||||
| -rw-r--r-- | game/client/game.cc | 1 | ||||
| -rw-r--r-- | game/client/main.cc | 2 | ||||
| -rw-r--r-- | game/client/play_menu.cc | 3 |
4 files changed, 3 insertions, 4 deletions
diff --git a/game/client/bother.cc b/game/client/bother.cc index e808485..8ca247a 100644 --- a/game/client/bother.cc +++ b/game/client/bother.cc @@ -75,6 +75,7 @@ void bother::update_late(void) if(auto peer = enet_host_connect(bother_host, &address, 1, 0)) { peer->data = reinterpret_cast<void *>(static_cast<std::uintptr_t>(item.identity)); bother_set.insert(item.identity); + enet_host_flush(bother_host); } bother_queue.pop_front(); diff --git a/game/client/game.cc b/game/client/game.cc index e0e02d1..f7a6349 100644 --- a/game/client/game.cc +++ b/game/client/game.cc @@ -205,7 +205,6 @@ void client_game::init(void) settings::add_keybind(4, hide_hud_toggle, settings_location::KEYBOARD_MISC, "game.key.toggle_hide_hud"); globals::client_host = enet_host_create(nullptr, 1, 1, 0, 0); - globals::client_host->checksum = &enet_crc32; if(!globals::client_host) { spdlog::critical("game: unable to setup an ENet host"); diff --git a/game/client/main.cc b/game/client/main.cc index 6fabaa3..277b278 100644 --- a/game/client/main.cc +++ b/game/client/main.cc @@ -266,7 +266,7 @@ int main(int argc, char **argv) alcMakeContextCurrent(globals::sound_ctx); - splash::init(); + splash::init_client(); window_title::update(); diff --git a/game/client/play_menu.cc b/game/client/play_menu.cc index 4c1d2cd..1c89252 100644 --- a/game/client/play_menu.cc +++ b/game/client/play_menu.cc @@ -195,7 +195,7 @@ static void on_bother_response(const BotherResponseEvent &event) item->num_players = event.num_players; item->max_players = event.max_players; item->motd = event.motd; - item->status = item_status::FAILURE; + item->status = item_status::REACHED; } break; @@ -480,7 +480,6 @@ void play_menu::update_late(void) { for(auto item : servers_deque) { if(item->status == item_status::UNKNOWN) { - spdlog::info("bothering {}", item->name); bother::ping(item->identity, item->hostname.c_str(), item->port); item->status = item_status::PINGING; continue; |
