projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let Tux bounce off badguys when he's invincible. This let's us bounce off guys like...
[supertux.git]
/
src
/
resources.cpp
diff --git
a/src/resources.cpp
b/src/resources.cpp
index
fdb043f
..
940b0a0
100644
(file)
--- a/
src/resources.cpp
+++ b/
src/resources.cpp
@@
-1,7
+1,8
@@
// $Id$
//
// $Id$
//
-// SuperTux
- A Jump'n Run
+// SuperTux
// Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
// Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-27,18
+28,15
@@
#include "object/gameobjs.hpp"
#include "object/player.hpp"
#include "object/gameobjs.hpp"
#include "object/player.hpp"
-SpriteManager* sprite_manager = 0;
-TileManager* tile_manager = 0;
+MouseCursor* mouse_cursor = NULL;
-MouseCursor* mouse_cursor = 0;
+Font* gold_text = NULL;
+Font* blue_text = NULL;
+Font* gray_text = NULL;
+Font* white_text = NULL;
+Font* white_small_text = NULL;
+Font* white_big_text = NULL;
-Font* gold_text;
-Font* blue_text;
-Font* gray_text;
-Font* white_text;
-Font* white_small_text;
-Font* white_big_text;
-
/* Load graphics/sounds shared between all levels: */
void load_shared()
{
/* Load graphics/sounds shared between all levels: */
void load_shared()
{
@@
-131,9
+129,9
@@
void unload_shared()
}
delete sprite_manager;
}
delete sprite_manager;
- sprite_manager =
0
;
+ sprite_manager =
NULL
;
delete tile_manager;
delete tile_manager;
- tile_manager =
0
;
+ tile_manager =
NULL
;
/* Free mouse-cursor */
delete mouse_cursor;
/* Free mouse-cursor */
delete mouse_cursor;