[Gtkradiant] JK2 patch
Ryan Lahaie-Cohen
gtkradiant@zerowing.idsoftware.com
Tue, 7 May 2002 20:04:46 -0400
This is a multi-part message in MIME format.
------=_NextPart_000_0024_01C1F602.6F49F590
Content-Type: multipart/alternative;
boundary="----=_NextPart_001_0025_01C1F602.6F49F590"
------=_NextPart_001_0025_01C1F602.6F49F590
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Here it is folks!
Still missing is the ability to compile properly and thus run =
properly... this is forthcoming.
Cheers,
riant
------=_NextPart_001_0025_01C1F602.6F49F590
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>Here it is folks!</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT> </DIV>
<DIV><FONT face=3DArial size=3D2>Still missing is the ability to compile =
properly=20
and thus run properly... this is forthcoming.</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT> </DIV>
<DIV><FONT face=3DArial size=3D2>Cheers,</FONT></DIV>
<DIV><FONT face=3DArial size=3D2></FONT> </DIV>
<DIV><FONT face=3DArial size=3D2>riant</FONT></DIV></BODY></HTML>
------=_NextPart_001_0025_01C1F602.6F49F590--
------=_NextPart_000_0024_01C1F602.6F49F590
Content-Type: application/octet-stream;
name="jk2.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="jk2.patch"
cvs diff -ua=20
? 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
? radiant/XMLDump.xml
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/gtkdlgs.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/gtkdlgs.cpp,v
retrieving revision 1.18.2.6
diff -u -a -r1.18.2.6 gtkdlgs.cpp
--- radiant/gtkdlgs.cpp 2 May 2002 17:55:17 -0000 1.18.2.6
+++ radiant/gtkdlgs.cpp 7 May 2002 23:59:33 -0000
@@ -294,6 +294,14 @@
static const char* sWolfSPCombo =3D "Single Player mapping mode";
static const char* sWolfMPCombo =3D "Multiplayer mapping mode";
=20
+// RIANT
+// HARD-CODED JK2 HACK
+static const char* sJK2ComboItem =3D "Jedi Knight II Outcast";
+static const char* sJK2ModComboItem =3D "Custom JK2 modification";
+static const char* sJK2SPCombo =3D "Single Player mapping mode";
+static const char* sJK2MPCombo =3D "Multiplayer mapping mode";
+
+
static GtkWidget* game_select; // GTK_COMBO
static GtkEntry* fsgame_entry;
=20
@@ -316,6 +324,23 @@
}
=20
}
+ // RIANT
+ // HACK: JK2
+ else if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+ {
+ if (!strcmp(dir,sJK2ComboItem))
+ {
+ // disable the fs_game text entry
+ gtk_entry_set_text (fsgame_entry, "");
+ gtk_widget_set_sensitive(GTK_WIDGET(fsgame_entry), false);
+ }
+ else
+ {
+ gtk_entry_set_text (fsgame_entry, "");
+ gtk_widget_set_sensitive(GTK_WIDGET(fsgame_entry), true);
+ }
+ }
+ // QUAKE 3
else
{
if (!strcmp(dir,sQ3ComboItem))
@@ -457,6 +482,11 @@
{
table2 =3D gtk_table_new (9, 2, FALSE);
}
+ // JK2 HACK
+ else if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+ {
+ table2 =3D gtk_table_new (9, 2, FALSE);
+ }
else
{
table2 =3D gtk_table_new (8, 2, FALSE);
@@ -477,6 +507,13 @@
combo_list =3D g_list_append (combo_list, (void *)sWolfComboItem);
combo_list =3D g_list_append (combo_list, (void =
*)sWolfModComboItem);
}
+ // RIANT
+ // JK2 HACK A LA WOLF
+ else if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+ {
+ combo_list =3D g_list_append (combo_list, (void *)sJK2ComboItem);
+ combo_list =3D g_list_append (combo_list, (void =
*)sJK2ModComboItem);
+ }
else
{
// Q3 or default
@@ -508,7 +545,6 @@
/*
wolf specific: select MP or SP mode
*/
-
if (g_pGameDescription->mGameFile =3D=3D "wolf.game")
{
combo_list =3D NULL;
@@ -533,6 +569,32 @@
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
}
=20
+ // RIANT
+ // JK2 HACK
+ if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+ {
+ combo_list =3D NULL;
+ combo_list =3D g_list_append (combo_list, (void *)sJK2SPCombo);
+ combo_list =3D g_list_append (combo_list, (void *)sJK2MPCombo);
+ =20
+ gamemode_combo =3D gtk_combo_new ();
+ gtk_combo_set_popdown_strings (GTK_COMBO (gamemode_combo), =
combo_list);
+ gtk_widget_show(gamemode_combo);
+ gtk_table_attach (GTK_TABLE (table2), gamemode_combo, 1, 2, 8, 9,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ g_list_free (combo_list);
+ combo_list =3D NULL;
+
+ label =3D gtk_label_new ("Mapping mode");
+ gtk_widget_show (label);
+ gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 8, 9,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
+ }
+
/*
the usual stuff
*/
@@ -592,6 +654,25 @@
gtk_widget_set_sensitive(game, true);
}
}
+ // RIANT
+ // JK2 HACK
+ else if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+ {
+ if ((strlen(dir) =3D=3D 0) || !stricmp(dir,"base"))
+ {
+ // no fs_game set, we are running stock Quake III Arena editing
+ gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (game_select)->entry), =
sJK2ComboItem);
+ gtk_entry_set_text (GTK_ENTRY (game), "");
+ gtk_widget_set_sensitive(game, false);
+ }
+ else
+ {
+ // this is a custom mod
+ gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (game_select)->entry), =
sJK2ModComboItem);
+ gtk_entry_set_text (GTK_ENTRY (game), dir);
+ gtk_widget_set_sensitive(game, true);
+ }
+ }
else
{
if ((strlen(dir) =3D=3D 0) || !strcmp(dir,"baseq3"))
@@ -631,6 +712,21 @@
}
}
=20
+ // JK2 HACK
+ else if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+ {
+ char *gamemode =3D ValueForKey (g_qeglobals.d_project_entity, =
"gamemode");
+ if ((strlen(gamemode) =3D=3D 0) || !strcmp(gamemode,"sp"))
+ {
+ // nothing set yet, or single player
+ gtk_entry_set_text (GTK_ENTRY (GTK_COMBO =
(gamemode_combo)->entry), sJK2SPCombo);
+ }
+ else
+ {
+ gtk_entry_set_text (GTK_ENTRY (GTK_COMBO =
(gamemode_combo)->entry), sJK2MPCombo);
+ }
+ }
+
gtk_grab_add (project);
gtk_widget_show (project);
=20
@@ -657,6 +753,21 @@
g_qeglobals.m_bFSGame =3D true;
}
}
+ else if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+ {
+ if (!strlen(dir) || !stricmp(dir,"base"))
+ {
+ DeleteKey (g_qeglobals.d_project_entity, "dir");
+ g_qeglobals.m_strFSGame =3D "";
+ g_qeglobals.m_bFSGame =3D false;
+ }
+ else
+ {
+ SetKeyValue (g_qeglobals.d_project_entity, "dir", dir);
+ g_qeglobals.m_strFSGame =3D dir;
+ g_qeglobals.m_bFSGame =3D true;
+ }
+ }
else
{
if (!strlen(dir) || !strcmp(dir,"baseq3"))
@@ -685,6 +796,22 @@
// read from gamemode_combo
char *gamemode =3D gtk_entry_get_text (GTK_ENTRY =
(GTK_COMBO(gamemode_combo)->entry));
if (!strlen(gamemode) || !strcmp(gamemode, sWolfSPCombo))
+ {
+ SetKeyValue (g_qeglobals.d_project_entity, "gamemode", "sp");
+ }
+ else
+ {
+ SetKeyValue (g_qeglobals.d_project_entity, "gamemode", "mp");
+ }
+ }
+
+ // RIANT
+ // JK2 HACK
+ if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+ {
+ // read from gamemode_combo
+ char *gamemode =3D gtk_entry_get_text (GTK_ENTRY =
(GTK_COMBO(gamemode_combo)->entry));
+ if (!strlen(gamemode) || !strcmp(gamemode, sJK2SPCombo))
{
SetKeyValue (g_qeglobals.d_project_entity, "gamemode", "sp");
}
Index: radiant/main.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/main.cpp,v
retrieving revision 1.40.2.4
diff -u -a -r1.40.2.4 main.cpp
--- radiant/main.cpp 2 May 2002 23:43:13 -0000 1.40.2.4
+++ radiant/main.cpp 7 May 2002 23:59:36 -0000
@@ -978,6 +978,11 @@
// but it may not have been the right thing to do
=20
// do we have fs_game?
+// if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+// {
+// sprintf(src, "\"%s\"", mapname);
+// }
+// else if (g_qeglobals.m_bFSGame)
if (g_qeglobals.m_bFSGame)
{
// set with fs_game AND fs_basepath
Index: radiant/preferences.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/preferences.cpp,v
retrieving revision 1.37.2.5
diff -u -a -r1.37.2.5 preferences.cpp
--- radiant/preferences.cpp 2 May 2002 14:28:22 -0000 1.37.2.5
+++ radiant/preferences.cpp 7 May 2002 23:59:43 -0000
@@ -939,6 +939,8 @@
URL +=3D "&Games_dlup%5B%5D=3D1";
else if (!(*iGame)->mGameFile.Compare("wolf.game"))
URL +=3D "&Games_dlup%5B%5D=3D2";
+ else if (!(*iGame)->mGameFile.Compare("jk2.game"))
+ URL +=3D "&Games_dlup%5B%5D=3D3";
}
}
=20
Index: radiant/q3radiant.dsp
=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/q3radiant.dsp,v
retrieving revision 1.38.4.1
diff -u -a -r1.38.4.1 q3radiant.dsp
--- radiant/q3radiant.dsp 5 Mar 2002 18:25:33 -0000 1.38.4.1
+++ radiant/q3radiant.dsp 7 May 2002 23:59:46 -0000
@@ -1532,5 +1532,9 @@
=20
SOURCE=3D.\q3radiant.rc
# End Source File
+# Begin Source File
+
+SOURCE=3D..\tools\quake3\common\qfiles.h
+# End Source File
# End Target
# End Project
Index: radiant/watchbsp.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/watchbsp.cpp,v
retrieving revision 1.21.2.1
diff -u -a -r1.21.2.1 watchbsp.cpp
--- radiant/watchbsp.cpp 2 May 2002 23:43:13 -0000 1.21.2.1
+++ radiant/watchbsp.cpp 7 May 2002 23:59:47 -0000
@@ -608,6 +608,33 @@
#endif
}
}
+ // RIANT
+ // JK2 HACK
+ if (g_pGameDescription->mGameFile =3D=3D "jk2.game")
+ {
+ if (!strcmp(ValueForKey(g_qeglobals.d_project_entity, =
"gamemode"),"mp"))
+ {
+ // MP
+#if defined(WIN32)
+ cmd +=3D "jk2MP.exe";
+#elif defined(__linux__)
+ cmd +=3D "jk2mp";
+#else
+#error "WTF are you compiling on"
+#endif
+ }
+ else
+ {
+ // SP
+#if defined(WIN32)
+ cmd +=3D "jk2SP.exe";
+#elif defined(__linux__)
+ cmd +=3D "jk2sp";
+#else
+#error "WTF are you compiling on"
+#endif
+ }
+ }
else
{
cmd +=3D g_PrefsDlg.m_strEngine.GetBuffer();
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
Index: tools/quake3/common/qfiles.h
=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/tools/quake3/common/qfiles.h,v
retrieving revision 1.5
diff -u -a -r1.5 qfiles.h
--- tools/quake3/common/qfiles.h 20 Jan 2002 20:43:49 -0000 1.5
+++ tools/quake3/common/qfiles.h 7 May 2002 23:59:51 -0000
@@ -317,7 +317,8 @@
=20
//#define BSP_VERSION 46
#define Q3_BSP_VERSION 46
-#define WOLF_BSP_VERSION 47
+#define WOLF_BSP_VERSION 47
+#define JK2_BSP_VERSION 1
=20
// there shouldn't be any problem with increasing these values at the
// expense of more memory allocation in the utilities
cvs server: Diffing tools/quake3/q3data
cvs server: Diffing tools/quake3/q3map
Index: tools/quake3/q3map/path_init.c
=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/tools/quake3/q3map/path_init.c,v
retrieving revision 1.6.4.1
diff -u -a -r1.6.4.1 path_init.c
--- tools/quake3/q3map/path_init.c 14 Mar 2002 15:06:28 -0000 1.6.4.1
+++ tools/quake3/q3map/path_init.c 7 May 2002 23:59:52 -0000
@@ -50,6 +50,7 @@
{
{ "quake3", "baseq3", ".q3a", "quake", qfalse, Q3_BSP_VERSION },
{ "wolf", "main", ".wolf", "wolf", qtrue, WOLF_BSP_VERSION },
+ { "jk2", "base", ".jk2", "jk2", qfalse, JK2_BSP_VERSION },
{ NULL, NULL, NULL, NULL, qfalse, 0 }
};
=20
cvs server: Diffing tools/quake3/q3map/NetConnect
cvs server: Diffing tools/quake3/q3map/NetTest
cvs server: Diffing vslick
cvs server: Diffing www
------=_NextPart_000_0024_01C1F602.6F49F590--