Restore -gv, limit points to template dimensions
authornemo
Thu, 25 Oct 2012 13:55:55 -0400
changeset 7820 c1b491e03362
parent 7819 dfc4b6cbe6ea
child 7821 9353d5eb360e
child 7822 61ff669d610f
Restore -gv, limit points to template dimensions
CMakeLists.txt
hedgewars/uLandTemplates.pas
--- a/CMakeLists.txt	Thu Oct 25 13:30:08 2012 -0400
+++ b/CMakeLists.txt	Thu Oct 25 13:55:55 2012 -0400
@@ -182,9 +182,7 @@
 #get BUILD_TYPE and enable/disable optimisation
 if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
     message(STATUS "Building Debug flavour")
-    # for no obvious reason, -gv was causing broken behaviour
-    #set(pascal_flags "-O-" "-g" "-gl" "-gv" ${pascal_flags})
-    set(pascal_flags "-O-" "-g" "-gl" ${pascal_flags})
+    set(pascal_flags "-O-" "-g" "-gl" "-gv" ${pascal_flags})
     set(haskell_flags "-Wall" "-debug" "-dcore-lint" "-fno-warn-unused-do-bind" ${haskell_flags})
 else()
     message(STATUS "Building Release flavour")
--- a/hedgewars/uLandTemplates.pas	Thu Oct 25 13:30:08 2012 -0400
+++ b/hedgewars/uLandTemplates.pas	Thu Oct 25 13:55:55 2012 -0400
@@ -1758,18 +1758,18 @@
 const Template44Points: array[0..14] of TSDL_Rect =
       (
        (x:    0; y: 100; w:   1; h:  50),
-       (x: 4096; y: 100; w:   1; h:  50),
-       (x: 4096; y: 400; w:   1; h:  50),
+       (x: 4095; y: 100; w:   1; h:  50),
+       (x: 4095; y: 400; w:   1; h:  50),
        (x:    0; y: 360; w:   1; h:  50),
        (x: NTPX; y:   0; w:   1; h:   1),
        (x:    0; y: 750; w:   1; h:  50),
-       (x: 4096; y: 750; w:   1; h:  50),
-       (x: 4096; y:1100; w:   1; h:  50),
+       (x: 4095; y: 750; w:   1; h:  50),
+       (x: 4095; y:1100; w:   1; h:  50),
        (x:    0; y:1100; w:   1; h:  50),
        (x: NTPX; y:   0; w:   1; h:   1),
        (x:    0; y:1300; w:   1; h: 250),
-       (x: 4096; y:1300; w:   1; h: 250),
-       (x: 4096; y:1800; w:   1; h: 200),
+       (x: 4095; y:1300; w:   1; h: 250),
+       (x: 4095; y:1800; w:   1; h: 200),
        (x:    0; y:1800; w:   1; h: 200),
        (x: NTPX; y:   0; w:   1; h:   1)
       );
@@ -1777,9 +1777,9 @@
       (
        (X:   1; Y:  90; w:   0; h:   0),
        (X:   1; Y: 500; w:   0; h:   0),
-       (X:4096; Y: 500; w:   0; h:   0),
+       (X:4095; Y: 500; w:   0; h:   0),
        (X:   1; Y:1200; w:   0; h:   0),
-       (X:4096; Y:1200; w:   0; h:   0),
+       (X:4095; Y:1200; w:   0; h:   0),
        (X:   1; Y:2010; w:   0; h:   0)
       );