From e9a413d772c608f4ceba2953fabea643a02e0266 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 28 Feb 2005 22:01:01 +0000
Subject: Mostly fixing some newlines.

---
 src/graphic/graphic.cpp | 9 +++------
 src/graphic/graphic.h   | 4 ----
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index aa27e8ba..98b1319c 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -24,18 +24,14 @@
 #include "graphic.h"
 #include "../gui/gui.h"
 #include "../gui/textfield.h"
-#include "../gui/status.h"
 #include "../gui/minimap.h"
-#include "../gui/equipment.h"
-#include "../gui/newskill.h"
 #include "../gui/chargedialog.h"
 #include "../gui/itemcontainer.h"
 #include "../main.h"
 #include "../being.h"
 #include "../floor_item.h"
-#ifdef USE_OPENGL
+
 #include <SDL_opengl.h>
-#endif
 
 SDL_Surface *screen;
 
@@ -625,7 +621,8 @@ void Engine::draw()
 
     std::stringstream debugStream;
     debugStream << "[" << fps << " fps] " <<
-        (mouseX / 32 + camera_x) << ", " << (mouseY / 32 + camera_y) << " " << player_node->weapon;
+        (mouseX / 32 + camera_x) << ", " << (mouseY / 32 + camera_y) << " "
+        << player_node->weapon;
     debugInfo->setCaption(debugStream.str());
     debugInfo->adjustSize();
 }
diff --git a/src/graphic/graphic.h b/src/graphic/graphic.h
index f364105c..0b653875 100644
--- a/src/graphic/graphic.h
+++ b/src/graphic/graphic.h
@@ -47,11 +47,7 @@ class Graphics;
 #include "spriteset.h"
 #include <SDL.h>
 #include <guichan/sdl.hpp>
-#ifdef USE_OPENGL
 #include <guichan/opengl.hpp>
-#endif
-
-#define TILE_SIZE 32
 
 extern SDL_Surface *screen;
 extern char speech[255];
-- 
cgit v1.2.3-70-g09d2