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
/
video
/
surface.h
diff --git
a/lib/video/surface.h
b/lib/video/surface.h
index
1491e84
..
0691195
100644
(file)
--- a/
lib/video/surface.h
+++ b/
lib/video/surface.h
@@
-29,8
+29,8
@@
#include "SDL.h"
#include "SDL.h"
-#include "
../
math/vector.h"
-#include "
../
video/screen.h"
+#include "math/vector.h"
+#include "video/screen.h"
namespace SuperTux
{
namespace SuperTux
{
@@
-155,7
+155,7
@@
namespace SuperTux
public:
SurfaceSDL(SDL_Surface* surf, bool use_alpha);
SurfaceSDL(const std::string& file, bool use_alpha);
public:
SurfaceSDL(SDL_Surface* surf, bool use_alpha);
SurfaceSDL(const std::string& file, bool use_alpha);
- SurfaceSDL(const std::string& file, int x, int y, int w
, int h
, bool use_alpha);
+ SurfaceSDL(const std::string& file, int x, int y, int w
_, int h_
, bool use_alpha);
SurfaceSDL(Color top_gradient, Color bottom_gradient, int w, int h);
virtual ~SurfaceSDL();
SurfaceSDL(Color top_gradient, Color bottom_gradient, int w, int h);
virtual ~SurfaceSDL();