From 336766125f25b94dd9fc19aeea35c8b43acbeea0 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Fri, 29 Jul 2011 21:10:05 +0000 Subject: Renamed various user interface classes, somewhat improved inventory window. --- src/client/mainwindow.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/client/mainwindow.h') diff --git a/src/client/mainwindow.h b/src/client/mainwindow.h index 12ea23f..3497913 100644 --- a/src/client/mainwindow.h +++ b/src/client/mainwindow.h @@ -9,8 +9,9 @@ #include "ui/window.h" -#include "client/playerview.h" +#include "client/gamewindow.h" #include "client/infowidget.h" +#include "client/notifications.h" namespace client { @@ -26,21 +27,26 @@ public: void event_text(const std::string & text); - inline PlayerView *playerview() { - return mainwindow_playerview; + inline GameWindow *gamewindow() { + return mainwindow_gamewindow; } + + inline Notifications *notificationswidget() { + return mainwindow_notificationswidget; + } + protected: virtual void draw(); virtual void resize(); private: - DevInfoWidget *mainwindow_devinfo; - StatsInfoWidget *mainwindow_statsinfo; - KeyInfoWidget *mainwindow_keyinfo; - ClockInfoWidget *mainwindow_clock; - Notifications *mainwindow_notify; - PlayerView *mainwindow_playerview; + DevInfoWidget *mainwindow_devinfowidget; + StatsInfoWidget *mainwindow_statsinfowidget; + KeyInfoWidget *mainwindow_keyinfowidget; + ClockInfoWidget *mainwindow_clockwidget; + Notifications *mainwindow_notificationswidget; + GameWindow *mainwindow_gamewindow; }; -- cgit v1.2.3