testing misc_model instead of misc_gamemodel for correct rotation, mapinfo fixes

diff --git a/maps/warfare.map b/maps/warfare.map
index 21b2003113435f677046251c4fe1a0d0e5a9e79a..267b0ca9116c48cdb974c76d97f3ddfa2409d5cd 100644 (file)
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -1,8 +1,8 @@
 {
 "classname" "worldspawn"
 "_floodlight" "178 209 255 1024 16"
-"fog" "1 0 0.5 0.8 0.1"
-"_description" "Medium sized map with a central area. Well suited and optimized for duel matches"
+"fog" "1 0 0.5 0.8 0.12"
+"_description" "Medium sized map with a central area. Well suited and optimized for duel matches."
 "message" "Warfare"
 "author" "Maddin, Tymo"
 {
@@ -32362,13 +32362,6 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_gamemodel"
-"origin" "45.117275 203.765335 -15.592969"
-"model" "models/map_warfare/cactus.obj"
-"modelscale" "1.700000"
-"angles" "-6.765636 118.298286 13.803299"
-}
-{
-"classname" "misc_gamemodel"
 "origin" "435.049530 749.831360 122.260620"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.700000"
@@ -32376,27 +32369,6 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_gamemodel"
-"origin" "-715.604431 -540.102966 477.999847"
-"model" "models/map_warfare/cactus.obj"
-"modelscale" "1.700000"
-"angles" "5.093612 -21.180624 1.177875"
-}
-{
-"classname" "misc_gamemodel"
-"origin" "-797.990234 -165.049042 476.308502"
-"model" "models/map_warfare/cactus.obj"
-"modelscale" "1.700000"
-"angles" "-0.589641 14.992217 9.155036"
-}
-{
-"classname" "misc_gamemodel"
-"origin" "-781.094238 13.795942 475.191956"
-"model" "models/map_warfare/cactus.obj"
-"modelscale" "1.500000"
-"angles" "-6.289028 137.856934 1.316799"
-}
-{
-"classname" "misc_gamemodel"
 "origin" "420.221466 -821.656311 472.003845"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.700000"
@@ -32430,3 +32402,35 @@ exx/base-metal05rust
 "classname" "item_shells"
 "origin" "792.000000 632.000000 352.000000"
 }
+{
+"classname" "misc_model"
+"origin" "45.117275 203.765335 -15.592969"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "-6.765636 118.298286 13.803299"
+"spawnflags" "4"
+}
+{
+"classname" "misc_model"
+"origin" "-715.604431 -540.102966 477.999847"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "5.093612 -21.180624 1.177875"
+"spawnflags" "4"
+}
+{
+"classname" "misc_model"
+"origin" "-797.990234 -165.049042 476.308502"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "-0.589641 14.992217 9.155036"
+"spawnflags" "4"
+}
+{
+"classname" "misc_model"
+"origin" "-781.094238 13.795942 475.191956"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.500000"
+"angles" "-6.289028 137.856934 1.316799"
+"spawnflags" "4"
+}

diff --git a/maps/warfare.map.options b/maps/warfare.map.options
index 6c2dedd2bee522b255ed1bf4135f2885d855a556..2eaaeb2d26e0ec244cadb1a859ec1fd603111d85 100644 (file)
--- a/maps/warfare.map.options
+++ b/maps/warfare.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 6e
+Version: 6f

diff --git a/maps/warfare.mapinfo b/maps/warfare.mapinfo
index 5c7f82dd7f7594c920db4cf22369e72c6f4bbcbb..90499a54eec50d7e8474583732319aef9f2f22bd 100644 (file)
--- a/maps/warfare.mapinfo
+++ b/maps/warfare.mapinfo
@@ -1,5 +1,5 @@
 title Warfare
-description Medium sized map with a central area. Well suited and optimized for duel matches
+description Medium sized map with a central area. Well suited and optimized for duel matches.
 author Maddin, Tymo
 cdtrack 15
 has weapons
@@ -10,4 +10,3 @@ gametype ca
 gametype ka
 gametype kh
 gametype ft
-clientsettemp_for_type all r_water 0
\ No newline at end of file