Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix pas2c build
authorsheepluva
Tue, 17 Jun 2014 15:39:29 +0200
changeset 10319 240775460dc5
parent 10318 c2e81eea375f
child 10320 0f9ad60f738c
fix pas2c build
hedgewars/pas2cSystem.pas file | annotate | diff | comparison | revisions
hedgewars/uWorld.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/pas2cSystem.pas	Tue Jun 17 15:18:07 2014 +0200
+++ b/hedgewars/pas2cSystem.pas	Tue Jun 17 15:39:29 2014 +0200
@@ -106,7 +106,7 @@
     GL_RENDERER, GL_RGBA, GL_RGBA8, GL_SRC_ALPHA, GL_TEXTURE_2D,
     GL_TEXTURE_COORD_ARRAY, GL_TEXTURE_MAG_FILTER,
     GL_TEXTURE_MIN_FILTER, GL_TEXTURE_PRIORITY, GL_TEXTURE_WRAP_S,
-    GL_TEXTURE_WRAP_T, GL_TRIANGLE_FAN, GL_TRUE, GL_VENDOR,
+    GL_TEXTURE_WRAP_T, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRUE, GL_VENDOR,
     GL_VERSION, GL_VERTEX_ARRAY, GLenum,  GL_FRAMEBUFFER_EXT,
     GL_RENDERBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
     GL_COLOR_ATTACHMENT0_EXT, GL_FLOAT, GL_UNSIGNED_BYTE, GL_COMPILE_STATUS,
--- a/hedgewars/uWorld.pas	Tue Jun 17 15:18:07 2014 +0200
+++ b/hedgewars/uWorld.pas	Tue Jun 17 15:39:29 2014 +0200
@@ -1485,7 +1485,7 @@
 ScreenBottom:= (WorldDy - trunc(cScreenHeight/cScaleFactor) - (cScreenHeight div 2) + cWaterLine);
 
 // note: offsetY is negative!
-offsetY:= 5 * max(-145,min(0, CWaterLine + WorldDy - ViewBottomY)); //10 * Min(0, -145 - ScreenBottom);
+offsetY:= 10 *  Min(0, -145 - ScreenBottom); // TODO limit this in the other direction too
 
 if (cReducedQuality and rqNoBackground) = 0 then
     begin
hedgewars