From 52ce7ca0b26dd7588d820b11b799ce987f6d77ed Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 2 Aug 2010 16:54:01 +0200
Subject: [PATCH] adhere to xonotic shader naming convention

---
 .../xonotic_jumppad01/xonotic_jumppad01.md3_0.skin   |  4 ++--
 .../xonotic_jumppad01/xonotic_jumppad01.md3_1.skin   |  4 ++--
 .../xonotic_jumppad01/xonotic_launchpad01.md3_0.skin |  4 ++--
 .../xonotic_jumppad01/xonotic_launchpad01.md3_1.skin |  4 ++--
 ...mppad01.shader => model_xonotic_jumppad01.shader} | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename scripts/{xonotic_jumppad01.shader => model_xonotic_jumppad01.shader} (85%)

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
index e5692977..dbeb8f84 100644
--- a/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin
@@ -1,5 +1,5 @@
-flame,textures/xonotic_jumppad01/jumpglow_red
-energy,textures/xonotic_jumppad01/energy_red_anim
+flame,models/xonotic_jumppad01/jumpglow_red
+energy,models/xonotic_jumppad01/energy_red_anim
 1,textures/trak5x/panel-grate1a
 2,textures/trak5x/wall-wall1a
 3,textures/trak5x/base-pipe1a
diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
index b3cf0955..3384f0b0 100644
--- a/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
+++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin
@@ -1,5 +1,5 @@
-flame,textures/xonotic_jumppad01/jumpglow_blue
-energy,textures/xonotic_jumppad01/energy_blue_anim
+flame,models/xonotic_jumppad01/jumpglow_blue
+energy,models/xonotic_jumppad01/energy_blue_anim
 1,textures/trak5x/panel-grate1a
 2,textures/trak5x/wall-wall1a
 3,textures/trak5x/base-pipe1a
diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
index e5692977..dbeb8f84 100644
--- a/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin
@@ -1,5 +1,5 @@
-flame,textures/xonotic_jumppad01/jumpglow_red
-energy,textures/xonotic_jumppad01/energy_red_anim
+flame,models/xonotic_jumppad01/jumpglow_red
+energy,models/xonotic_jumppad01/energy_red_anim
 1,textures/trak5x/panel-grate1a
 2,textures/trak5x/wall-wall1a
 3,textures/trak5x/base-pipe1a
diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
index b3cf0955..3384f0b0 100644
--- a/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin
@@ -1,5 +1,5 @@
-flame,textures/xonotic_jumppad01/jumpglow_blue
-energy,textures/xonotic_jumppad01/energy_blue_anim
+flame,models/xonotic_jumppad01/jumpglow_blue
+energy,models/xonotic_jumppad01/energy_blue_anim
 1,textures/trak5x/panel-grate1a
 2,textures/trak5x/wall-wall1a
 3,textures/trak5x/base-pipe1a
diff --git a/scripts/xonotic_jumppad01.shader b/scripts/model_xonotic_jumppad01.shader
similarity index 85%
rename from scripts/xonotic_jumppad01.shader
rename to scripts/model_xonotic_jumppad01.shader
index 879cc24b..a4d01a91 100644
--- a/scripts/xonotic_jumppad01.shader
+++ b/scripts/model_xonotic_jumppad01.shader
@@ -1,4 +1,4 @@
-textures/xonotic_jumppad01/jumpglow_orange
+models/xonotic_jumppad01/jumpglow_orange
 {
 	qer_editorimage models/xonotic_jumppad01/jumpglow_o.tga
 	cull none
@@ -9,7 +9,7 @@ textures/xonotic_jumppad01/jumpglow_orange
  }
 }
 
-textures/xonotic_jumppad01/jumpglow_red
+models/xonotic_jumppad01/jumpglow_red
 {
 	qer_editorimage models/xonotic_jumppad01/jumpglow_r.tga
 	cull none
@@ -20,7 +20,7 @@ textures/xonotic_jumppad01/jumpglow_red
  }
 }
 
-textures/xonotic_jumppad01/jumpglow_green
+models/xonotic_jumppad01/jumpglow_green
 {
 	cull none
  {
@@ -30,7 +30,7 @@ textures/xonotic_jumppad01/jumpglow_green
  }
 }
 
-textures/xonotic_jumppad01/jumpglow_blue
+models/xonotic_jumppad01/jumpglow_blue
 {
 	cull none
  {
@@ -40,7 +40,7 @@ textures/xonotic_jumppad01/jumpglow_blue
  }
 }
 
-textures/xonotic_jumppad01/energy_red_anim
+models/xonotic_jumppad01/energy_red_anim
 {
 	qer_editorimage models/xonotic_jumppad01/energy_red.tga
 	nopicmip
@@ -65,7 +65,7 @@ textures/xonotic_jumppad01/energy_red_anim
 	}
 }
 
-textures/xonotic_jumppad01/energy_blue_anim
+models/xonotic_jumppad01/energy_blue_anim
 {
 	qer_editorimage models/xonotic_jumppad01/energy_blue.tga
 	nopicmip
-- 
2.39.2