From 35fb36674636e441f18d08322e84ec5fa11b891e Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sat, 25 Nov 2006 20:26:59 +0000
Subject: [PATCH] Version := 2.2svn shader syntax fixes

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1937 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/default.cfg                    |  2 +-
 data/scripts/evil4_techtrims.shader |  2 +-
 data/scripts/savdm6ish.shader       | 12 ++++++------
 misc/makebuild.sh                   |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/default.cfg b/data/default.cfg
index 7482a9f0e..ac9793a4b 100644
--- a/data/default.cfg
+++ b/data/default.cfg
@@ -1,5 +1,5 @@
 // Nexuiz version (formatted for humans)
-set g_nexuizversion "2.0"
+set g_nexuizversion "2.2svn"
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
diff --git a/data/scripts/evil4_techtrims.shader b/data/scripts/evil4_techtrims.shader
index 191bf1f6e..a0bbc7eb2 100644
--- a/data/scripts/evil4_techtrims.shader
+++ b/data/scripts/evil4_techtrims.shader
@@ -1178,7 +1178,7 @@ textures/evil4_d_techwalls/d_tech_dwteky
 textures/evil4_d_techwalls/d_tech_drkwll_pnltek
 {
 	{
-		maptextures/evil4_d_techwalls/d_tech_drkwll_pnltek_glow.tga
+		map textures/evil4_d_techwalls/d_tech_drkwll_pnltek_glow.tga
 		tcmod turb 0 1 1 9
 		blendFunc GL_ONE GL_ONE
 	}
diff --git a/data/scripts/savdm6ish.shader b/data/scripts/savdm6ish.shader
index f8bbb0dc1..3216d4f52 100644
--- a/data/scripts/savdm6ish.shader
+++ b/data/scripts/savdm6ish.shader
@@ -1,14 +1,14 @@
 textures/savdm6ish/#lava1
 {
 	qer_editorimage textures/savdm6ish/#lava1.jpg
-	#qer_nocarve
+	//qer_nocarve
 	surfaceparm noimpact
 	surfaceparm lava
 	surfaceparm nolightmap
 	q3map_surfacelight 3000
 	cull disable
-	#tessSize 256
-	#deformVertexes wave 100sin 5 5 .5 0.02
+	//tessSize 256
+	//deformVertexes wave 100sin 5 5 .5 0.02
 	{
 		map textures/savdm6ish/#lava1.jpg
 	}
@@ -23,8 +23,8 @@ textures/savdm6ish/#teleport
 	surfaceparm nolightmap
 	q3map_surfacelight 1000
 	cull disable
-	#tessSize 256
-	#deformVertexes wave 100sin 5 5 .5 0.02
+	//tessSize 256
+	//deformVertexes wave 100sin 5 5 .5 0.02
 	{
 		map textures/savdm6ish/#teleport.jpg
 	}
@@ -64,4 +64,4 @@ textures/savdm6ish/floor01_5
 		map $lightmap
 		blendfunc filter
 	}
-}
\ No newline at end of file
+}
diff --git a/misc/makebuild.sh b/misc/makebuild.sh
index e2810a8e1..da505d56a 100755
--- a/misc/makebuild.sh
+++ b/misc/makebuild.sh
@@ -3,7 +3,7 @@ set -ex
 
 base=`pwd`
 
-basepk3=$base/data20060614.pk3
+basepk3=$base/data20060905.pk3
 nexdir=$base/nexuiz
 dpdir=$base/darkplaces
 tmpdir=/tmp/NEX
@@ -14,7 +14,7 @@ osxapps=$buildfiles/osx
 copystrip=$buildfiles/copystrip
 fteqcc="fteqcc.bin -O2"
 mingw=/home/polzer/mingw32
-ia32=/chroot/fc4-i386
+ia32=/chroot/fc5-i386
 osxhost=macmini_osx
 osxtemp=/Users/rpolzer/Darkplaces.build
 
-- 
2.39.2