projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix configure scritp
[supertux.git]
/
lib
/
app
/
globals.h
diff --git
a/lib/app/globals.h
b/lib/app/globals.h
index
6de62d6
..
850707d
100644
(file)
--- a/
lib/app/globals.h
+++ b/
lib/app/globals.h
@@
-26,17
+26,18
@@
#include "SDL.h"
#include "SDL.h"
-#include "../video/font.h"
-#include "../gui/menu.h"
-#include "../gui/mousecursor.h"
+#include "video/font.h"
+#include "tinygettext.h"
namespace SuperTux
{
namespace SuperTux
{
+ extern TinyGetText::DictionaryManager dictionary_manager;
+ extern TinyGetText::Dictionary* dictionary;
+
+ class MouseCursor;
+
extern std::string datadir;
extern std::string datadir;
- extern std::string package_symbol_name;
- extern std::string package_name;
- extern std::string package_version;
struct JoystickKeymap
{
struct JoystickKeymap
{
@@
-54,25
+55,16
@@
namespace SuperTux
extern JoystickKeymap joystick_keymap;
extern JoystickKeymap joystick_keymap;
- extern SDL_Surface* screen;
-
extern MouseCursor * mouse_cursor;
extern MouseCursor * mouse_cursor;
- extern bool use_gl;
- extern bool use_joystick;
- extern bool use_fullscreen;
- extern bool debug_mode;
- extern bool show_fps;
+#define SCREEN_WIDTH 800
+#define SCREEN_HEIGHT 600
/** The number of the joystick that will be use in the game */
extern int joystick_num;
/** The number of the joystick that will be use in the game */
extern int joystick_num;
- extern char* level_startup_file;
- extern bool launch_leveleditor_mode;
- extern bool launch_worldmap_mode;
- /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
- extern char* st_dir;
- extern char* st_save_dir;
+ /* SuperTux directory ($HOME/.supertux) */
+ extern std::string user_dir;
extern SDL_Joystick * js;
extern SDL_Joystick * js;