From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Tue, 8 Jun 2010 07:08:25 +0000 (+0300)
Subject: make jumppad/launchpad use trak5x textures, fix the shaders
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=098da56f8ead58029c475859f9d26d11ea6afe59;p=xonotic%2Fxonotic-maps.pk3dir.git

make jumppad/launchpad use trak5x textures, fix the shaders
---

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
index d4b65404..e5692977 100644
--- a/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
@@ -1,6 +1,6 @@
 flame,textures/xonotic_jumppad01/jumpglow_red
 energy,textures/xonotic_jumppad01/energy_red_anim
-1,textures/trak5/grate1a.tga
-2,textures/trak5/wall1a.tga
-3,textures/trak5/pipez1a.tga
-4,textures/trak5/ceil1a.tga
\ No newline at end of file
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a
diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
index af40c324..b3cf0955 100644
--- a/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
@@ -1,6 +1,6 @@
 flame,textures/xonotic_jumppad01/jumpglow_blue
 energy,textures/xonotic_jumppad01/energy_blue_anim
-1,textures/trak5/grate1a.tga
-2,textures/trak5/wall1a.tga
-3,textures/trak5/pipez1a.tga
-4,textures/trak5/ceil1a.tga
\ No newline at end of file
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a
diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
index d4b65404..e5692977 100644
--- a/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
@@ -1,6 +1,6 @@
 flame,textures/xonotic_jumppad01/jumpglow_red
 energy,textures/xonotic_jumppad01/energy_red_anim
-1,textures/trak5/grate1a.tga
-2,textures/trak5/wall1a.tga
-3,textures/trak5/pipez1a.tga
-4,textures/trak5/ceil1a.tga
\ No newline at end of file
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a
diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
index af40c324..b3cf0955 100644
--- a/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
@@ -1,6 +1,6 @@
 flame,textures/xonotic_jumppad01/jumpglow_blue
 energy,textures/xonotic_jumppad01/energy_blue_anim
-1,textures/trak5/grate1a.tga
-2,textures/trak5/wall1a.tga
-3,textures/trak5/pipez1a.tga
-4,textures/trak5/ceil1a.tga
\ No newline at end of file
+1,textures/trak5x/panel-grate1a
+2,textures/trak5x/wall-wall1a
+3,textures/trak5x/base-pipe1a
+4,textures/trak5x/panel-ceil1a
diff --git a/scripts/xonotic_jumppad01.shader b/scripts/xonotic_jumppad01.shader
index 62e933f4..d0c16452 100644
--- a/scripts/xonotic_jumppad01.shader
+++ b/scripts/xonotic_jumppad01.shader
@@ -1,9 +1,9 @@
 textures/xonotic_jumppad01/jumpglow_orange
 {
-	qer_editorimage models/mapobjects/xonotic_jumppad01/jumpglow_o.tga
+	qer_editorimage models/xonotic_jumppad01/jumpglow_o.tga
 	cull none
  {
-	map models/mapobjects/xonotic_jumppad01/jumpglow_o.tga
+	map models/xonotic_jumppad01/jumpglow_o.tga
 	blendfunc add
 	tcmod page 3 1 0.02
  }
@@ -11,10 +11,10 @@ textures/xonotic_jumppad01/jumpglow_orange
 
 textures/xonotic_jumppad01/jumpglow_red
 {
-	qer_editorimage models/mapobjects/xonotic_jumppad01/jumpglow_r.tga
+	qer_editorimage models/xonotic_jumppad01/jumpglow_r.tga
 	cull none
  {
-	map models/mapobjects/xonotic_jumppad01/jumpglow_r.tga
+	map models/xonotic_jumppad01/jumpglow_r.tga
 	blendfunc add
 	tcmod page 3 1 0.02
  }
@@ -24,7 +24,7 @@ textures/xonotic_jumppad01/jumpglow_green
 {
 	cull none
  {
-	map models/mapobjects/xonotic_jumppad01/jumpglow_g.tga
+	map models/xonotic_jumppad01/jumpglow_g.tga
 	blendfunc add
 	tcmod page 3 1 0.02
  }
@@ -34,7 +34,7 @@ textures/xonotic_jumppad01/jumpglow_blue
 {
 	cull none
  {
-	map models/mapobjects/xonotic_jumppad01/jumpglow_b.tga
+	map models/xonotic_jumppad01/jumpglow_b.tga
 	blendfunc add
 	tcmod page 3 1 0.02
  }
@@ -42,7 +42,7 @@ textures/xonotic_jumppad01/jumpglow_blue
 
 textures/xonotic_jumppad01/energy_red_anim
 {
-	qer_editorimage models/mapobjects/xonotic_jumppad01/energy_red.tga
+	qer_editorimage models/xonotic_jumppad01/energy_red.tga
 	nopicmip
 	surfaceparm nolightmap
 //	surfaceparm nonsolid
@@ -56,7 +56,7 @@ textures/xonotic_jumppad01/energy_red_anim
 //	alphaFunc GE128
 	
 	{
-		map models/mapobjects/xonotic_jumppad01/energy_red.tga
+		map models/xonotic_jumppad01/energy_red.tga
 		tcGen environment
 //                tcmod scale .6 .6
 		blendfunc GL_ONE GL_ONE
@@ -67,7 +67,7 @@ textures/xonotic_jumppad01/energy_red_anim
 
 textures/xonotic_jumppad01/energy_blue_anim
 {
-	qer_editorimage models/mapobjects/xonotic_jumppad01/energy_blue.tga
+	qer_editorimage models/xonotic_jumppad01/energy_blue.tga
 	nopicmip
 	surfaceparm nolightmap
 //	surfaceparm nonsolid
@@ -81,11 +81,11 @@ textures/xonotic_jumppad01/energy_blue_anim
 //	alphaFunc GE128
 	
 	{
-		map models/mapobjects/xonotic_jumppad01/energy_blue.tga
+		map models/xonotic_jumppad01/energy_blue.tga
 		tcGen environment
 //                tcmod scale .6 .6
 		blendfunc GL_ONE GL_ONE
 		tcMod turb 0 0.25 0 0.5
 		tcMod scroll -.5 -.3
 	}
-}
\ No newline at end of file
+}