From c99a440e6fb1edf35e280f4df8ba22600e490535 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 26 Jan 2009 20:19:10 +0000 Subject: removed View class --- src/client/client.cc | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'src/client/client.cc') diff --git a/src/client/client.cc b/src/client/client.cc index 8aba931..4533f84 100644 --- a/src/client/client.cc +++ b/src/client/client.cc @@ -15,7 +15,6 @@ #include "client/client.h" #include "client/video.h" #include "client/input.h" -#include "client/view.h" #include "core/core.h" #include "core/loader.h" #include "core/zone.h" @@ -61,7 +60,7 @@ void Client::quit(int status) void Client::init(int count, char **arguments) { - client_view = 0; + client_worldview = 0; con_print << "^BInitializing client..." << std::endl; // initialize core @@ -92,7 +91,7 @@ void Client::init(int count, char **arguments) // initialize user interface ui::init(); - client_view = new View(ui::root()); + client_worldview = new WorldView(ui::root()); // Initialize the video subsystem if (!video::init()) { @@ -257,8 +256,7 @@ void Client::notify_connect() video::set_loader_message(); video::frame_loader(); - view()->notify()->clear(); - view()->chat()->clear(); + worldview()->clear(); ui::root()->hide_menu(); video::set_caption(); @@ -270,8 +268,7 @@ void Client::notify_disconnect() render::reset(); input::reset(); - view()->notify()->clear(); - view()->chat()->clear(); + worldview()->clear(); video::set_caption(); } @@ -334,9 +331,8 @@ void Client::notify_message(const core::Message::Channel channel, const std::str break; } - if (view()) { - view()->chat()->event_text(message); - view()->notify()->event_text(message); + if (worldview()) { + worldview()->event_text(message); } con_print << message << std::endl; @@ -368,24 +364,24 @@ void Client::func_r_restart(std::string const &args) void Client::func_ui_chat(std::string const &args) { - if (core::application()->connected()) { - client()->view()->chat()->set_small_view(false); - client()->view()->chat()->toggle(); + if (client()->connected() && client()->worldview()->playerview()->visible()) { + client()->worldview()->playerview()->chat()->set_small_view(false); + client()->worldview()->playerview()->chat()->toggle(); } } void Client::func_ui_chatsmall(std::string const &args) { - if (core::application()->connected()) { - client()->view()->chat()->set_small_view(true); - client()->view()->chat()->toggle(); + if (client()->connected() && client()->worldview()->playerview()->visible()) { + client()->worldview()->playerview()->chat()->set_small_view(true); + client()->worldview()->playerview()->chat()->toggle(); } } void Client::func_ui_map(std::string const &args) { - if (core::application()->connected()) { - client()->view()->map()->toggle(); + if (client()->connected() && client()->worldview()->playerview()->visible()) { + client()->worldview()->playerview()->map()->toggle(); } } -- cgit v1.2.3