projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New Norwegian Translation
[supertux.git]
/
lib
/
app
/
globals.h
diff --git
a/lib/app/globals.h
b/lib/app/globals.h
index
2495017
..
83d57ed
100644
(file)
--- a/
lib/app/globals.h
+++ b/
lib/app/globals.h
@@
-26,14
+26,21
@@
#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
{
@@
-52,13
+59,6
@@
namespace SuperTux
extern JoystickKeymap joystick_keymap;
extern SDL_Surface* screen;
extern JoystickKeymap joystick_keymap;
extern SDL_Surface* screen;
- extern Font* gold_text;
- extern Font* white_text;
- extern Font* blue_text;
- extern Font* gray_text;
- extern Font* white_small_text;
- extern Font* white_big_text;
- extern Font* yellow_nums;
extern MouseCursor * mouse_cursor;
extern MouseCursor * mouse_cursor;
@@
-67,18
+67,19
@@
namespace SuperTux
extern bool use_fullscreen;
extern bool debug_mode;
extern bool show_fps;
extern bool use_fullscreen;
extern bool debug_mode;
extern bool show_fps;
+ extern bool debug_grid;
/** 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;
/** 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;
+ extern bool flip_levels_mode;
/* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
/* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
- extern char* st_dir;
- extern char* st_save_dir;
-
- extern float game_speed;
+ extern std::string st_dir;
+ extern std::string st_save_dir;
+
extern SDL_Joystick * js;
int wait_for_event(SDL_Event& event,unsigned int min_delay = 0, unsigned int max_delay = 0, bool empty_events = false);
extern SDL_Joystick * js;
int wait_for_event(SDL_Event& event,unsigned int min_delay = 0, unsigned int max_delay = 0, bool empty_events = false);