From 0c8c8cf7ea63def0d454f30227584a5f3062c013 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 2 Mar 2010 13:42:14 +0000 Subject: Revert "Merge WindowContainer into Viewport and remove extra members" This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746. Conflicts: src/gui/gui.cpp src/gui/viewport.cpp --- src/main.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main.h') diff --git a/src/main.h b/src/main.h index ff60508d..3f30ef14 100644 --- a/src/main.h +++ b/src/main.h @@ -34,8 +34,9 @@ * \section General General information * * During the game, the current Map is displayed by the main Viewport, which - * also contains all game \link Window Windows\endlink. It is the top - * widget for Guichan. + * is the bottom-most widget in the WindowContainer. Aside the viewport, the + * window container keeps track of all the \link Window Windows\endlink + * displayed during the game. It is the top widget for Guichan. * * A Map is composed of several layers of \link Image Images\endlink (tiles), * a layer with collision information and \link Sprite Sprites\endlink. The -- cgit v1.2.3-70-g09d2