fix linefeeds. How does tZork always manage to get them in... they are blocked

diff --git a/maps/topoftheworld.map.options b/maps/topoftheworld.map.options
index 61a1baa5feb8b41e70f7ac69dac263a73334e75a..e508ebdf499f881e61366f03eda1bbf6d5f1ef49 100644 (file)
--- a/maps/topoftheworld.map.options
+++ b/maps/topoftheworld.map.options
@@ -1,6 +1,6 @@
--bsp + -samplesize 32 -minsamplesize 16 -np 20\r
--light + -fast -gamma 1.5 -compensate 2 -samples 3\r
--vis +\r
--minimap +\r
--nosRGB\r
-Version: 1\r
+-bsp + -samplesize 32 -minsamplesize 16 -np 20
+-light + -fast -gamma 1.5 -compensate 2 -samples 3
+-vis +
+-minimap +
+-nosRGB
+Version: 1

diff --git a/maps/topoftheworld.mapinfo b/maps/topoftheworld.mapinfo
index 501cb4d96270ac12abda0765e961de225e4bf8ea..64907e58a0735f11f1f64380f2849013e0f344b7 100644 (file)
--- a/maps/topoftheworld.mapinfo
+++ b/maps/topoftheworld.mapinfo
@@ -1,13 +1,13 @@
-title Top of the world\r
-description Large scale vehicle ctf map\r
-author Jakob "tZork" Markström Gröhn\r
-cdtrack 10\r
-has weapons\r
-has turrets\r
-has weapons\r
-gametype ctf caplimit=5 timelimit=60\r
-settemp_for_type all g_use_ammunition 0\r
-settemp_for_type all g_turrets_unit_plasma_dual_respawntime 120\r
-settemp_for_type all g_turrets_unit_mlrs_std_respawntime 180\r
-settemp_for_type all g_turrets_unit_flac_std_respawntime 240\r
-settemp_for_type all g_turrets_unit_plasma_dual_shot_speed 5000\r
+title Top of the world
+description Large scale vehicle ctf map
+author Jakob "tZork" Markström Gröhn
+cdtrack 10
+has weapons
+has turrets
+has weapons
+gametype ctf caplimit=5 timelimit=60
+settemp_for_type all g_use_ammunition 0
+settemp_for_type all g_turrets_unit_plasma_dual_respawntime 120
+settemp_for_type all g_turrets_unit_mlrs_std_respawntime 180
+settemp_for_type all g_turrets_unit_flac_std_respawntime 240
+settemp_for_type all g_turrets_unit_plasma_dual_shot_speed 5000

diff --git a/scripts/map_topoftheworld.shader b/scripts/map_topoftheworld.shader
index 571ae4def1c5d647c4928ffb9f25e851f8b31aba..8b776763ebbe4f36f5fffb1d62618537ad2da32f 100644 (file)
--- a/scripts/map_topoftheworld.shader
+++ b/scripts/map_topoftheworld.shader
@@ -1,17 +1,17 @@
-textures/map_topoftheworld/hexglass\r
-{\r
-       q3map_bouncescale 3\r
-       dpreflectcube cubemaps/default/sky\r
-       dpnoshadow\r
-       surfaceparm trans\r
-       {\r
-               map textures/map_topoftheworld/hexglass.tga\r
-               blendfunc blend\r
-               rgbgen lightingDiffuse\r
-       }\r
-       {\r
-        map $lightmap\r
-        blendfunc GL_DST_COLOR GL_ZERO\r
-        rgbGen identity\r
-    }\r
+textures/map_topoftheworld/hexglass
+{
+       q3map_bouncescale 3
+       dpreflectcube cubemaps/default/sky
+       dpnoshadow
+       surfaceparm trans
+       {
+               map textures/map_topoftheworld/hexglass.tga
+               blendfunc blend
+               rgbgen lightingDiffuse
+       }
+       {
+        map $lightmap
+        blendfunc GL_DST_COLOR GL_ZERO
+        rgbGen identity
+    }
 }
\ No newline at end of file