[Gtkradiant] JK2 almost last patch

Ryan Lahaie-Cohen gtkradiant@zerowing.idsoftware.com
Fri, 10 May 2002 11:03:23 -0400 

This is a multi-part message in MIME format.

------=_NextPart_000_0010_01C1F812.4D6E2B50
Content-Type: multipart/alternative;
	boundary="----=_NextPart_001_0011_01C1F812.4D6E2B50"


------=_NextPart_001_0011_01C1F812.4D6E2B50
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

TTimo,

Here's the bit of code that loads the system textures in lieu of the =
common.

I have to leave for the day (work and Maman's birthday)... When I get =
back tonight, I'll make a doc for jk2 based on the wolf how-to and I'll =
add more links to the jk2 game.xlink file. I'll send you another patch =
for when you wake up.

I did check the web-update code and all you have to do is give jk2pack =
the 3 value on the server and all should work.

For the BSP turn-off... I'll get that done tonight-tomorrow if you =
haven't already.

ciao!

riant

------=_NextPart_001_0011_01C1F812.4D6E2B50
Content-Type: text/html;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META http-equiv=3DContent-Type content=3D"text/html; =
charset=3Diso-8859-1">
<META content=3D"MSHTML 6.00.2715.400" name=3DGENERATOR>
<STYLE></STYLE>
</HEAD>
<BODY bgColor=3D#ffffff>
<DIV><FONT face=3DArial size=3D2>TTimo,</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
<DIV><FONT face=3DArial size=3D2>Here's the bit of code that loads the =
system=20
textures&nbsp;in lieu of the common.</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
<DIV><FONT face=3DArial size=3D2>I have to leave for the day (work and =
Maman's=20
birthday)... When I get back tonight, I'll make a doc for jk2&nbsp;based =
on the=20
wolf how-to and I'll add more links to the jk2 game.xlink file. I'll=20
send&nbsp;you another patch for when you wake up.</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
<DIV><FONT face=3DArial size=3D2>I did check the web-update code and all =
you have to=20
do is give jk2pack the 3 value on the server<FONT face=3DArial =
size=3D2></FONT> and=20
all should work.</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
<DIV><FONT face=3DArial size=3D2>For the BSP turn-off... I'll get that =
done=20
tonight-tomorrow if you haven't already.</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
<DIV><FONT face=3DArial size=3D2>ciao!</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
<DIV><FONT face=3DArial size=3D2>riant</FONT></DIV></BODY></HTML>

------=_NextPart_001_0011_01C1F812.4D6E2B50--

------=_NextPart_000_0010_01C1F812.4D6E2B50
Content-Type: application/octet-stream;
	name="jk2-radiant.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="jk2-radiant.patch"

? radiant.ncb
? radiant.opt
? contrib/bobtoolz/Debug
? include/RADIANT_MAJOR
? include/RADIANT_MINOR
? include/aboutmsg
? include/aboutmsg.h
? include/aboutmsg.new
? include/version
? include/version.h
? include/version.new
? libs/cmdlib/Debug
? libs/jpeg6/Debug
? libs/mathlib/Debug
? libs/pak/Debug
? plugins/mapq3/Debug
? plugins/md3model/Debug
? plugins/shaders/Debug
cvs server: Diffing .
cvs server: Diffing Doxygen_files
cvs server: Diffing Doxygen_files/example
cvs server: Diffing Doxygen_files/images
cvs server: Diffing contrib
cvs server: Diffing contrib/bobtoolz
cvs server: Diffing contrib/bobtoolz/bt
cvs server: Diffing contrib/bobtoolz/dialogs
cvs server: Diffing contrib/bobtoolz/res
cvs server: Diffing contrib/bobtoolz/txt
cvs server: Diffing contrib/gtkgensurf
cvs server: Diffing contrib/patches
cvs server: Diffing contrib/patches/Gtk
cvs server: Diffing contrib/patches/Gtk/fileselect
cvs server: Diffing contrib/patches/Gtk/fileselect/linux
cvs server: Diffing contrib/patches/RR2DO2
cvs server: Diffing contrib/prtview
cvs server: Diffing contrib/prtview/res
cvs server: Diffing docs
cvs server: Diffing docs/developer
cvs server: Diffing docs/developer/Inspector
cvs server: Diffing docs/developer/RegExp
cvs server: Diffing docs/developer/TstMaps
cvs server: Diffing docs/developer/UML
cvs server: Diffing docs/developer/XMLPush
cvs server: Diffing docs/manual
cvs server: Diffing docs/manual/Q3Rad_Manual
cvs server: Diffing docs/manual/Q3Rad_Manual/Q3Rad_Manual_files
cvs server: Diffing docs/manual/Q3Rad_Manual/appndx
cvs server: Diffing docs/manual/Q3Rad_Manual/ch01
cvs server: Diffing docs/manual/Q3Rad_Manual/ch02
cvs server: Diffing docs/manual/Q3Rad_Manual/ch03
cvs server: Diffing docs/manual/Q3Rad_Manual/ch04
cvs server: Diffing docs/manual/Q3Rad_Manual/ch05
cvs server: Diffing docs/manual/Q3Rad_Manual/ch06
cvs server: Diffing docs/manual/Q3Rad_Manual/ch07
cvs server: Diffing docs/manual/Q3Rad_Manual/ch08
cvs server: Diffing docs/manual/Q3Rad_Manual/ch09
cvs server: Diffing docs/manual/Q3Rad_Manual/ch10
cvs server: Diffing docs/manual/Q3Rad_Manual/ch11
cvs server: Diffing docs/manual/Q3Rad_Manual/ch12
cvs server: Diffing docs/manual/Q3Rad_Manual/gtkrad
cvs server: Diffing docs/manual/Q3Rad_Manual/styles
cvs server: Diffing docs/manual/quake3
cvs server: Diffing docs/manual/quake3/Compile_Manual
cvs server: Diffing docs/manual/quake3/Model_Manual
cvs server: Diffing docs/manual/quake3/Model_Manual/styles
cvs server: Diffing docs/manual/quake3/New_Teams_For_Q3TA
cvs server: Diffing docs/manual/quake3/Q3AShader_Manual
cvs server: Diffing docs/manual/quake3/Q3AShader_Manual/appendix
cvs server: Diffing docs/manual/quake3/Q3AShader_Manual/ch01
cvs server: Diffing docs/manual/quake3/Q3AShader_Manual/ch02
cvs server: Diffing docs/manual/quake3/Q3AShader_Manual/ch03
cvs server: Diffing docs/manual/quake3/Q3AShader_Manual/ch04
cvs server: Diffing docs/manual/quake3/Q3AShader_Manual/ch05
cvs server: Diffing docs/manual/quake3/Q3AShader_Manual/ch06
cvs server: Diffing =
docs/manual/quake3/Q3AShader_Manual/q3ashader_manual_files
cvs server: Diffing docs/manual/quake3/Q3AShader_Manual/styles
cvs server: Diffing docs/manual/quake3/Team_Arena_Mapping_Help
cvs server: Diffing docs/manual/quake3/Team_Arena_Mapping_Help/pages
cvs server: Diffing docs/manual/quake3/Team_Arena_Mapping_Help/pics
cvs server: Diffing docs/manual/quake3/Terrain_Manual
cvs server: Diffing docs/manual/quake3/Terrain_Manual/pages
cvs server: Diffing docs/manual/quake3/Terrain_Manual/pics
cvs server: Diffing include
cvs server: Diffing libs
cvs server: Diffing libs/cmdlib
cvs server: Diffing libs/jpeg6
cvs server: Diffing libs/l_net
cvs server: Diffing libs/mathlib
cvs server: Diffing libs/pak
cvs server: Diffing plugins
cvs server: Diffing plugins/image
cvs server: Diffing plugins/mapq3
cvs server: Diffing plugins/mapxml
cvs server: Diffing plugins/md3model
cvs server: Diffing plugins/md3model/doc
cvs server: Diffing plugins/sample
cvs server: Diffing plugins/shaders
cvs server: Diffing plugins/surface
cvs server: Diffing plugins/textool
cvs server: Diffing plugins/textool/Doc
cvs server: Diffing plugins/vfspak
cvs server: Diffing plugins/vfspk3
cvs server: Diffing radiant
Index: radiant/texwindow.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/GtkRadiant/radiant/texwindow.cpp,v
retrieving revision 1.41.2.3
diff -u -a -r1.41.2.3 texwindow.cpp
--- radiant/texwindow.cpp	8 May 2002 15:39:17 -0000	1.41.2.3
+++ radiant/texwindow.cpp	10 May 2002 14:52:23 -0000
@@ -1048,8 +1048,15 @@
=20
 void Texture_ShowStartupShaders()
 {
-  if (g_PrefsDlg.m_nShader =3D=3D PrefsDlg::SHADER_COMMON) {
-    strcpy (texture_directory, "common/");
+  if (g_PrefsDlg.m_nShader =3D=3D PrefsDlg::SHADER_COMMON)
+  {
+	// RIANT
+	// HACK FOR JK2 SUPPORT
+    if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+	{
+	  strcpy (texture_directory, "system/");
+	}
+	else strcpy (texture_directory, "common/");
     Texture_ShowDirectory ();
   }
=20
cvs server: Diffing radiant/bitmaps
cvs server: Diffing setup
cvs server: Diffing setup/PluginSDK
cvs server: Diffing setup/common
cvs server: Diffing setup/data
cvs server: Diffing setup/data/baseq3
cvs server: Diffing setup/data/baseq3/maps
cvs server: Diffing setup/data/baseq3/models
cvs server: Diffing setup/data/baseq3/models/mapobjects
cvs server: Diffing setup/data/baseq3/models/mapobjects/banner
cvs server: Diffing setup/data/baseq3/models/mapobjects/baph
cvs server: Diffing setup/data/baseq3/models/mapobjects/bitch
cvs server: Diffing setup/data/baseq3/models/mapobjects/corpse
cvs server: Diffing setup/data/baseq3/models/mapobjects/gratelamp
cvs server: Diffing setup/data/baseq3/models/mapobjects/jesus
cvs server: Diffing setup/data/baseq3/models/mapobjects/jets
cvs server: Diffing setup/data/baseq3/models/mapobjects/lamps
cvs server: Diffing setup/data/baseq3/models/mapobjects/pipe
cvs server: Diffing setup/data/baseq3/models/mapobjects/podium
cvs server: Diffing setup/data/baseq3/models/mapobjects/portal_2
cvs server: Diffing setup/data/baseq3/models/mapobjects/skel
cvs server: Diffing setup/data/baseq3/models/mapobjects/skull
cvs server: Diffing setup/data/baseq3/models/mapobjects/spotlamp
cvs server: Diffing setup/data/baseq3/models/mapobjects/storch
cvs server: Diffing setup/data/baseq3/models/mapobjects/teleporter
cvs server: Diffing setup/data/baseq3/models/mapobjects/timlamp
cvs server: Diffing setup/data/baseq3/models/mapobjects/tree2
cvs server: Diffing setup/data/baseq3/models/mapobjects/wallhead
cvs server: Diffing setup/data/baseq3/scripts
cvs server: Diffing setup/data/baseq3/textures
cvs server: Diffing setup/data/baseq3/textures/proto2
cvs server: Diffing setup/data/baseq3/textures/skies2
cvs server: Diffing setup/data/baseq3/textures/stone
cvs server: Diffing setup/data/missionpack
cvs server: Diffing setup/data/missionpack/maps
cvs server: Diffing setup/data/missionpack/maps/Team Arena Prefabs
cvs server: Diffing setup/data/missionpack/models
cvs server: Diffing setup/data/missionpack/models/mapobjects
cvs server: Diffing setup/data/missionpack/models/mapobjects/spawn
cvs server: Diffing setup/data/missionpack/scripts
cvs server: Diffing setup/data/missionpack/textures
cvs server: Diffing setup/data/missionpack/textures/base_wall2
cvs server: Diffing setup/data/tools
cvs server: Diffing setup/linux
cvs server: Diffing setup/linux/Help
cvs server: Diffing setup/linux/Help/DocsArt
cvs server: Diffing setup/linux/config
cvs server: Diffing setup/linux/setup.data
cvs server: Diffing setup/linux/setup.data/bin
cvs server: Diffing setup/linux/setup.data/bin/Linux
cvs server: Diffing setup/linux/setup.data/bin/Linux/x86
cvs server: Diffing setup/linux/setup.data/bin/Linux/x86/glibc-2.1
cvs server: Diffing setup/linux/setup.data/locale
cvs server: Diffing setup/linux/setup.data/locale/de
cvs server: Diffing setup/linux/setup.data/locale/de/LC_MESSAGES
cvs server: Diffing setup/linux/setup.data/locale/es
cvs server: Diffing setup/linux/setup.data/locale/es/LC_MESSAGES
cvs server: Diffing setup/linux/setup.data/locale/fr
cvs server: Diffing setup/linux/setup.data/locale/fr/LC_MESSAGES
cvs server: Diffing setup/linux/setup.data/locale/it
cvs server: Diffing setup/linux/setup.data/locale/it/LC_MESSAGES
cvs server: Diffing setup/linux/setup.data/locale/nl
cvs server: Diffing setup/linux/setup.data/locale/nl/LC_MESSAGES
cvs server: Diffing setup/linux/setup.data/locale/sv
cvs server: Diffing setup/linux/setup.data/locale/sv/LC_MESSAGES
cvs server: Diffing setup/win32
cvs server: Diffing setup/win32/bin
cvs server: Diffing setup/win32/template
cvs server: Diffing setup/win32/template/Component Definitions
cvs server: Diffing setup/win32/template/File Groups
cvs server: Diffing setup/win32/template/Media
cvs server: Diffing setup/win32/template/Media/GtkRadiant
cvs server: Diffing setup/win32/template/Media/GtkRadiant/Disk Images
cvs server: Diffing setup/win32/template/Media/GtkRadiant/Disk =
Images/Disk1
cvs server: Diffing setup/win32/template/Media/GtkRadiant/Log Files
cvs server: Diffing setup/win32/template/Media/GtkRadiant/Report Files
cvs server: Diffing setup/win32/template/Registry Entries
cvs server: Diffing setup/win32/template/Script Files
cvs server: Diffing setup/win32/template/Setup Files
cvs server: Diffing setup/win32/template/Setup Files/Compressed Files
cvs server: Diffing setup/win32/template/Setup Files/Compressed =
Files/0009-English
cvs server: Diffing setup/win32/template/Setup Files/Compressed =
Files/0009-English/Intel 32
cvs server: Diffing setup/win32/template/Setup Files/Compressed =
Files/0009-English/OS Independent
cvs server: Diffing setup/win32/template/Setup Files/Compressed =
Files/Language Independent
cvs server: Diffing setup/win32/template/Setup Files/Compressed =
Files/Language Independent/Intel 32
cvs server: Diffing setup/win32/template/Setup Files/Compressed =
Files/Language Independent/OS Independent
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed Files
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed =
Files/0009-English
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed =
Files/0009-English/Intel 32
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed =
Files/0009-English/OS Independent
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed =
Files/Disk1
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed =
Files/Language Independent
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed =
Files/Language Independent/Intel 32
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed =
Files/Language Independent/OS Independent
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed =
Files/LastDisk
cvs server: Diffing setup/win32/template/Setup Files/Uncompressed =
Files/Other
cvs server: Diffing setup/win32/template/Shell Objects
cvs server: Diffing setup/win32/template/String Tables
cvs server: Diffing setup/win32/template/String Tables/0009-English
cvs server: Diffing setup/win32/template/Text Substitutions
cvs server: Diffing tools
cvs server: Diffing tools/quake3
cvs server: Diffing tools/quake3/common
cvs server: Diffing tools/quake3/q3data
cvs server: Diffing tools/quake3/q3map
cvs server: Diffing tools/quake3/q3map/NetConnect
cvs server: Diffing tools/quake3/q3map/NetTest
cvs server: Diffing vslick
cvs server: Diffing www


------=_NextPart_000_0010_01C1F812.4D6E2B50--