From 11c897f3948c0b4864526e2671874fd662f85688 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 26 Jul 2011 20:35:12 +0000 Subject: renamed client::WorldView to client::MainWindow --- src/client/video.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/client/video.cc') diff --git a/src/client/video.cc b/src/client/video.cc index a610b86..6be4ff6 100644 --- a/src/client/video.cc +++ b/src/client/video.cc @@ -59,6 +59,16 @@ const int height_default = 768; std::string loader_message; bool is_loading = false; +void set_caption() +{ + // set window caption + std::string window_title(core::name()); + window_title += ' '; + window_title.append(core::version()); + + SDL_WM_SetCaption(window_title.c_str(), core::name().c_str()); +} + bool init() { con_print << "^BInitializing video..." << std::endl; @@ -237,16 +247,6 @@ bool init() return true; } -void set_caption() -{ - // set window caption - std::string window_title(core::name()); - window_title += ' '; - window_title.append(core::version()); - - SDL_WM_SetCaption(window_title.c_str(), core::name().c_str()); -} - void resize(int w, int h) { if (fullscreen) @@ -299,7 +299,7 @@ void set_cursor() ui::root()->set_pointer(); - } else if (client()->worldview()->playerview()->map()->hover()) { + } else if (client()->mainwindow()->playerview()->map()->hover()) { ui::root()->set_pointer("pointer"); @@ -411,15 +411,15 @@ void frame(float elapsed) render::draw_target(targets::current()); render::Camera::ortho(); - client()->worldview()->show(); + client()->mainwindow()->show(); } else { draw_loader(); - client()->worldview()->hide(); + client()->mainwindow()->hide(); } } else { - client()->worldview()->hide(); + client()->mainwindow()->hide(); render::Camera::ortho(); } -- cgit v1.2.3