From: PlasmaSheep <plasmasheep@gmail.com>
Date: Sat, 4 Sep 2010 03:20:20 +0000 (-0700)
Subject: Added ctf logo
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0bd02a297d6474a90e47f654a422d94d2aea493c;p=xonotic%2Fxonotic-maps.pk3dir.git

Added ctf logo
---

diff --git a/maps/lsp.map b/maps/lsp.map
index 33cfaf7d..ae39816c 100644
--- a/maps/lsp.map
+++ b/maps/lsp.map
@@ -35625,21 +35625,12 @@ trak5x/floor-floor2c
 "speed" "50"
 // brush 0
 {
-( -48 4336 560 ) ( 112 4336 560 ) ( 112 4352 560 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( 112 4352 688 ) ( 112 4336 688 ) ( -48 4336 688 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
+( -48 4336 560 ) ( 112 4336 560 ) ( 112 4352 560 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 12 0
+( 112 4352 688 ) ( 112 4336 688 ) ( -48 4336 688 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 12 0
 ( 112 4352 688 ) ( -48 4352 688 ) ( -48 4352 384 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( -32 4352 792 ) ( -32 4336 792 ) ( -32 4336 488 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( -48 4350 792 ) ( 112 4350 792 ) ( 112 4350 488 ) ctf_unified/monologo_flash_blue 192 96 0 -0.5 0.5 0 1 0
-( 96 4336 792 ) ( 96 4352 792 ) ( 96 4352 488 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-}
-// brush 1
-{
-( 24 4336 616 ) ( 40 4336 616 ) ( 40 4344 616 ) common/origin 0 0 -180 0.25 0.25 0 14 0
-( 40 4352 632 ) ( 40 4344 632 ) ( 24 4344 632 ) common/origin 0 0 -180 0.25 0.25 0 14 0
-( 40 4360 696 ) ( 24 4360 696 ) ( 24 4360 568 ) common/origin 0 0 -180 0.5 -0.5 0 14 0
-( 24 4352 696 ) ( 24 4344 696 ) ( 24 4344 568 ) common/origin 0 0 -180 0.5 -0.5 0 14 0
-( 24 4344 696 ) ( 40 4344 696 ) ( 40 4344 568 ) common/origin 0 0 -180 0.5 -0.5 0 14 0
-( 40 4344 696 ) ( 40 4352 696 ) ( 40 4352 568 ) common/origin 0 0 -180 0.5 -0.5 0 14 0
+( -32 4352 792 ) ( -32 4336 792 ) ( -32 4336 488 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 12 0
+( -48 4350 792 ) ( 112 4350 792 ) ( 112 4350 488 ) lsp/bluelogo 256 384 0 0.125 0.125 0 1 0
+( 96 4336 792 ) ( 96 4352 792 ) ( 96 4352 488 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 12 0
 }
 }
 // entity 312
diff --git a/scripts/lsp.shader b/scripts/lsp.shader
index 74348d67..7db36000 100644
--- a/scripts/lsp.shader
+++ b/scripts/lsp.shader
@@ -1,21 +1,4 @@
-textures/lsp/distort_glass
-{
-	// Thanks to Micrea Kitsune/Taoki for this one
-	qer_editorimage textures/lsp/distort_glass.tga
-	surfaceparm trans
-	q3map_bounceScale 0.75
-	{
-		map textures/lsp/distort_glass.tga
-		blendfunc blend
-	}
-	{
-		map $lightmap
-		rgbGen identity
-		tcGen lightmap
-		blendfunc filter
-	}
-	dp_water 0.1 0.8  3 3  1 1 1  1 1 1  0.125
-}
+
 
 textures/lsp/ctf-redlogo
 {
@@ -25,7 +8,7 @@ textures/lsp/ctf-redlogo
 
 
 	{
-		textures/lsp/ctf/redlogo.tga
+		map textures/lsp/ctf/redlogo.tga
 		
 
 	}