Sort of fix panels in Courtfun

diff --git a/maps/courtfun.map b/maps/courtfun.map
index 8778d1153ce952ac908e98ed7fb4bbb6246cc2ca..9b55547e32dc084e4e7af8984ddc191db8b9202c 100644 (file)
--- a/maps/courtfun.map
+++ b/maps/courtfun.map
@@ -2,7 +2,6 @@
 "classname" "worldspawn"
 "author" "SavageX, Calinou, Debugger"
 "message" "Courtfun"
-"license" "GPL"
 "spawnflags" "1"
 "_floodlight" "240 240 255 1024 12"
 "fog" "0.075 .7 .4. .3 1 1000 2000"
@@ -27145,6 +27144,30 @@ exx/base-metal01
 ( -4400 6384 576 ) ( -4400 6384 568 ) ( -4432 6384 576 ) exx/base-metal01 64 48 180 0.5 0.5 134217728 0 0
 ( -4400 6392 576 ) ( -4400 6416 576 ) ( -4400 6392 568 ) exx/base-metal01 0 48 0 0.5 -0.5 134217728 0 0
 }
+{
+patchDef2
+{
+map_courtfun/screenanim_xon
+( 3 3 0 0 0 )
+(
+( ( -746.6686401367 2458.4338378906 532 0 1 ) ( -730.7482910156 2440.474609375 580 0 0.5 ) ( -722.7879638672 2431.4948730469 636 0 0 ) )
+( ( -675.7520751953 2521.298828125 532 0.5 1 ) ( -659.8317260742 2503.3395996094 580 0.5 0.5 ) ( -651.8713378906 2494.3598632813 636 0.5 0 ) )
+( ( -614.9663085938 2575.1833496094 532 1 1 ) ( -599.0457763672 2557.2241210938 580 1 0.5 ) ( -591.0856323242 2548.244140625 636 1 0 ) )
+)
+}
+}
+{
+patchDef2
+{
+map_courtfun/screenanim_xon
+( 3 3 0 0 0 )
+(
+( ( -3350.1381835938 1510.8624267578 532 0 1 ) ( -3366.369140625 1528.5413818359 580 0 0.5 ) ( -3374.4851074219 1537.380859375 636 0 0 ) )
+( ( -3419.9465332031 1446.7691650391 532 0.5 1 ) ( -3436.1782226563 1464.4478759766 580 0.5 0.5 ) ( -3444.2939453125 1473.2874755859 636 0.5 0 ) )
+( ( -3479.7829589844 1391.83203125 532 1 1 ) ( -3496.0141601563 1409.5107421875 580 1 0.5 ) ( -3504.1296386719 1418.3498535156 636 1 0 ) )
+)
+}
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -34314,90 +34337,6 @@ exx/base-metal01
 }
 }
 {
-"classname" "func_clientillusionary"
-"bgmscript" "a"
-"bgmscriptattack" "0"
-"bgmscriptdecay" "0"
-"bgmscriptsustain" "1"
-"bgmscriptrelease" "0"
-"lip" "1"
-{
-patchDef2
-{
-map_courtfun/screen_obey
-( 3 3 0 0 0 )
-(
-( ( -746.3752441406 2454.1088867188 532 0 1 ) ( -729.8171386719 2436.7355957031 580 0 0.5 ) ( -721.5376586914 2428.0490722656 636 0 0 ) )
-( ( -677.7736206055 2519.4924316406 532 0.5 1 ) ( -661.2155151367 2502.1193847656 580 0.5 0.5 ) ( -652.936340332 2493.4328613281 636 0.5 0 ) )
-( ( -618.9724121094 2575.5358886719 532 1 1 ) ( -602.4140625 2558.1625976563 580 1 0.5 ) ( -594.1351318359 2549.4760742188 636 1 0 ) )
-)
-}
-}
-}
-{
-"classname" "func_clientillusionary"
-"bgmscript" "b"
-"bgmscriptattack" "0"
-"bgmscriptdecay" "0"
-"bgmscriptsustain" "1"
-"bgmscriptrelease" "0"
-"lip" "1"
-{
-patchDef2
-{
-map_courtfun/screen_xon
-( 3 3 0 0 0 )
-(
-( ( -746.3752441406 2454.1088867188 532 0 1 ) ( -729.8171386719 2436.7355957031 580 0 0.5 ) ( -721.5376586914 2428.0490722656 636 0 0 ) )
-( ( -677.7736206055 2519.4924316406 532 0.5 1 ) ( -661.2155151367 2502.1193847656 580 0.5 0.5 ) ( -652.936340332 2493.4328613281 636 0.5 0 ) )
-( ( -618.9724121094 2575.5358886719 532 1 1 ) ( -602.4140625 2558.1625976563 580 1 0.5 ) ( -594.1351318359 2549.4760742188 636 1 0 ) )
-)
-}
-}
-}
-{
-"classname" "func_clientillusionary"
-"bgmscriptattack" "0"
-"bgmscriptdecay" "0"
-"bgmscriptrelease" "0"
-"bgmscriptsustain" "1"
-"lip" "1"
-"bgmscript" "b"
-{
-patchDef2
-{
-map_courtfun/screen_xon
-( 3 3 0 0 0 )
-(
-( ( -3350.6247558594 1513.8911132813 532 0 1 ) ( -3367.1828613281 1531.2644042969 580 0 0.5 ) ( -3375.4624023438 1539.9509277344 636 0 0 ) )
-( ( -3419.2263183594 1448.5075683594 532 0.5 1 ) ( -3435.7844238281 1465.8806152344 580 0.5 0.5 ) ( -3444.0637207031 1474.5671386719 636 0.5 0 ) )
-( ( -3478.0275878906 1392.4641113281 532 1 1 ) ( -3494.5859375 1409.8374023438 580 1 0.5 ) ( -3502.8647460938 1418.5239257813 636 1 0 ) )
-)
-}
-}
-}
-{
-"classname" "func_clientillusionary"
-"bgmscriptattack" "0"
-"bgmscriptdecay" "0"
-"bgmscriptrelease" "0"
-"bgmscriptsustain" "1"
-"lip" "1"
-"bgmscript" "a"
-{
-patchDef2
-{
-map_courtfun/screen_obey
-( 3 3 0 0 0 )
-(
-( ( -3350.6247558594 1513.8911132813 532 0 1 ) ( -3367.1828613281 1531.2644042969 580 0 0.5 ) ( -3375.4624023438 1539.9509277344 636 0 0 ) )
-( ( -3419.2263183594 1448.5075683594 532 0.5 1 ) ( -3435.7844238281 1465.8806152344 580 0.5 0.5 ) ( -3444.0637207031 1474.5671386719 636 0.5 0 ) )
-( ( -3478.0275878906 1392.4641113281 532 1 1 ) ( -3494.5859375 1409.8374023438 580 1 0.5 ) ( -3502.8647460938 1418.5239257813 636 1 0 ) )
-)
-}
-}
-}
-{
 "classname" "func_pointparticles"
 "impulse" "2"
 "count" "1"

diff --git a/maps/courtfun.map.options b/maps/courtfun.map.options
index 8a7d9f12944a3076ade9a20f64991c38e2f1528f..3339f5f5600d0b02070b6eded9853a8f93ba1def 100644 (file)
--- a/maps/courtfun.map.options
+++ b/maps/courtfun.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 12b
\ No newline at end of file
+Version: 12c
\ No newline at end of file

diff --git a/scripts/map_courtfun.shader b/scripts/map_courtfun.shader
index a3371c09d7d25b27ea33a566f6d45a9897717ce1..58a3dfa8eab436a7db0c4b7da7611bda2d40890f 100644 (file)
--- a/scripts/map_courtfun.shader
+++ b/scripts/map_courtfun.shader
@@ -37,7 +37,7 @@ textures/map_courtfun/screen_obey
     }
 }
 
-textures/map_courtfun/screen_xon
+textures/map_courtfun/screenanim_xon
 {
     qer_editorimage textures/map_courtfun/screen_xon.tga
     surfaceparm trans
@@ -45,7 +45,7 @@ textures/map_courtfun/screen_xon
     surfaceparm nolightmap
     cull none
     {
-        map textures/map_courtfun/screen_xon.tga
+        animMap 1 textures/map_courtfun/screen_obey.tga textures/map_courtfun/screen_xon.tga textures/map_courtfun/screen_black.tga textures/map_courtfun/screen_black.tga textures/map_courtfun/screen_black.tga
         blendFunc filter
     }
 }