summaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-03-02 13:42:14 +0000
committerJared Adams <jaxad0127@gmail.com>2010-03-02 13:42:14 +0000
commit0c8c8cf7ea63def0d454f30227584a5f3062c013 (patch)
tree9929ddd6c0ecaffef0d75411eeaea2f9fa7fbdfd /src/main.h
parent4ff5c3b854215b1f55e70106a4c53225fc953619 (diff)
downloadmana-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.gz
mana-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.bz2
mana-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.xz
mana-0c8c8cf7ea63def0d454f30227584a5f3062c013.zip
Revert "Merge WindowContainer into Viewport and remove extra members"
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746. Conflicts: src/gui/gui.cpp src/gui/viewport.cpp
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h5
1 files changed, 3 insertions, 2 deletions
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 <i>top</i>
- * 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 <i>top</i> 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