Updated layout and contents of FAQ a bit, fixed debug path and mouse rendering

in OpenGL mode, and some general cleanups.

5 files changed, 1 insertions, 24 deletions

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 24fa9c86..ba18a93d 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -452,10 +452,8 @@ void charSelect()
 
         gui->logic();
 
-        guiGraphics->_beginDraw();
         login_wallpaper->draw(screen, 0, 0);
         gui->draw();
-        guiGraphics->_endDraw();
         guiGraphics->updateScreen();
     }
 
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 6cc45f3d..035f18fd 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -140,10 +140,8 @@ void char_server() {
 
         gui->logic();
 
-        guiGraphics->_beginDraw();
         login_wallpaper->draw(screen, 0, 0);
         gui->draw();
-        guiGraphics->_endDraw();
         guiGraphics->updateScreen();
     }
 
@@ -205,7 +203,7 @@ void server_char_server(int serverIndex) {
         }
         state = CHAR_SELECT;
 
-        log("CharServer: Player: %s (Packet ID: %x, Length: %d",
+        log("CharServer: Player: %s (Packet ID: %x, Length: %d)",
                 char_info->name, RFIFOW(0), RFIFOW(2));
 
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 6cc05910..cf4c5b36 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -156,24 +156,12 @@ void Gui::logic()
 
 void Gui::draw()
 {
-    //guiGraphics->_beginDraw();
-
     guiGraphics->pushClipArea(guiTop->getDimension());
     guiTop->draw(guiGraphics);
     guiGraphics->popClipArea();
-
-    //guiGraphics->_endDraw();
 }
 
 void Gui::focusNone()
 {
     focusHandler->focusNone();
 }
-
-void init_gui(Graphics *graphics) {
-    gui = new Gui(graphics);
-}
-
-void gui_exit() {
-    delete gui;
-}
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 597cdb5c..6b678396 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -91,9 +91,4 @@ extern WindowContainer *guiTop;               // The top container
 extern Graphics *guiGraphics;                 // Graphics driver
 extern gcn::SDLInput *guiInput;               // GUI input
 
-/** Initialize gui system */
-void init_gui(Graphics *graphics);
-
-void gui_exit();
-
 #endif
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 5621f5b2..e5861a9b 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -154,10 +154,8 @@ void login() {
 
         gui->logic();
 
-        guiGraphics->_beginDraw();
         login_wallpaper->draw(screen, 0, 0);
         gui->draw();
-        guiGraphics->_endDraw();
         guiGraphics->updateScreen();
     }