diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..cb5a08e --- /dev/null +++ b/AUTHORS @@ -0,0 +1,10 @@ +AUTHORS for quake2 +================== + +Jamie 'Jaq' Wilkinson +Bill 'taniwha' Currie +Jeff 'Deek' Teunissen + +Thanks go to: +Steven Fuller +Ryan C. Gordon diff --git a/HACKING b/HACKING new file mode 100644 index 0000000..c69a97b --- /dev/null +++ b/HACKING @@ -0,0 +1,15 @@ +HACKING on quake2 +================= + +Note to developers: bsd/, irix/ and solaris/ are NO LONGER PERTINENT! + +linux/ was renamed src/, so hack in there. As we port to more arch/os's, +we'll integrate the old os subdirs into src/, and remove the old trees. + + +If you want to hack on something, but don't know where to start, have a look +at TODO in the top level source tree, or open a browser at + +http://bugs.quakeforge.net/bugs/cgi-bin/pkgreport.cgi?pkg=quake2&archive=no + +for the currently open bug reports. diff --git a/README b/README index 04f1396..931f64b 100644 --- a/README +++ b/README @@ -1,13 +1,35 @@ +README for quake2 +================= + +Compiling +--------- + If you are checking this out from CVS, run the bootstrap command first to set up configure. Then follow the instructions in INSTALL. Use --disable-asm on the configure line if you want to use the software refreshers on i386, or better yet, fix the bug in the asm! -Note to developers: bsd/, irix/ and solaris/ are NO LONGER PERTINENT! -The relevant code was merged into src/ along with the linux/ subtree, so do -your edits there. -They exist only as reference in case the merge mucked up anything, they will -be removed as soon as I can be sure that the code merge worked. +Save Games +---------- - -- Jaq +Save games are tied to the build of quake2 that they were created with. +You can *not* use old save games with new versions of the code (well, you +can hack the savegame loader to allow this, but you may find yourself +experiencing interesting and obscure segfaults in the game). + +The simple workaround is to *not upgrade* if you are in the middle of +a single player game. + +Mission Packs +------------- + +To build the Xatrix and Rogue missionpacks, download the sharballs from id +Software's FTP site: + +ftp://idsoftware.com/idstuff/quake2/sources/ + +uncompress them, and run them in src/xatrix or src/rogue + +In src/Makefile.am, swap the comments on the SUBDIR lines, and run ./bootstrap +from the top level. Rerun configure and make. diff --git a/TODO b/TODO index 3357796..6ddd4de 100644 --- a/TODO +++ b/TODO @@ -11,3 +11,6 @@ utter bollocks at the moment. all the structs are very fragile, depending on specific ordering of each element. - fix va_list as per http://gozer.quakeforge.net/list-archives/quakeforge-cvs/2002-April/000151.html, http://www.quakeforge.net/cgi-bin/viewcvs.cgi/quakeforge/libs/util/dstring.c.diff?r1=1.8&r2=1.9 +- investigate the possibility of savegames not being tied to a particular build +- fix software assembler when building without --disable-asm on i386 +- split out assembler per arch/os (we currently have gas i386 and win i386) diff --git a/src/Makefile.am b/src/Makefile.am index 357d76f..0fd7471 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ # $Id$ # swap comments to build the modpacks -#SUBDIRS = . baseq2 ctf -SUBDIRS = . baseq2 ctf xatrix rogue +SUBDIRS = . baseq2 ctf +#SUBDIRS = . baseq2 ctf xatrix rogue bin_PROGRAMS = quake2 \ ref_soft.so ref_softx.so ref_softsdl.so \ diff --git a/src/baseq2/g_save.c b/src/baseq2/g_save.c index d0d6e0b..54dca75 100644 --- a/src/baseq2/g_save.c +++ b/src/baseq2/g_save.c @@ -1,22 +1,23 @@ -/* -Copyright (C) 1997-2001 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ +/* $Id$ + * + * Copyright (C) 1997-2001 Id Software, Inc. + * Copyright (c) 2002 The Quakeforge Project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "g_local.h" @@ -501,13 +502,11 @@ void ReadGame (char *filename) gi.error ("Couldn't open %s", filename); fread (str, sizeof(str), 1, f); - /* if (strcmp (str, __DATE__)) { fclose (f); gi.error ("Savegame from an older version.\n"); } - */ g_edicts = gi.TagMalloc (game.maxentities * sizeof(g_edicts[0]), TAG_GAME); globals.edicts = g_edicts; diff --git a/src/ctf/g_save.c b/src/ctf/g_save.c index 428b20d..09c542c 100644 --- a/src/ctf/g_save.c +++ b/src/ctf/g_save.c @@ -1,22 +1,23 @@ -/* -Copyright (C) 1997-2001 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ +/* $Id$ + * + * Copyright (C) 1997-2001 Id Software, Inc. + * Copyright (c) 2002 The Quakeforge Project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "g_local.h" @@ -477,13 +478,11 @@ void ReadGame (char *filename) gi.error ("Couldn't open %s", filename); fread (str, sizeof(str), 1, f); - /* if (strcmp (str, __DATE__)) { fclose (f); gi.error ("Savegame from an older version.\n"); } - */ g_edicts = gi.TagMalloc (game.maxentities * sizeof(g_edicts[0]), TAG_GAME); globals.edicts = g_edicts;