merge. forgot again.
authornemo
Sun, 25 Jul 2010 10:16:34 -0400
changeset 3669 19be65b12c43
parent 3666 f9c8fc74ac93 (diff)
parent 3668 3f7a95234d8a (current diff)
child 3671 a94d1dc4a8d9
merge. forgot again.
project_files/HedgewarsMobile/Resources/Overlay/lateralButton.png
project_files/HedgewarsMobile/Resources/Overlay/menuCorner.png
project_files/HedgewarsMobile/libfreetype_arm.a
project_files/HedgewarsMobile/libfreetype_x86.a
project_files/HedgewarsMobile/libvorbis_arm.a
--- a/hedgewars/uLandTexture.pas	Sun Jul 25 01:59:41 2010 +0200
+++ b/hedgewars/uLandTexture.pas	Sun Jul 25 10:16:34 2010 -0400
@@ -101,7 +101,7 @@
                     begin
                     shouldUpdate:= false;
                     glBindTexture(GL_TEXTURE_2D, tex^.id);
-                    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, TEXSIZE, TEXSIZE, GL_RGBA, GL_UNSIGNED_BYTE, Pixels(x, y));
+                    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, TEXSIZE, TEXSIZE, 0, GL_RGBA, GL_UNSIGNED_BYTE, Pixels(x,y)); 
                     end
 end;
 
Binary file share/hedgewars/Data/Themes/Brick/Splash.png has changed
Binary file share/hedgewars/Data/Themes/Stage/Splash.png has changed