tovjemam/fekalnigtacko
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make WorldView actually use mapname received from server instead of ignoring it

Browse Source
This commit is contained in:
tovjemam 2026-03-21 17:22:57 +01:00
parent cc8bc9313c
commit 737165a152
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gameview/worldview.cpp
View File

@ -9,12 +9,14 @@
#include "draw_args.hpp" #include "draw_args.hpp"
game::view::WorldView::WorldView(ClientSession& session, net::InMessage& msg) : game::view::WorldView::WorldView(ClientSession& session, net::InMessage& msg) :
session_(session), audiomaster_(session_.GetAudioMaster()), map_("openworld") session_(session), audiomaster_(session_.GetAudioMaster())
{ {
net::MapName mapname; net::MapName mapname;
if (!msg.Read(mapname)) if (!msg.Read(mapname))
throw EntityInitError(); throw EntityInitError();
map_ = std::make_unique<MapInstanceView>(std::string(mapname));
// init destroyed objs // init destroyed objs
net::ObjCount objcount; net::ObjCount objcount;
if (!msg.Read(objcount)) if (!msg.Read(objcount))
@ -26,7 +28,7 @@ game::view::WorldView::WorldView(ClientSession& session, net::InMessage& msg) :
if (!msg.Read(objnum)) if (!msg.Read(objnum))
throw EntityInitError(); throw EntityInitError();
map_.EnableObj(objnum, false); map_->EnableObj(objnum, false);
} }
// cache common snds and stuff // cache common snds and stuff
@ -69,8 +71,8 @@ void game::view::WorldView::Update(const UpdateInfo& info)
{ {
time_ = info.time; time_ = info.time;
if (!map_.IsLoaded()) if (!map_->IsLoaded())
map_.LoadNext(); map_->LoadNext();
for (const auto& [entnum, ent] : ents_) for (const auto& [entnum, ent] : ents_)
{ {
@ -80,7 +82,7 @@ void game::view::WorldView::Update(const UpdateInfo& info)
void game::view::WorldView::Draw(const DrawArgs& args) const void game::view::WorldView::Draw(const DrawArgs& args) const
{ {
if (!map_.IsLoaded()) if (!map_->IsLoaded())
{ {
DrawLoadingScreen(args); DrawLoadingScreen(args);
return; return;
@ -88,7 +90,7 @@ void game::view::WorldView::Draw(const DrawArgs& args) const
args.env.clear_color = glm::vec3(0.5f, 0.7f, 1.0f); args.env.clear_color = glm::vec3(0.5f, 0.7f, 1.0f);
map_.Draw(args); map_->Draw(args);
for (const auto& [entnum, ent] : ents_) for (const auto& [entnum, ent] : ents_)
{ {
@ -137,7 +139,7 @@ void game::view::WorldView::DrawLoadingScreen(const DrawArgs& args) const
glm::vec2 size(400.0f, 15.0f); glm::vec2 size(400.0f, 15.0f);
glm::vec2 pos(margin, args.screen_size.y - margin - size.y); glm::vec2 pos(margin, args.screen_size.y - margin - size.y);
int loaded_percent = map_.GetLoadingPercent(); int loaded_percent = map_->GetLoadingPercent();
float loaded = static_cast<float>(loaded_percent) * 0.01f; float loaded = static_cast<float>(loaded_percent) * 0.01f;
args.gui.DrawRect(pos, pos + size, 0x77FFFFFF); args.gui.DrawRect(pos, pos + size, 0x77FFFFFF);
@ -267,7 +269,7 @@ bool game::view::WorldView::ProcessObjDestroyOrRespawnMsg(net::InMessage& msg, b
if (!msg.Read(objnum)) if (!msg.Read(objnum))
return false; return false;
map_.EnableObj(objnum, enable); map_->EnableObj(objnum, enable);
return true; return true;
} }

2
src/gameview/worldview.hpp
View File

@ -48,7 +48,7 @@ private:
private: private:
ClientSession& session_; ClientSession& session_;
MapInstanceView map_; std::unique_ptr<MapInstanceView> map_;
std::map<net::EntNum, std::unique_ptr<EntityView>> ents_; std::map<net::EntNum, std::unique_ptr<EntityView>> ents_;
float time_ = 0.0f; float time_ = 0.0f;