diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-02-28 22:01:01 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-02-28 22:01:01 +0000 |
| commit | e9a413d772c608f4ceba2953fabea643a02e0266 (patch) | |
| tree | b214934828ffd2b6d28979df90624e4b179f15f6 /src/graphic | |
| parent | 14ee29a810be193a2c1f9280573074c50338117f (diff) | |
| download | mana-e9a413d772c608f4ceba2953fabea643a02e0266.tar.gz mana-e9a413d772c608f4ceba2953fabea643a02e0266.tar.bz2 mana-e9a413d772c608f4ceba2953fabea643a02e0266.tar.xz mana-e9a413d772c608f4ceba2953fabea643a02e0266.zip | |
Mostly fixing some newlines.
Diffstat (limited to 'src/graphic')
| -rw-r--r-- | src/graphic/graphic.cpp | 9 | ||||
| -rw-r--r-- | src/graphic/graphic.h | 4 |
2 files changed, 3 insertions, 10 deletions
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]; |