projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
520c4ec
)
- fixed argument-shadowing issue 'this->w vs w'
author
Ingo Ruhnke
<grumbel@gmx.de>
Sun, 13 Jun 2004 22:42:13 +0000
(22:42 +0000)
committer
Ingo Ruhnke
<grumbel@gmx.de>
Sun, 13 Jun 2004 22:42:13 +0000
(22:42 +0000)
SVN-Revision: 1484
src/screen/texture.cpp
patch
|
blob
|
history
diff --git
a/src/screen/texture.cpp
b/src/screen/texture.cpp
index
3704234
..
addc0e0
100644
(file)
--- a/
src/screen/texture.cpp
+++ b/
src/screen/texture.cpp
@@
-449,9
+449,10
@@
SurfaceOpenGL::SurfaceOpenGL(const std::string& file, int use_alpha)
h = sdl_surface->h;
}
-SurfaceOpenGL::SurfaceOpenGL(const std::string& file
, int x, int y, int w, int h, int use_alpha
)
+SurfaceOpenGL::SurfaceOpenGL(const std::string& file
_, int x_, int y_, int w_, int h_, int use_alpha_
)
{
- sdl_surface = sdl_surface_part_from_file(file,x,y,w,h,use_alpha);
+ sdl_surface = sdl_surface_part_from_file(file_,x_,y_,w_,h_,use_alpha_);
+
create_gl(sdl_surface, &gl_texture);
w = sdl_surface->w;