opendemo-cvs Mailing List for OpenDemo (Page 6)
Status: Beta
Brought to you by:
girlich
Menu
▾
▴
opendemo-cvs — cvs checkin list
You can subscribe to this list here.
| 2002 |
Jan
(43) |
Feb
|
Mar
|
Apr
(38) |
May
(65) |
Jun
(108) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(17) |
Feb
(13) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(8) |
Sep
(62) |
Oct
(81) |
Nov
(12) |
Dec
(32) |
| 2004 |
Jan
(25) |
Feb
(76) |
Mar
(32) |
Apr
(10) |
May
(6) |
Jun
|
Jul
(1) |
Aug
(5) |
Sep
|
Oct
(19) |
Nov
(1) |
Dec
|
| 2005 |
Jan
(2) |
Feb
(23) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
|
From: Uwe G. <gi...@us...> - 2004-02-29 10:36:40
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29457 Modified Files: odfile_parser.pm Log Message: better file start: who wrote it and what is it Index: odfile_parser.pm =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odfile_parser.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** odfile_parser.pm 24 Feb 2004 16:30:53 -0000 1.4 --- odfile_parser.pm 29 Feb 2004 10:26:29 -0000 1.5 *************** *** 1,9 **** # $Id$ # This package capsules OpenDemo XML file handling. # It is the start of a implemenation based on XML::Parser. ! # Most of the code in this file is NOT WORKING and simply copied ! # from odfile_dom.pm --- 1,11 ---- # $Id$ + # Uwe Girlich (uw...@pl...) # This package capsules OpenDemo XML file handling. # It is the start of a implemenation based on XML::Parser. ! ! ! # You need the Perl module XML::Parser. |
|
From: Uwe G. <gi...@us...> - 2004-02-29 10:35:53
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29306 Modified Files: odcut.pl Log Message: better file start: who wrote it and what is it Index: odcut.pl =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcut.pl,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** odcut.pl 24 Feb 2004 16:28:06 -0000 1.39 --- odcut.pl 29 Feb 2004 10:25:43 -0000 1.40 *************** *** 1,10 **** #!/usr/bin/perl -w - - # $Id$ ! ! ! # Uwe Girlich ! # OpenDemo cutter tool --- 1,6 ---- #!/usr/bin/perl -w # $Id$ ! # Uwe Girlich (uw...@pl...) ! # OpenDemo Cutter *************** *** 13,16 **** --- 9,15 ---- + # You need Perl from http://www.perl.org. + + # modules init use strict; |
|
From: Uwe G. <gi...@us...> - 2004-02-29 10:34:40
|
Update of /cvsroot/opendemo/opendemo/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29182 Modified Files: README Log Message: ODcut directory is listed Index: README =================================================================== RCS file: /cvsroot/opendemo/opendemo/doc/README,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** README 27 Feb 2004 23:37:46 -0000 1.12 --- README 29 Feb 2004 10:24:30 -0000 1.13 *************** *** 46,49 **** --- 46,52 ---- Some tools for source code manipulations. + opendemo/tools/odcut/ + OpenDemo Cutter, a OpenDemo file player and cutter with wxWidgets GUI. + Uwe Girlich |
|
From: Uwe G. <gi...@us...> - 2004-02-29 10:33:33
|
Update of /cvsroot/opendemo/opendemo-web/machinima In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28988 Modified Files: opendemo.base Log Message: new entry for 29 februar 2004 done ODcut download link Index: opendemo.base =================================================================== RCS file: /cvsroot/opendemo/opendemo-web/machinima/opendemo.base,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** opendemo.base 8 Oct 2003 19:43:32 -0000 1.3 --- opendemo.base 29 Feb 2004 10:23:24 -0000 1.4 *************** *** 605,646 **** <item> <linkend id="download-release"/> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20031008.tar.gz?download" ! name="opendemo-20031008.tar.gz"/>: Source Package with all necessary source code. </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20031008-bin-jk2.zip?download" ! name="opendemo-20031008-bin-jk2.zip"/>: Jedi Knight II: Jedi Outcast Binary Package with compiled libraries in bytecode (all JK2 systems). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20031008-bin-q3a.zip?download" ! name="opendemo-20031008-bin-q3a.zip"/>: Quake III Arena Binary Package with compiled libraries in bytecode (all Q3A systems). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20031008-bin-rtcw.zip?download" ! name="opendemo-20031008-bin-rtcw.zip"/>: Return to Castle Wolfenstein Binary Package with native compiled libraries (Linux x86 and Windows x86). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20031008-bin-sof2.zip?download" ! name="opendemo-20031008-bin-sof2.zip"/>: Soldier of Fortune II: Double Helix Binary Package with compiled libraries in bytecode (all SOF2 systems). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20031008-bin-stef.zip?download" ! name="opendemo-20031008-bin-stef.zip"/>: Star Trek Voyager: Elite Force Binary Package with compiled libraries in bytecode (all STEF systems). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20031008-toolset.tar.gz?download" ! name="opendemo-20031008-toolset.tar.gz"/>: Toolset Package with LCC for Linux and Windows. </item> --- 605,646 ---- <item> <linkend id="download-release"/> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20040229.tar.gz?download" ! name="opendemo-20040229.tar.gz"/>: Source Package with all necessary source code. </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20040229-bin-jk2.zip?download" ! name="opendemo-20040229-bin-jk2.zip"/>: Jedi Knight II: Jedi Outcast Binary Package with compiled libraries in bytecode (all JK2 systems). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20040229-bin-q3a.zip?download" ! name="opendemo-20040229-bin-q3a.zip"/>: Quake III Arena Binary Package with compiled libraries in bytecode (all Q3A systems). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20040229-bin-rtcw.zip?download" ! name="opendemo-20040229-bin-rtcw.zip"/>: Return to Castle Wolfenstein Binary Package with native compiled libraries (Linux x86 and Windows x86). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20040229-bin-sof2.zip?download" ! name="opendemo-20040229-bin-sof2.zip"/>: Soldier of Fortune II: Double Helix Binary Package with compiled libraries in bytecode (all SOF2 systems). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20040229-bin-stef.zip?download" ! name="opendemo-20040229-bin-stef.zip"/>: Star Trek Voyager: Elite Force Binary Package with compiled libraries in bytecode (all STEF systems). </item> <item> ! <htmlurl url="http://prdownloads.sourceforge.net/opendemo/opendemo-20040229-toolset.tar.gz?download" ! name="opendemo-20040229-toolset.tar.gz"/>: Toolset Package with LCC for Linux and Windows. </item> *************** *** 662,665 **** --- 662,672 ---- </item> + <item> + <linkend id="ODcut"/> + ODcut: OpenDemo Cutter. Program to manipulate OpenDemo files. + <htmlurl url="@SFCVS@opendemo/opendemo/tools/odcut/" name="opendemo/tools/odcut/"/>: Source code. + + </item> + </itemize> *************** *** 734,737 **** --- 741,770 ---- <newslist> + + <entry new="yes"> + <date>29th February, 2004</date> + <headline>SOF2 update, pipe feature added, ODcut, binary release</headline> + <content> + <p> + After getting several user requests, the SOF2 port is now finally based on the + unofficial SDK 1.03. The "leaning problem" (during replay the player always + leans to the left) in SOF2 remains. Someone with more understanding of the + inner SOF2 workings should have a look into it. + </p> + <p> + I added a new feature: reading from a named pipe. That means the replay mode + no longer has to read a file from disk but can also directly read the output of + another program writing to the same named pipe. This is an important step + towards ODcut, the OpenDemo editor currently in heavy development (CVS only). + </p> + <p> + Despite its pre-alpha state, I advertise already + <link idref="ODcut" name="ODcut, the OpenDemo Cutter"/>. + It has a (wxWidgets) GUI, can cut and paste parts of OpenDemo files, and can + feed its output directly into a named pipe for instant game reaction. + </p> + </content> + </entry> + <entry new="yes"> <date>8th October, 2003</date> |
|
From: Uwe G. <gi...@us...> - 2004-02-28 21:11:52
|
Update of /cvsroot/opendemo/opendemo/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31333 Modified Files: HISTORY Log Message: new od_pipe, od_zlib code is incorporated in all games Index: HISTORY =================================================================== RCS file: /cvsroot/opendemo/opendemo/doc/HISTORY,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** HISTORY 27 Feb 2004 23:37:45 -0000 1.16 --- HISTORY 28 Feb 2004 21:02:09 -0000 1.17 *************** *** 1,5 **** ! 2004/02/27 SOF2 rebased to unofficial 1.03 SDK ! 2003/11/28 --- 1,5 ---- ! 2004/02/29 SOF2 rebased to unofficial 1.03 SDK ! Adapted new Q3A code from november 2003 to JK2, RTCW, SOF2, and STEF. 2003/11/28 |
|
From: Uwe G. <gi...@us...> - 2004-02-28 21:10:08
|
Update of /cvsroot/opendemo/opendemo/src/stef/opendemo/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31003/opendemo Modified Files: od_filebuf.c od_filebuf.h od_fileio.c od_fileio.h od_main.c od_private.h odp_parse.c Log Message: adapt q3a changes (od_pipe and od_zlib) to ST:EF Index: od_filebuf.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/stef/opendemo/opendemo/od_filebuf.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_filebuf.c 16 Jun 2002 11:59:21 -0000 1.1 --- od_filebuf.c 28 Feb 2004 21:00:24 -0000 1.2 *************** *** 31,37 **** #ifdef RETURN_HACK extern int returnhack_int; - # define gzread(file, buf, len) (gzread(file, buf, len), returnhack_int) #endif /* make sure that we have at least len bytes in the buffer return value: number of bytes available between head and tail --- 31,37 ---- #ifdef RETURN_HACK extern int returnhack_int; #endif + /* make sure that we have at least len bytes in the buffer return value: number of bytes available between head and tail *************** *** 50,54 **** /* if the file is at the end, we can't get more data */ //if (fb->eof) ! if (gzeof(fb->fp)) return fb->size; --- 50,54 ---- /* if the file is at the end, we can't get more data */ //if (fb->eof) ! if (gen_eof(fb->fp)) return fb->size; *************** *** 97,101 **** /* we know, that we have enough space for count, so no check here any more */ ! while (count>0 && !gzeof(fb->fp)) { /* one loop data amount */ size_t ring_count; --- 97,101 ---- /* we know, that we have enough space for count, so no check here any more */ ! while (count>0 && !gen_eof(fb->fp)) { /* one loop data amount */ size_t ring_count; *************** *** 118,122 **** /* write ring_count new bytes at head */ ! bytesRead = gzread( fb->fp, mbGetBuffer(fb->mb) + fb->head, --- 118,122 ---- /* write ring_count new bytes at head */ ! bytesRead = gen_read( fb->fp, mbGetBuffer(fb->mb) + fb->head, *************** *** 167,171 **** return NULL; ! fb->fp = gzopen(filename, "rb"); if (fb->fp == NULL) { odfree(fb); --- 167,171 ---- return NULL; ! fb->fp = gen_open(filename, "rb"); if (fb->fp == NULL) { odfree(fb); *************** *** 175,179 **** fb->mb = mbCreate(0, 1); if (fb->mb == NULL) { ! gzclose(fb->fp); odfree(fb); return NULL; --- 175,179 ---- fb->mb = mbCreate(0, 1); if (fb->mb == NULL) { ! gen_close(fb->fp); odfree(fb); return NULL; *************** *** 196,200 **** if (fb->fp != NULL) ! gzclose(fb->fp); mbFree(fb->mb); --- 196,200 ---- if (fb->fp != NULL) ! gen_close(fb->fp); mbFree(fb->mb); *************** *** 208,215 **** fbEOF(fb_t* fb) { ! odfbDebug(("fbEOF() = %d\n", gzeof(fb->fp) && fb->size == 0)); //return (fb->eof && fb->reof); ! return (gzeof(fb->fp) && fb->size == 0); } #endif --- 208,215 ---- fbEOF(fb_t* fb) { ! odfbDebug(("fbEOF() = %d\n", gen_eof(fb->fp) && fb->size == 0)); //return (fb->eof && fb->reof); ! return (gen_eof(fb->fp) && fb->size == 0); } #endif Index: od_filebuf.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/stef/opendemo/opendemo/od_filebuf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_filebuf.h 16 Jun 2002 11:59:21 -0000 1.1 --- od_filebuf.h 28 Feb 2004 21:00:24 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- #include "od_fileio.h" #include "od_membuf.h" + #include "od_private.h" /* for od */ #include "zlib/zlib.h" *************** *** 30,33 **** --- 31,58 ---- #endif + + #define HAVE_ZLIB 1 + + + /* We can switch off zlib at compile time and at runtime. + * Only the zlib read function needs the return hack. + */ + #if HAVE_ZLIB + #define gen_eof(x) ((od.cv.od_zlib.integer) ? (gzeof(x)) : (odfeof(x))) + #ifdef RETURN_HACK + # define gen_read(f,b,l) ((od.cv.od_zlib.integer) ? ((size_t)gzread(f,b,l),returnhack_int) : (odfread(b,1,l,f))) + #else + # define gen_read(f,b,l) ((od.cv.od_zlib.integer) ? ((size_t)gzread(f,b,l)) : (odfread(b,1,l,f))) + #endif + #define gen_open(f,m) ((od.cv.od_zlib.integer) ? (gzopen(f,m)) : (odfopen(f,m))) + #define gen_close(f) ((od.cv.od_zlib.integer) ? (gzclose(f)) : (odfclose(f))) + #else + #define gen_eof(x) (odfeof(x)) + #define gen_read(f,b,l) (odfread(b,1,l,f)) + #define gen_open(f,m) (odfopen(f,m)) + #define gen_close(f) ((odfclose(f))) + #endif + + typedef struct { gzFile fp; /* input file stream, may be compressed or uncompressed */ *************** *** 44,48 **** int fbEOF(fb_t*); #else ! #define fbEOF(fb) (gzeof((fb)->fp) && (fb)->size == 0) #endif size_t fbRead(fb_t*, void*, size_t); --- 69,73 ---- int fbEOF(fb_t*); #else ! #define fbEOF(fb) (gen_eof((fb)->fp) && (fb)->size == 0) #endif size_t fbRead(fb_t*, void*, size_t); Index: od_fileio.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/stef/opendemo/opendemo/od_fileio.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_fileio.c 16 Jun 2002 11:59:21 -0000 1.1 --- od_fileio.c 28 Feb 2004 21:00:24 -0000 1.2 *************** *** 30,50 **** odFILE *odstderr = &real_stderr; ! odFILE* odfopen(const char* filename, const char* mode) { odFILE* stream; ! odFileDebug(("odfopen(\"%s\", \"%s\")\n", filename, mode)); stream = odmalloc(sizeof(odFILE)); ! if (stream == NULL) ! return NULL; stream->filename = odstrdup(filename); if (stream->filename == NULL) { ! odfree(stream); ! return NULL; } --- 30,56 ---- odFILE *odstderr = &real_stderr; ! #define CFREE(x) { if(x!=NULL) { odfree(x); (x)=NULL; } } odFILE* odfopen(const char* filename, const char* mode) { + char *fname = "odfopen"; odFILE* stream; ! odFileDebug(("%s(\"%s\", \"%s\")\n", fname, filename, mode)); stream = odmalloc(sizeof(odFILE)); ! if (stream == NULL) { ! odFileDebug(("%s: can't allocate odFILE struct: %d bytes\n", ! fname, sizeof(odFILE))); ! goto out; ! } stream->filename = odstrdup(filename); if (stream->filename == NULL) { ! odFileDebug(("%s: can't allocate file name buffer: %d bytes\n", ! fname, strlen(filename) + 1)); ! CFREE(stream); ! goto out; } *************** *** 67,77 **** stream->len = trap_FS_FOpenFile(filename, &stream->fd, stream->mode); if (stream->fd == 0) { ! odfree(stream->filename); ! odfree(stream); ! return NULL; } stream->pos = 0; return stream; } --- 73,91 ---- stream->len = trap_FS_FOpenFile(filename, &stream->fd, stream->mode); if (stream->fd == 0) { ! odFileDebug(("%s: trap_FS_FOpenFile syscall failed\n", ! fname)); ! CFREE(stream->filename); ! CFREE(stream); ! goto out; } stream->pos = 0; + out: + if (stream == NULL) { + odFileDebug(("%s failed\n", + fname)); + } + return stream; } *************** *** 96,99 **** --- 110,119 ---- odFileDebug(("odfeof(\"%s\") = %d\n", stream->filename, stream->pos >= stream->len)); + if (od.cv.od_pipe.integer) { + odFileDebug(("odfeof(\"%s\"): od_pipe in use\n", + stream->filename)); + return 0; + } + return stream->pos >= stream->len; } *************** *** 187,190 **** --- 207,211 ---- odfread(void* buffer, size_t size, size_t count, odFILE* stream) { + char *fname = "odfread"; size_t bytesToRead; *************** *** 193,201 **** /* check if we will pass the end of the file */ ! if (stream->pos + size*count > stream->len) bytesToRead = ((stream->len - stream->pos) / size) * size; else bytesToRead = size*count; trap_FS_Read(buffer, (int)bytesToRead, stream->fd); --- 214,225 ---- /* check if we will pass the end of the file */ ! if ((od.cv.od_pipe.integer==0) && (stream->pos + size*count > stream->len)) bytesToRead = ((stream->len - stream->pos) / size) * size; else bytesToRead = size*count; + odFileDebug(("%s: bytesToRead=%d\n", + fname, bytesToRead)); + trap_FS_Read(buffer, (int)bytesToRead, stream->fd); *************** *** 203,208 **** stream->pos += size*count; ! odFileDebug(("odfread(\"%s\", size=%d, count=%d) = %d\n", stream->filename, size, count, --- 227,234 ---- stream->pos += size*count; ! odFileDebug(("%s(\"%s\" (fd=%d), size=%d, count=%d) = %d\n", ! fname, stream->filename, + stream->fd, size, count, Index: od_fileio.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/stef/opendemo/opendemo/od_fileio.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_fileio.h 16 Jun 2002 11:59:21 -0000 1.1 --- od_fileio.h 28 Feb 2004 21:00:24 -0000 1.2 *************** *** 39,44 **** void odrewind(odFILE*); #else ! #define odfeof(stream) ((stream)->pos >= (stream)->len) ! #define odftell(stream) (long)((stream)->pos) #define odrewind(stream) odfseek(stream, 0, SEEK_SET) #endif --- 39,44 ---- void odrewind(odFILE*); #else ! #define odfeof(stream) (od.cv.od_pipe.integer ? 0 : ((odFILE*)(stream))->pos >= (((odFILE*)(stream))->len)) ! #define odftell(stream) (long)(((odFILE*)(stream))->pos) #define odrewind(stream) odfseek(stream, 0, SEEK_SET) #endif Index: od_main.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/stef/opendemo/opendemo/od_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** od_main.c 5 Oct 2003 19:11:21 -0000 1.2 --- od_main.c 28 Feb 2004 21:00:24 -0000 1.3 *************** *** 50,53 **** --- 50,55 ---- {&od.cv.od_log, "od_log", "", CVAR_LATCH, 0, qfalse, qfalse}, {&od.cv.od_logSync, "od_logSync", "0", CVAR_LATCH, 0, qfalse, qfalse}, + {&od.cv.od_zlib, "od_zlib", "1", CVAR_LATCH, 0, qfalse, qfalse}, + {&od.cv.od_pipe, "od_pipe", "0", CVAR_LATCH, 0, qfalse, qfalse}, /* used only on playback */ Index: od_private.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/stef/opendemo/opendemo/od_private.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** od_private.h 5 Oct 2003 19:11:21 -0000 1.2 --- od_private.h 28 Feb 2004 21:00:24 -0000 1.3 *************** *** 179,182 **** --- 179,184 ---- vmCvar_t od_mode; vmCvar_t od_spectator; + vmCvar_t od_zlib; + vmCvar_t od_pipe; } cv; } od_t; Index: odp_parse.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/stef/opendemo/opendemo/odp_parse.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** odp_parse.c 5 Oct 2003 19:11:21 -0000 1.2 --- odp_parse.c 28 Feb 2004 21:00:24 -0000 1.3 *************** *** 622,637 **** strcpy ((char *)filename, str); ! fp = odfopen(filename, "rb"); ! // HMage: if the demo couldn't be found, add an extension and try again. ! if (!fp) { ! if (Q_stricmp(filename + strlen(filename) - strlen(OD_FILEEXT), OD_FILEEXT)) { ! Q_strcat (filename, MAX_STRING_CHARS, OD_FILEEXT); ! trap_Cvar_Set("od_demofile", filename); } - } else { - odfclose (fp); } - //#endif if (xmlParseFile(filename, &odpSAX, &parserState) < 0) --- 622,640 ---- strcpy ((char *)filename, str); ! /* pipe open/close destroys everything, so it might be better to ! change the API of xmlParseFile to file buffer */ ! if (od.cv.od_pipe.integer == 0) { ! fp = odfopen(filename, "rb"); ! /* HMage: if the demo couldn't be found, add an extension and try again. */ ! if (!fp) { ! if (Q_stricmp(filename + strlen(filename) - strlen(OD_FILEEXT), OD_FILEEXT)) { ! Q_strcat (filename, MAX_STRING_CHARS, OD_FILEEXT); ! trap_Cvar_Set("od_demofile", filename); ! } ! } else { ! odfclose (fp); } } if (xmlParseFile(filename, &odpSAX, &parserState) < 0) |
|
From: Uwe G. <gi...@us...> - 2004-02-28 20:58:52
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28607 Modified Files: od_filebuf.c od_filebuf.h od_fileio.c od_fileio.h od_main.c od_private.h odp_parse.c Log Message: adapting the Q3A changes (od_pipe, od_zlib) to SOF2 Index: od_filebuf.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo/od_filebuf.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_filebuf.c 26 May 2002 14:16:31 -0000 1.1 --- od_filebuf.c 28 Feb 2004 20:49:08 -0000 1.2 *************** *** 31,37 **** #ifdef RETURN_HACK extern int returnhack_int; - # define gzread(file, buf, len) (gzread(file, buf, len), returnhack_int) #endif /* make sure that we have at least len bytes in the buffer return value: number of bytes available between head and tail --- 31,37 ---- #ifdef RETURN_HACK extern int returnhack_int; #endif + /* make sure that we have at least len bytes in the buffer return value: number of bytes available between head and tail *************** *** 50,54 **** /* if the file is at the end, we can't get more data */ //if (fb->eof) ! if (gzeof(fb->fp)) return fb->size; --- 50,54 ---- /* if the file is at the end, we can't get more data */ //if (fb->eof) ! if (gen_eof(fb->fp)) return fb->size; *************** *** 97,101 **** /* we know, that we have enough space for count, so no check here any more */ ! while (count>0 && !gzeof(fb->fp)) { /* one loop data amount */ size_t ring_count; --- 97,101 ---- /* we know, that we have enough space for count, so no check here any more */ ! while (count>0 && !gen_eof(fb->fp)) { /* one loop data amount */ size_t ring_count; *************** *** 118,122 **** /* write ring_count new bytes at head */ ! bytesRead = gzread( fb->fp, mbGetBuffer(fb->mb) + fb->head, --- 118,122 ---- /* write ring_count new bytes at head */ ! bytesRead = gen_read( fb->fp, mbGetBuffer(fb->mb) + fb->head, *************** *** 167,171 **** return NULL; ! fb->fp = gzopen(filename, "rb"); if (fb->fp == NULL) { odfree(fb); --- 167,171 ---- return NULL; ! fb->fp = gen_open(filename, "rb"); if (fb->fp == NULL) { odfree(fb); *************** *** 175,179 **** fb->mb = mbCreate(0, 1); if (fb->mb == NULL) { ! gzclose(fb->fp); odfree(fb); return NULL; --- 175,179 ---- fb->mb = mbCreate(0, 1); if (fb->mb == NULL) { ! gen_close(fb->fp); odfree(fb); return NULL; *************** *** 196,200 **** if (fb->fp != NULL) ! gzclose(fb->fp); mbFree(fb->mb); --- 196,200 ---- if (fb->fp != NULL) ! gen_close(fb->fp); mbFree(fb->mb); *************** *** 208,215 **** fbEOF(fb_t* fb) { ! odfbDebug(("fbEOF() = %d\n", gzeof(fb->fp) && fb->size == 0)); //return (fb->eof && fb->reof); ! return (gzeof(fb->fp) && fb->size == 0); } #endif --- 208,215 ---- fbEOF(fb_t* fb) { ! odfbDebug(("fbEOF() = %d\n", gen_eof(fb->fp) && fb->size == 0)); //return (fb->eof && fb->reof); ! return (gen_eof(fb->fp) && fb->size == 0); } #endif Index: od_filebuf.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo/od_filebuf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_filebuf.h 26 May 2002 14:16:31 -0000 1.1 --- od_filebuf.h 28 Feb 2004 20:49:08 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- #include "od_fileio.h" #include "od_membuf.h" + #include "od_private.h" /* for od */ #include "zlib/zlib.h" *************** *** 30,33 **** --- 31,58 ---- #endif + + #define HAVE_ZLIB 1 + + + /* We can switch off zlib at compile time and at runtime. + * Only the zlib read function needs the return hack. + */ + #if HAVE_ZLIB + #define gen_eof(x) ((od.cv.od_zlib.integer) ? (gzeof(x)) : (odfeof(x))) + #ifdef RETURN_HACK + # define gen_read(f,b,l) ((od.cv.od_zlib.integer) ? ((size_t)gzread(f,b,l),returnhack_int) : (odfread(b,1,l,f))) + #else + # define gen_read(f,b,l) ((od.cv.od_zlib.integer) ? ((size_t)gzread(f,b,l)) : (odfread(b,1,l,f))) + #endif + #define gen_open(f,m) ((od.cv.od_zlib.integer) ? (gzopen(f,m)) : (odfopen(f,m))) + #define gen_close(f) ((od.cv.od_zlib.integer) ? (gzclose(f)) : (odfclose(f))) + #else + #define gen_eof(x) (odfeof(x)) + #define gen_read(f,b,l) (odfread(b,1,l,f)) + #define gen_open(f,m) (odfopen(f,m)) + #define gen_close(f) ((odfclose(f))) + #endif + + typedef struct { gzFile fp; /* input file stream, may be compressed or uncompressed */ *************** *** 44,48 **** int fbEOF(fb_t*); #else ! #define fbEOF(fb) (gzeof((fb)->fp) && (fb)->size == 0) #endif size_t fbRead(fb_t*, void*, size_t); --- 69,73 ---- int fbEOF(fb_t*); #else ! #define fbEOF(fb) (gen_eof((fb)->fp) && (fb)->size == 0) #endif size_t fbRead(fb_t*, void*, size_t); Index: od_fileio.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo/od_fileio.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_fileio.c 26 May 2002 14:16:31 -0000 1.1 --- od_fileio.c 28 Feb 2004 20:49:08 -0000 1.2 *************** *** 30,50 **** odFILE *odstderr = &real_stderr; ! odFILE* odfopen(const char* filename, const char* mode) { odFILE* stream; ! odFileDebug(("odfopen(\"%s\", \"%s\")\n", filename, mode)); stream = odmalloc(sizeof(odFILE)); ! if (stream == NULL) ! return NULL; stream->filename = odstrdup(filename); if (stream->filename == NULL) { ! odfree(stream); ! return NULL; } --- 30,56 ---- odFILE *odstderr = &real_stderr; ! #define CFREE(x) { if(x!=NULL) { odfree(x); (x)=NULL; } } odFILE* odfopen(const char* filename, const char* mode) { + char *fname = "odfopen"; odFILE* stream; ! odFileDebug(("%s(\"%s\", \"%s\")\n", fname, filename, mode)); stream = odmalloc(sizeof(odFILE)); ! if (stream == NULL) { ! odFileDebug(("%s: can't allocate odFILE struct: %d bytes\n", ! fname, sizeof(odFILE))); ! goto out; ! } stream->filename = odstrdup(filename); if (stream->filename == NULL) { ! odFileDebug(("%s: can't allocate file name buffer: %d bytes\n", ! fname, strlen(filename) + 1)); ! CFREE(stream); ! goto out; } *************** *** 67,77 **** stream->len = trap_FS_FOpenFile(filename, &stream->fd, stream->mode); if (stream->fd == 0) { ! odfree(stream->filename); ! odfree(stream); ! return NULL; } stream->pos = 0; return stream; } --- 73,91 ---- stream->len = trap_FS_FOpenFile(filename, &stream->fd, stream->mode); if (stream->fd == 0) { ! odFileDebug(("%s: trap_FS_FOpenFile syscall failed\n", ! fname)); ! CFREE(stream->filename); ! CFREE(stream); ! goto out; } stream->pos = 0; + out: + if (stream == NULL) { + odFileDebug(("%s failed\n", + fname)); + } + return stream; } *************** *** 96,99 **** --- 110,119 ---- odFileDebug(("odfeof(\"%s\") = %d\n", stream->filename, stream->pos >= stream->len)); + if (od.cv.od_pipe.integer) { + odFileDebug(("odfeof(\"%s\"): od_pipe in use\n", + stream->filename)); + return 0; + } + return stream->pos >= stream->len; } *************** *** 187,190 **** --- 207,211 ---- odfread(void* buffer, size_t size, size_t count, odFILE* stream) { + char *fname = "odfread"; size_t bytesToRead; *************** *** 193,201 **** /* check if we will pass the end of the file */ ! if (stream->pos + size*count > stream->len) bytesToRead = ((stream->len - stream->pos) / size) * size; else bytesToRead = size*count; trap_FS_Read(buffer, (int)bytesToRead, stream->fd); --- 214,225 ---- /* check if we will pass the end of the file */ ! if ((od.cv.od_pipe.integer==0) && (stream->pos + size*count > stream->len)) bytesToRead = ((stream->len - stream->pos) / size) * size; else bytesToRead = size*count; + odFileDebug(("%s: bytesToRead=%d\n", + fname, bytesToRead)); + trap_FS_Read(buffer, (int)bytesToRead, stream->fd); *************** *** 203,208 **** stream->pos += size*count; ! odFileDebug(("odfread(\"%s\", size=%d, count=%d) = %d\n", stream->filename, size, count, --- 227,234 ---- stream->pos += size*count; ! odFileDebug(("%s(\"%s\" (fd=%d), size=%d, count=%d) = %d\n", ! fname, stream->filename, + stream->fd, size, count, Index: od_fileio.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo/od_fileio.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_fileio.h 26 May 2002 14:16:31 -0000 1.1 --- od_fileio.h 28 Feb 2004 20:49:08 -0000 1.2 *************** *** 39,44 **** void odrewind(odFILE*); #else ! #define odfeof(stream) ((stream)->pos >= (stream)->len) ! #define odftell(stream) (long)((stream)->pos) #define odrewind(stream) odfseek(stream, 0, SEEK_SET) #endif --- 39,44 ---- void odrewind(odFILE*); #else ! #define odfeof(stream) (od.cv.od_pipe.integer ? 0 : ((odFILE*)(stream))->pos >= (((odFILE*)(stream))->len)) ! #define odftell(stream) (long)(((odFILE*)(stream))->pos) #define odrewind(stream) odfseek(stream, 0, SEEK_SET) #endif Index: od_main.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo/od_main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** od_main.c 5 Oct 2003 18:26:06 -0000 1.4 --- od_main.c 28 Feb 2004 20:49:08 -0000 1.5 *************** *** 50,53 **** --- 50,55 ---- {&od.cv.od_log, "od_log", "", CVAR_LATCH, 0, qfalse, qfalse}, {&od.cv.od_logSync, "od_logSync", "0", CVAR_LATCH, 0, qfalse, qfalse}, + {&od.cv.od_zlib, "od_zlib", "1", CVAR_LATCH, 0, qfalse, qfalse}, + {&od.cv.od_pipe, "od_pipe", "0", CVAR_LATCH, 0, qfalse, qfalse}, /* used only on playback */ Index: od_private.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo/od_private.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** od_private.h 5 Oct 2003 18:26:06 -0000 1.4 --- od_private.h 28 Feb 2004 20:49:08 -0000 1.5 *************** *** 179,182 **** --- 179,184 ---- vmCvar_t od_mode; vmCvar_t od_spectator; + vmCvar_t od_zlib; + vmCvar_t od_pipe; } cv; } od_t; Index: odp_parse.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo/odp_parse.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** odp_parse.c 5 Oct 2003 18:26:06 -0000 1.4 --- odp_parse.c 28 Feb 2004 20:49:08 -0000 1.5 *************** *** 622,637 **** strcpy ((char *)filename, str); ! fp = odfopen(filename, "rb"); ! // HMage: if the demo couldn't be found, add an extension and try again. ! if (!fp) { ! if (Q_stricmp(filename + strlen(filename) - strlen(OD_FILEEXT), OD_FILEEXT)) { ! Q_strcat (filename, MAX_STRING_CHARS, OD_FILEEXT); ! trap_Cvar_Set("od_demofile", filename); } - } else { - odfclose (fp); } - //#endif if (xmlParseFile(filename, &odpSAX, &parserState) < 0) --- 622,640 ---- strcpy ((char *)filename, str); ! /* pipe open/close destroys everything, so it might be better to ! change the API of xmlParseFile to file buffer */ ! if (od.cv.od_pipe.integer == 0) { ! fp = odfopen(filename, "rb"); ! /* HMage: if the demo couldn't be found, add an extension and try again. */ ! if (!fp) { ! if (Q_stricmp(filename + strlen(filename) - strlen(OD_FILEEXT), OD_FILEEXT)) { ! Q_strcat (filename, MAX_STRING_CHARS, OD_FILEEXT); ! trap_Cvar_Set("od_demofile", filename); ! } ! } else { ! odfclose (fp); } } if (xmlParseFile(filename, &odpSAX, &parserState) < 0) |
Update of /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23889 Modified Files: od_filebuf.c od_filebuf.h od_fileio.c od_fileio.h od_main.c od_private.h odp_parse.c Log Message: copy od_pipe and od_zlib changes fro q3a over to RTCW Index: od_filebuf.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo/od_filebuf.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_filebuf.c 14 Apr 2002 14:44:33 -0000 1.1 --- od_filebuf.c 28 Feb 2004 20:27:17 -0000 1.2 *************** *** 31,37 **** #ifdef RETURN_HACK extern int returnhack_int; - # define gzread(file, buf, len) (gzread(file, buf, len), returnhack_int) #endif /* make sure that we have at least len bytes in the buffer return value: number of bytes available between head and tail --- 31,37 ---- #ifdef RETURN_HACK extern int returnhack_int; #endif + /* make sure that we have at least len bytes in the buffer return value: number of bytes available between head and tail *************** *** 50,54 **** /* if the file is at the end, we can't get more data */ //if (fb->eof) ! if (gzeof(fb->fp)) return fb->size; --- 50,54 ---- /* if the file is at the end, we can't get more data */ //if (fb->eof) ! if (gen_eof(fb->fp)) return fb->size; *************** *** 97,101 **** /* we know, that we have enough space for count, so no check here any more */ ! while (count>0 && !gzeof(fb->fp)) { /* one loop data amount */ size_t ring_count; --- 97,101 ---- /* we know, that we have enough space for count, so no check here any more */ ! while (count>0 && !gen_eof(fb->fp)) { /* one loop data amount */ size_t ring_count; *************** *** 118,122 **** /* write ring_count new bytes at head */ ! bytesRead = gzread( fb->fp, mbGetBuffer(fb->mb) + fb->head, --- 118,122 ---- /* write ring_count new bytes at head */ ! bytesRead = gen_read( fb->fp, mbGetBuffer(fb->mb) + fb->head, *************** *** 167,171 **** return NULL; ! fb->fp = gzopen(filename, "rb"); if (fb->fp == NULL) { odfree(fb); --- 167,171 ---- return NULL; ! fb->fp = gen_open(filename, "rb"); if (fb->fp == NULL) { odfree(fb); *************** *** 175,179 **** fb->mb = mbCreate(0, 1); if (fb->mb == NULL) { ! gzclose(fb->fp); odfree(fb); return NULL; --- 175,179 ---- fb->mb = mbCreate(0, 1); if (fb->mb == NULL) { ! gen_close(fb->fp); odfree(fb); return NULL; *************** *** 196,200 **** if (fb->fp != NULL) ! gzclose(fb->fp); mbFree(fb->mb); --- 196,200 ---- if (fb->fp != NULL) ! gen_close(fb->fp); mbFree(fb->mb); *************** *** 208,215 **** fbEOF(fb_t* fb) { ! odfbDebug(("fbEOF() = %d\n", gzeof(fb->fp) && fb->size == 0)); //return (fb->eof && fb->reof); ! return (gzeof(fb->fp) && fb->size == 0); } #endif --- 208,215 ---- fbEOF(fb_t* fb) { ! odfbDebug(("fbEOF() = %d\n", gen_eof(fb->fp) && fb->size == 0)); //return (fb->eof && fb->reof); ! return (gen_eof(fb->fp) && fb->size == 0); } #endif Index: od_filebuf.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo/od_filebuf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_filebuf.h 14 Apr 2002 14:44:33 -0000 1.1 --- od_filebuf.h 28 Feb 2004 20:27:17 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- #include "od_fileio.h" #include "od_membuf.h" + #include "od_private.h" /* for od */ #include "zlib/zlib.h" *************** *** 30,33 **** --- 31,58 ---- #endif + + #define HAVE_ZLIB 1 + + + /* We can switch off zlib at compile time and at runtime. + * Only the zlib read function needs the return hack. + */ + #if HAVE_ZLIB + #define gen_eof(x) ((od.cv.od_zlib.integer) ? (gzeof(x)) : (odfeof(x))) + #ifdef RETURN_HACK + # define gen_read(f,b,l) ((od.cv.od_zlib.integer) ? ((size_t)gzread(f,b,l),returnhack_int) : (odfread(b,1,l,f))) + #else + # define gen_read(f,b,l) ((od.cv.od_zlib.integer) ? ((size_t)gzread(f,b,l)) : (odfread(b,1,l,f))) + #endif + #define gen_open(f,m) ((od.cv.od_zlib.integer) ? (gzopen(f,m)) : (odfopen(f,m))) + #define gen_close(f) ((od.cv.od_zlib.integer) ? (gzclose(f)) : (odfclose(f))) + #else + #define gen_eof(x) (odfeof(x)) + #define gen_read(f,b,l) (odfread(b,1,l,f)) + #define gen_open(f,m) (odfopen(f,m)) + #define gen_close(f) ((odfclose(f))) + #endif + + typedef struct { gzFile fp; /* input file stream, may be compressed or uncompressed */ *************** *** 44,48 **** int fbEOF(fb_t*); #else ! #define fbEOF(fb) (gzeof((fb)->fp) && (fb)->size == 0) #endif size_t fbRead(fb_t*, void*, size_t); --- 69,73 ---- int fbEOF(fb_t*); #else ! #define fbEOF(fb) (gen_eof((fb)->fp) && (fb)->size == 0) #endif size_t fbRead(fb_t*, void*, size_t); Index: od_fileio.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo/od_fileio.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_fileio.c 14 Apr 2002 14:44:33 -0000 1.1 --- od_fileio.c 28 Feb 2004 20:27:17 -0000 1.2 *************** *** 30,50 **** odFILE *odstderr = &real_stderr; ! odFILE* odfopen(const char* filename, const char* mode) { odFILE* stream; ! odFileDebug(("odfopen(\"%s\", \"%s\")\n", filename, mode)); stream = odmalloc(sizeof(odFILE)); ! if (stream == NULL) ! return NULL; stream->filename = odstrdup(filename); if (stream->filename == NULL) { ! odfree(stream); ! return NULL; } --- 30,56 ---- odFILE *odstderr = &real_stderr; ! #define CFREE(x) { if(x!=NULL) { odfree(x); (x)=NULL; } } odFILE* odfopen(const char* filename, const char* mode) { + char *fname = "odfopen"; odFILE* stream; ! odFileDebug(("%s(\"%s\", \"%s\")\n", fname, filename, mode)); stream = odmalloc(sizeof(odFILE)); ! if (stream == NULL) { ! odFileDebug(("%s: can't allocate odFILE struct: %d bytes\n", ! fname, sizeof(odFILE))); ! goto out; ! } stream->filename = odstrdup(filename); if (stream->filename == NULL) { ! odFileDebug(("%s: can't allocate file name buffer: %d bytes\n", ! fname, strlen(filename) + 1)); ! CFREE(stream); ! goto out; } *************** *** 67,77 **** stream->len = trap_FS_FOpenFile(filename, &stream->fd, stream->mode); if (stream->fd == 0) { ! odfree(stream->filename); ! odfree(stream); ! return NULL; } stream->pos = 0; return stream; } --- 73,91 ---- stream->len = trap_FS_FOpenFile(filename, &stream->fd, stream->mode); if (stream->fd == 0) { ! odFileDebug(("%s: trap_FS_FOpenFile syscall failed\n", ! fname)); ! CFREE(stream->filename); ! CFREE(stream); ! goto out; } stream->pos = 0; + out: + if (stream == NULL) { + odFileDebug(("%s failed\n", + fname)); + } + return stream; } *************** *** 96,99 **** --- 110,119 ---- odFileDebug(("odfeof(\"%s\") = %d\n", stream->filename, stream->pos >= stream->len)); + if (od.cv.od_pipe.integer) { + odFileDebug(("odfeof(\"%s\"): od_pipe in use\n", + stream->filename)); + return 0; + } + return stream->pos >= stream->len; } *************** *** 187,190 **** --- 207,211 ---- odfread(void* buffer, size_t size, size_t count, odFILE* stream) { + char *fname = "odfread"; size_t bytesToRead; *************** *** 193,201 **** /* check if we will pass the end of the file */ ! if (stream->pos + size*count > stream->len) bytesToRead = ((stream->len - stream->pos) / size) * size; else bytesToRead = size*count; trap_FS_Read(buffer, (int)bytesToRead, stream->fd); --- 214,225 ---- /* check if we will pass the end of the file */ ! if ((od.cv.od_pipe.integer==0) && (stream->pos + size*count > stream->len)) bytesToRead = ((stream->len - stream->pos) / size) * size; else bytesToRead = size*count; + odFileDebug(("%s: bytesToRead=%d\n", + fname, bytesToRead)); + trap_FS_Read(buffer, (int)bytesToRead, stream->fd); *************** *** 203,208 **** stream->pos += size*count; ! odFileDebug(("odfread(\"%s\", size=%d, count=%d) = %d\n", stream->filename, size, count, --- 227,234 ---- stream->pos += size*count; ! odFileDebug(("%s(\"%s\" (fd=%d), size=%d, count=%d) = %d\n", ! fname, stream->filename, + stream->fd, size, count, Index: od_fileio.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo/od_fileio.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_fileio.h 14 Apr 2002 14:44:33 -0000 1.1 --- od_fileio.h 28 Feb 2004 20:27:17 -0000 1.2 *************** *** 39,44 **** void odrewind(odFILE*); #else ! #define odfeof(stream) ((stream)->pos >= (stream)->len) ! #define odftell(stream) (long)((stream)->pos) #define odrewind(stream) odfseek(stream, 0, SEEK_SET) #endif --- 39,44 ---- void odrewind(odFILE*); #else ! #define odfeof(stream) (od.cv.od_pipe.integer ? 0 : ((odFILE*)(stream))->pos >= (((odFILE*)(stream))->len)) ! #define odftell(stream) (long)(((odFILE*)(stream))->pos) #define odrewind(stream) odfseek(stream, 0, SEEK_SET) #endif Index: od_main.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo/od_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** od_main.c 5 Oct 2003 18:44:14 -0000 1.2 --- od_main.c 28 Feb 2004 20:27:17 -0000 1.3 *************** *** 50,53 **** --- 50,55 ---- {&od.cv.od_log, "od_log", "", CVAR_LATCH, 0, qfalse, qfalse}, {&od.cv.od_logSync, "od_logSync", "0", CVAR_LATCH, 0, qfalse, qfalse}, + {&od.cv.od_zlib, "od_zlib", "1", CVAR_LATCH, 0, qfalse, qfalse}, + {&od.cv.od_pipe, "od_pipe", "0", CVAR_LATCH, 0, qfalse, qfalse}, /* used only on playback */ Index: od_private.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo/od_private.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** od_private.h 5 Oct 2003 18:44:14 -0000 1.3 --- od_private.h 28 Feb 2004 20:27:17 -0000 1.4 *************** *** 179,182 **** --- 179,184 ---- vmCvar_t od_mode; vmCvar_t od_spectator; + vmCvar_t od_zlib; + vmCvar_t od_pipe; } cv; } od_t; Index: odp_parse.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/rtcw-mp/opendemo/opendemo/odp_parse.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** odp_parse.c 5 Oct 2003 18:58:48 -0000 1.4 --- odp_parse.c 28 Feb 2004 20:27:17 -0000 1.5 *************** *** 622,637 **** strcpy ((char *)filename, str); ! fp = odfopen(filename, "rb"); ! // HMage: if the demo couldn't be found, add an extension and try again. ! if (!fp) { ! if (Q_stricmp(filename + strlen(filename) - strlen(OD_FILEEXT), OD_FILEEXT)) { ! Q_strcat (filename, MAX_STRING_CHARS, OD_FILEEXT); ! trap_Cvar_Set("od_demofile", filename); } - } else { - odfclose (fp); } - //#endif if (xmlParseFile(filename, &odpSAX, &parserState) < 0) --- 622,640 ---- strcpy ((char *)filename, str); ! /* pipe open/close destroys everything, so it might be better to ! change the API of xmlParseFile to file buffer */ ! if (od.cv.od_pipe.integer == 0) { ! fp = odfopen(filename, "rb"); ! /* HMage: if the demo couldn't be found, add an extension and try again. */ ! if (!fp) { ! if (Q_stricmp(filename + strlen(filename) - strlen(OD_FILEEXT), OD_FILEEXT)) { ! Q_strcat (filename, MAX_STRING_CHARS, OD_FILEEXT); ! trap_Cvar_Set("od_demofile", filename); ! } ! } else { ! odfclose (fp); } } if (xmlParseFile(filename, &odpSAX, &parserState) < 0) |
|
From: Uwe G. <gi...@us...> - 2004-02-28 19:57:19
|
Update of /cvsroot/opendemo/opendemo/src/jk2/opendemo/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14618 Modified Files: od_filebuf.c od_filebuf.h od_fileio.c od_fileio.h od_main.c od_private.h odp_parse.c Log Message: move Q3A changes od_pipe and od_zlib over to JK2 Index: od_filebuf.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/jk2/opendemo/opendemo/od_filebuf.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_filebuf.c 1 Jun 2002 21:34:37 -0000 1.1 --- od_filebuf.c 28 Feb 2004 19:47:32 -0000 1.2 *************** *** 31,37 **** #ifdef RETURN_HACK extern int returnhack_int; - # define gzread(file, buf, len) (gzread(file, buf, len), returnhack_int) #endif /* make sure that we have at least len bytes in the buffer return value: number of bytes available between head and tail --- 31,37 ---- #ifdef RETURN_HACK extern int returnhack_int; #endif + /* make sure that we have at least len bytes in the buffer return value: number of bytes available between head and tail *************** *** 50,54 **** /* if the file is at the end, we can't get more data */ //if (fb->eof) ! if (gzeof(fb->fp)) return fb->size; --- 50,54 ---- /* if the file is at the end, we can't get more data */ //if (fb->eof) ! if (gen_eof(fb->fp)) return fb->size; *************** *** 97,101 **** /* we know, that we have enough space for count, so no check here any more */ ! while (count>0 && !gzeof(fb->fp)) { /* one loop data amount */ size_t ring_count; --- 97,101 ---- /* we know, that we have enough space for count, so no check here any more */ ! while (count>0 && !gen_eof(fb->fp)) { /* one loop data amount */ size_t ring_count; *************** *** 118,122 **** /* write ring_count new bytes at head */ ! bytesRead = gzread( fb->fp, mbGetBuffer(fb->mb) + fb->head, --- 118,122 ---- /* write ring_count new bytes at head */ ! bytesRead = gen_read( fb->fp, mbGetBuffer(fb->mb) + fb->head, *************** *** 167,171 **** return NULL; ! fb->fp = gzopen(filename, "rb"); if (fb->fp == NULL) { odfree(fb); --- 167,171 ---- return NULL; ! fb->fp = gen_open(filename, "rb"); if (fb->fp == NULL) { odfree(fb); *************** *** 175,179 **** fb->mb = mbCreate(0, 1); if (fb->mb == NULL) { ! gzclose(fb->fp); odfree(fb); return NULL; --- 175,179 ---- fb->mb = mbCreate(0, 1); if (fb->mb == NULL) { ! gen_close(fb->fp); odfree(fb); return NULL; *************** *** 196,200 **** if (fb->fp != NULL) ! gzclose(fb->fp); mbFree(fb->mb); --- 196,200 ---- if (fb->fp != NULL) ! gen_close(fb->fp); mbFree(fb->mb); *************** *** 208,215 **** fbEOF(fb_t* fb) { ! odfbDebug(("fbEOF() = %d\n", gzeof(fb->fp) && fb->size == 0)); //return (fb->eof && fb->reof); ! return (gzeof(fb->fp) && fb->size == 0); } #endif --- 208,215 ---- fbEOF(fb_t* fb) { ! odfbDebug(("fbEOF() = %d\n", gen_eof(fb->fp) && fb->size == 0)); //return (fb->eof && fb->reof); ! return (gen_eof(fb->fp) && fb->size == 0); } #endif Index: od_filebuf.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/jk2/opendemo/opendemo/od_filebuf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_filebuf.h 1 Jun 2002 21:34:37 -0000 1.1 --- od_filebuf.h 28 Feb 2004 19:47:34 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- #include "od_fileio.h" #include "od_membuf.h" + #include "od_private.h" /* for od */ #include "zlib/zlib.h" *************** *** 30,33 **** --- 31,58 ---- #endif + + #define HAVE_ZLIB 1 + + + /* We can switch off zlib at compile time and at runtime. + * Only the zlib read function needs the return hack. + */ + #if HAVE_ZLIB + #define gen_eof(x) ((od.cv.od_zlib.integer) ? (gzeof(x)) : (odfeof(x))) + #ifdef RETURN_HACK + # define gen_read(f,b,l) ((od.cv.od_zlib.integer) ? ((size_t)gzread(f,b,l),returnhack_int) : (odfread(b,1,l,f))) + #else + # define gen_read(f,b,l) ((od.cv.od_zlib.integer) ? ((size_t)gzread(f,b,l)) : (odfread(b,1,l,f))) + #endif + #define gen_open(f,m) ((od.cv.od_zlib.integer) ? (gzopen(f,m)) : (odfopen(f,m))) + #define gen_close(f) ((od.cv.od_zlib.integer) ? (gzclose(f)) : (odfclose(f))) + #else + #define gen_eof(x) (odfeof(x)) + #define gen_read(f,b,l) (odfread(b,1,l,f)) + #define gen_open(f,m) (odfopen(f,m)) + #define gen_close(f) ((odfclose(f))) + #endif + + typedef struct { gzFile fp; /* input file stream, may be compressed or uncompressed */ *************** *** 44,48 **** int fbEOF(fb_t*); #else ! #define fbEOF(fb) (gzeof((fb)->fp) && (fb)->size == 0) #endif size_t fbRead(fb_t*, void*, size_t); --- 69,73 ---- int fbEOF(fb_t*); #else ! #define fbEOF(fb) (gen_eof((fb)->fp) && (fb)->size == 0) #endif size_t fbRead(fb_t*, void*, size_t); Index: od_fileio.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/jk2/opendemo/opendemo/od_fileio.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_fileio.c 1 Jun 2002 21:34:37 -0000 1.1 --- od_fileio.c 28 Feb 2004 19:47:34 -0000 1.2 *************** *** 30,50 **** odFILE *odstderr = &real_stderr; ! odFILE* odfopen(const char* filename, const char* mode) { odFILE* stream; ! odFileDebug(("odfopen(\"%s\", \"%s\")\n", filename, mode)); stream = odmalloc(sizeof(odFILE)); ! if (stream == NULL) ! return NULL; stream->filename = odstrdup(filename); if (stream->filename == NULL) { ! odfree(stream); ! return NULL; } --- 30,56 ---- odFILE *odstderr = &real_stderr; ! #define CFREE(x) { if(x!=NULL) { odfree(x); (x)=NULL; } } odFILE* odfopen(const char* filename, const char* mode) { + char *fname = "odfopen"; odFILE* stream; ! odFileDebug(("%s(\"%s\", \"%s\")\n", fname, filename, mode)); stream = odmalloc(sizeof(odFILE)); ! if (stream == NULL) { ! odFileDebug(("%s: can't allocate odFILE struct: %d bytes\n", ! fname, sizeof(odFILE))); ! goto out; ! } stream->filename = odstrdup(filename); if (stream->filename == NULL) { ! odFileDebug(("%s: can't allocate file name buffer: %d bytes\n", ! fname, strlen(filename) + 1)); ! CFREE(stream); ! goto out; } *************** *** 67,77 **** stream->len = trap_FS_FOpenFile(filename, &stream->fd, stream->mode); if (stream->fd == 0) { ! odfree(stream->filename); ! odfree(stream); ! return NULL; } stream->pos = 0; return stream; } --- 73,91 ---- stream->len = trap_FS_FOpenFile(filename, &stream->fd, stream->mode); if (stream->fd == 0) { ! odFileDebug(("%s: trap_FS_FOpenFile syscall failed\n", ! fname)); ! CFREE(stream->filename); ! CFREE(stream); ! goto out; } stream->pos = 0; + out: + if (stream == NULL) { + odFileDebug(("%s failed\n", + fname)); + } + return stream; } *************** *** 96,99 **** --- 110,119 ---- odFileDebug(("odfeof(\"%s\") = %d\n", stream->filename, stream->pos >= stream->len)); + if (od.cv.od_pipe.integer) { + odFileDebug(("odfeof(\"%s\"): od_pipe in use\n", + stream->filename)); + return 0; + } + return stream->pos >= stream->len; } *************** *** 187,190 **** --- 207,211 ---- odfread(void* buffer, size_t size, size_t count, odFILE* stream) { + char *fname = "odfread"; size_t bytesToRead; *************** *** 193,201 **** /* check if we will pass the end of the file */ ! if (stream->pos + size*count > stream->len) bytesToRead = ((stream->len - stream->pos) / size) * size; else bytesToRead = size*count; trap_FS_Read(buffer, (int)bytesToRead, stream->fd); --- 214,225 ---- /* check if we will pass the end of the file */ ! if ((od.cv.od_pipe.integer==0) && (stream->pos + size*count > stream->len)) bytesToRead = ((stream->len - stream->pos) / size) * size; else bytesToRead = size*count; + odFileDebug(("%s: bytesToRead=%d\n", + fname, bytesToRead)); + trap_FS_Read(buffer, (int)bytesToRead, stream->fd); *************** *** 203,208 **** stream->pos += size*count; ! odFileDebug(("odfread(\"%s\", size=%d, count=%d) = %d\n", stream->filename, size, count, --- 227,234 ---- stream->pos += size*count; ! odFileDebug(("%s(\"%s\" (fd=%d), size=%d, count=%d) = %d\n", ! fname, stream->filename, + stream->fd, size, count, Index: od_fileio.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/jk2/opendemo/opendemo/od_fileio.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** od_fileio.h 1 Jun 2002 21:34:37 -0000 1.1 --- od_fileio.h 28 Feb 2004 19:47:34 -0000 1.2 *************** *** 39,44 **** void odrewind(odFILE*); #else ! #define odfeof(stream) ((stream)->pos >= (stream)->len) ! #define odftell(stream) (long)((stream)->pos) #define odrewind(stream) odfseek(stream, 0, SEEK_SET) #endif --- 39,44 ---- void odrewind(odFILE*); #else ! #define odfeof(stream) (od.cv.od_pipe.integer ? 0 : ((odFILE*)(stream))->pos >= (((odFILE*)(stream))->len)) ! #define odftell(stream) (long)(((odFILE*)(stream))->pos) #define odrewind(stream) odfseek(stream, 0, SEEK_SET) #endif Index: od_main.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/jk2/opendemo/opendemo/od_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** od_main.c 5 Oct 2003 18:36:39 -0000 1.2 --- od_main.c 28 Feb 2004 19:47:34 -0000 1.3 *************** *** 50,53 **** --- 50,55 ---- {&od.cv.od_log, "od_log", "", CVAR_LATCH, 0, qfalse, qfalse}, {&od.cv.od_logSync, "od_logSync", "0", CVAR_LATCH, 0, qfalse, qfalse}, + {&od.cv.od_zlib, "od_zlib", "1", CVAR_LATCH, 0, qfalse, qfalse}, + {&od.cv.od_pipe, "od_pipe", "0", CVAR_LATCH, 0, qfalse, qfalse}, /* used only on playback */ Index: od_private.h =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/jk2/opendemo/opendemo/od_private.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** od_private.h 5 Oct 2003 18:36:39 -0000 1.2 --- od_private.h 28 Feb 2004 19:47:36 -0000 1.3 *************** *** 179,182 **** --- 179,184 ---- vmCvar_t od_mode; vmCvar_t od_spectator; + vmCvar_t od_zlib; + vmCvar_t od_pipe; } cv; } od_t; Index: odp_parse.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/jk2/opendemo/opendemo/odp_parse.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** odp_parse.c 5 Oct 2003 18:36:39 -0000 1.2 --- odp_parse.c 28 Feb 2004 19:47:36 -0000 1.3 *************** *** 622,637 **** strcpy ((char *)filename, str); ! fp = odfopen(filename, "rb"); ! // HMage: if the demo couldn't be found, add an extension and try again. ! if (!fp) { ! if (Q_stricmp(filename + strlen(filename) - strlen(OD_FILEEXT), OD_FILEEXT)) { ! Q_strcat (filename, MAX_STRING_CHARS, OD_FILEEXT); ! trap_Cvar_Set("od_demofile", filename); } - } else { - odfclose (fp); } - //#endif if (xmlParseFile(filename, &odpSAX, &parserState) < 0) --- 622,640 ---- strcpy ((char *)filename, str); ! /* pipe open/close destroys everything, so it might be better to ! change the API of xmlParseFile to file buffer */ ! if (od.cv.od_pipe.integer == 0) { ! fp = odfopen(filename, "rb"); ! /* HMage: if the demo couldn't be found, add an extension and try again. */ ! if (!fp) { ! if (Q_stricmp(filename + strlen(filename) - strlen(OD_FILEEXT), OD_FILEEXT)) { ! Q_strcat (filename, MAX_STRING_CHARS, OD_FILEEXT); ! trap_Cvar_Set("od_demofile", filename); ! } ! } else { ! odfclose (fp); } } if (xmlParseFile(filename, &odpSAX, &parserState) < 0) |
|
From: Uwe G. <gi...@us...> - 2004-02-28 16:39:35
|
Update of /cvsroot/opendemo/opendemo/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8193 Modified Files: status Log Message: odrecord/odplay renamed to record/play Index: status =================================================================== RCS file: /cvsroot/opendemo/opendemo/doc/status,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** status 27 Feb 2004 23:37:46 -0000 1.8 --- status 28 Feb 2004 16:29:59 -0000 1.9 *************** *** 1,3 **** ! odrecord -------- --- 1,3 ---- ! record -------- *************** *** 9,13 **** ! odplay ------ --- 9,13 ---- ! play ------ |
|
From: Uwe G. <gi...@us...> - 2004-02-28 16:38:55
|
Update of /cvsroot/opendemo/opendemo/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8079 Modified Files: infrastructure Log Message: SuSE 9.0 mentioned Index: infrastructure =================================================================== RCS file: /cvsroot/opendemo/opendemo/doc/infrastructure,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** infrastructure 5 Oct 2003 19:32:53 -0000 1.7 --- infrastructure 28 Feb 2004 16:29:16 -0000 1.8 *************** *** 13,17 **** should also run under Windows, but I did not try it. ! OpenDemo has been used on UNIX (SuSE Linux 7.1, 7.3, 8.2) so far. Please report any necessary changes for other operating systems. --- 13,17 ---- should also run under Windows, but I did not try it. ! OpenDemo has been used on UNIX (SuSE Linux 7.1, 7.3, 8.2, 9.0) so far. Please report any necessary changes for other operating systems. |
|
From: Uwe G. <gi...@us...> - 2004-02-28 16:38:18
|
Update of /cvsroot/opendemo/opendemo/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7915 Modified Files: usage Log Message: new console variables explaned Quickstart guide written Index: usage =================================================================== RCS file: /cvsroot/opendemo/opendemo/doc/usage,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** usage 5 Oct 2003 19:32:18 -0000 1.8 --- usage 28 Feb 2004 16:28:42 -0000 1.9 *************** *** 19,22 **** --- 19,44 ---- + Quickstart Guide + ---------------- + + $ quake3 +set fs_game opendemo +map q3dm0 + Go to the console. + > /odrecord foo + Leave the console. + Run around, play your game. + Go to the console. + > /odstop + > /quit + + You got the recording file ~/.q3a/opendemo/foo (it may be in another directory + on non-UNIX machines). + + $ quake3 +set fs_game opendemo + Go to the console. + > /set od_mode play + > /set od_demofile foo + > /map q3dm0 + + OpenDemo modes -------------- *************** *** 92,95 **** --- 114,135 ---- replaying, so the client can view all of the demo file. + The console variable od_pipe defines, if the demo playback should read from + a pipe. Actually this means no seek around the file, no close/open sequence + and no reliance on the length of the file (which is always 0 for a pipe). + /set od_pipe 1 + activates reading from a pipe. + /set od_pipe 0 + (which is the default) activates reading from a file. od_zlib must be + switched off as well to make pipe reading a reality. It is needed for ODcut. + + The console variable od_zlib defines, if the demo playback should use the + decompression code. Experiments showed, the decompression code currently + cannot properly read from a pipe. + /set od_zlib 1 + (which is the default) activates the reading code of the compression + library. + /set od_zlib 0 + deactivates completely the compression routines. It is needed for ODcut. + The value of all these console variables survive the map change and the reload of the library. *************** *** 97,102 **** Now the library will be loaded again, which detects that od_mode is "play", and the library switches into replay mode, playing the already defined demo file ! from the console variable od_demofile using the values in od_spectator and ! od_demoloop. If a client connects now to this server, it can't play but can only watch the --- 137,141 ---- Now the library will be loaded again, which detects that od_mode is "play", and the library switches into replay mode, playing the already defined demo file ! from the console variable od_demofile. If a client connects now to this server, it can't play but can only watch the |
|
From: Uwe G. <gi...@us...> - 2004-02-28 10:14:44
|
Update of /cvsroot/opendemo/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7338 Modified Files: wpurc Log Message: Add new SOF2 files from game type "demolition", which came with SOF2 1.03. Index: wpurc =================================================================== RCS file: /cvsroot/opendemo/opendemo/wpurc,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wpurc 27 Feb 2004 23:39:48 -0000 1.27 --- wpurc 28 Feb 2004 10:05:12 -0000 1.28 *************** *** 839,842 **** --- 839,847 ---- s src/sof2/opendemo/gametype/gt_ctf/gt_local.h Raven source s src/sof2/opendemo/gametype/gt_ctf/gt_main.c Raven source + s src/sof2/opendemo/gametype/gt_dem/gt_dem.bat batch file for bytecode (under Windows) + s src/sof2/opendemo/gametype/gt_dem/gt_dem.dsp project file (Windows) + s src/sof2/opendemo/gametype/gt_dem/gt_dem.q3asm linker script for bytecode (under Windows) + s src/sof2/opendemo/gametype/gt_dem/gt_local.h Raven source + s src/sof2/opendemo/gametype/gt_dem/gt_main.c Raven source s src/sof2/opendemo/gametype/gt_dm/gt_dm.bat batch file for bytecode (under Windows) s src/sof2/opendemo/gametype/gt_dm/gt_dm.dsp project file (Windows) *************** *** 936,939 **** --- 941,945 ---- f src/sof2/opendemo/vm/gt_elim.qvm SOF2 "Elimination" game type library (bytecode) f src/sof2/opendemo/vm/gt_tdm.qvm SOF2 "Team Deathmatch" game type library (bytecode) + f src/sof2/opendemo/vm/gt_dem.qvm SOF2 "Demolition" game type library (bytecode) f src/sof2/opendemo/vm/gt_dm.qvm SOF2 "Deathmatch" game type library (bytecode) f src/sof2/opendemo/vm/sof2mp_cgame.qvm SOF2 client library (bytecode) |
|
From: Uwe G. <gi...@us...> - 2004-02-28 10:09:46
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6807 Modified Files: Sof2MP.dsw Log Message: SOF2 SDK 1.03 Index: Sof2MP.dsw =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/Sof2MP.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Sof2MP.dsw 26 May 2002 08:45:58 -0000 1.1 --- Sof2MP.dsw 28 Feb 2004 10:00:23 -0000 1.2 *************** *** 4,8 **** ############################################################################### ! Project: "SoF2cgame"=.\cgame\sof2_cgame.dsp - Package Owner=<4> Package=<5> --- 4,8 ---- ############################################################################### ! Project: "SoF2MP"=.\SoF2MP.dsp - Package Owner=<4> Package=<5> *************** *** 12,20 **** Package=<4> {{{ }}} ############################################################################### ! Project: "SoF2game"=.\game\sof2_game.dsp - Package Owner=<4> Package=<5> --- 12,47 ---- Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name gt_ctf + End Project Dependency + Begin Project Dependency + Project_Dep_Name gt_dem + End Project Dependency + Begin Project Dependency + Project_Dep_Name gt_dm + End Project Dependency + Begin Project Dependency + Project_Dep_Name gt_elim + End Project Dependency + Begin Project Dependency + Project_Dep_Name gt_inf + End Project Dependency + Begin Project Dependency + Project_Dep_Name gt_tdm + End Project Dependency + Begin Project Dependency + Project_Dep_Name SoF2cgame + End Project Dependency + Begin Project Dependency + Project_Dep_Name SoF2game + End Project Dependency + Begin Project Dependency + Project_Dep_Name ui + End Project Dependency }}} ############################################################################### ! Project: "SoF2cgame"=.\cgame\sof2_cgame.dsp - Package Owner=<4> Package=<5> *************** *** 28,32 **** ############################################################################### ! Project: "SoF2ui"=.\ui\sof2_ui.dsp - Package Owner=<4> Package=<5> --- 55,59 ---- ############################################################################### ! Project: "SoF2game"=.\game\sof2_game.dsp - Package Owner=<4> Package=<5> *************** *** 40,44 **** ############################################################################### ! Project: "Sof2MP"=.\Sof2MP.dsp - Package Owner=<4> Package=<5> --- 67,71 ---- ############################################################################### ! Project: "gt_ctf"=.\gametype\gt_ctf\gt_ctf.dsp - Package Owner=<4> Package=<5> *************** *** 48,80 **** Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name SoF2cgame - End Project Dependency - Begin Project Dependency - Project_Dep_Name SoF2game - End Project Dependency - Begin Project Dependency - Project_Dep_Name SoF2ui - End Project Dependency - Begin Project Dependency - Project_Dep_Name gt_ctf - End Project Dependency - Begin Project Dependency - Project_Dep_Name gt_dm - End Project Dependency - Begin Project Dependency - Project_Dep_Name gt_elim - End Project Dependency - Begin Project Dependency - Project_Dep_Name gt_inf - End Project Dependency - Begin Project Dependency - Project_Dep_Name gt_tdm - End Project Dependency }}} ############################################################################### ! Project: "gt_ctf"=.\gametype\gt_ctf\gt_ctf.dsp - Package Owner=<4> Package=<5> --- 75,83 ---- Package=<4> {{{ }}} ############################################################################### ! Project: "gt_dem"=.\gametype\gt_dem\gt_dem.dsp - Package Owner=<4> Package=<5> *************** *** 136,139 **** --- 139,154 ---- ############################################################################### + Project: "ui"=.\ui\sof2_ui.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Global: |
|
From: Uwe G. <gi...@us...> - 2004-02-28 10:07:44
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6587 Modified Files: Sof2MP.dsp Log Message: SOF2 SDK 1.03 Index: Sof2MP.dsp =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/Sof2MP.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Sof2MP.dsp 26 May 2002 08:45:58 -0000 1.1 --- Sof2MP.dsp 28 Feb 2004 09:58:22 -0000 1.2 *************** *** 1,3 **** ! # Microsoft Developer Studio Project File - Name="Sof2MP" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** --- 1,3 ---- ! # Microsoft Developer Studio Project File - Name="SoF2MP" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** *************** *** 5,23 **** # TARGTYPE "Win32 (x86) Generic Project" 0x010a ! CFG=Sof2MP - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE ! !MESSAGE NMAKE /f "Sof2MP.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "Sof2MP.mak" CFG="Sof2MP - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "Sof2MP - Win32 Release" (based on "Win32 (x86) Generic Project") ! !MESSAGE "Sof2MP - Win32 Debug" (based on "Win32 (x86) Generic Project") !MESSAGE --- 5,23 ---- # TARGTYPE "Win32 (x86) Generic Project" 0x010a ! CFG=SoF2MP - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE ! !MESSAGE NMAKE /f "SoF2MP.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "SoF2MP.mak" CFG="SoF2MP - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "SoF2MP - Win32 Release" (based on "Win32 (x86) Generic Project") ! !MESSAGE "SoF2MP - Win32 Debug" (based on "Win32 (x86) Generic Project") !MESSAGE *************** *** 26,30 **** MTL=midl.exe ! !IF "$(CFG)" == "Sof2MP - Win32 Release" # PROP BASE Use_MFC 0 --- 26,30 ---- MTL=midl.exe ! !IF "$(CFG)" == "SoF2MP - Win32 Release" # PROP BASE Use_MFC 0 *************** *** 39,43 **** # PROP Target_Dir "" ! !ELSEIF "$(CFG)" == "Sof2MP - Win32 Debug" # PROP BASE Use_MFC 0 --- 39,43 ---- # PROP Target_Dir "" ! !ELSEIF "$(CFG)" == "SoF2MP - Win32 Debug" # PROP BASE Use_MFC 0 *************** *** 56,61 **** # Begin Target ! # Name "Sof2MP - Win32 Release" ! # Name "Sof2MP - Win32 Debug" # End Target # End Project --- 56,61 ---- # Begin Target ! # Name "SoF2MP - Win32 Release" ! # Name "SoF2MP - Win32 Debug" # End Target # End Project |
|
From: Uwe G. <gi...@us...> - 2004-02-28 10:05:09
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6190 Modified Files: sof2_ui.dsp Log Message: SOF2 SDK 1.03 Index: sof2_ui.dsp =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/ui/sof2_ui.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sof2_ui.dsp 26 May 2002 09:01:27 -0000 1.1 --- sof2_ui.dsp 28 Feb 2004 09:55:46 -0000 1.2 *************** *** 1,3 **** ! # Microsoft Developer Studio Project File - Name="SoF2ui" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** --- 1,3 ---- ! # Microsoft Developer Studio Project File - Name="ui" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** *************** *** 14,24 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "sof2_ui.mak" CFG="SoF2ui - Win32 SH Debug SoF2" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "SoF2ui - Win32 Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "SoF2ui - Win32 Release SoF2" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "SoF2ui - Win32 SH Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE --- 14,23 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "sof2_ui.mak" CFG="ui - Win32 SH Debug SoF2" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "ui - Win32 Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "ui - Win32 Release SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE *************** *** 29,38 **** RSC=rc.exe ! !IF "$(CFG)" == "SoF2ui - Win32 Debug SoF2" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "SoF2ui___Win32_Debug_SoF2" ! # PROP BASE Intermediate_Dir "SoF2ui___Win32_Debug_SoF2" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" --- 28,37 ---- RSC=rc.exe ! !IF "$(CFG)" == "ui - Win32 Debug SoF2" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "ui___Win32_Debug_SoF2" ! # PROP BASE Intermediate_Dir "ui___Win32_Debug_SoF2" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" *************** *** 58,67 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "SoF2ui - Win32 Release SoF2" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "SoF2ui___Win32_Release_SoF2" ! # PROP BASE Intermediate_Dir "SoF2ui___Win32_Release_SoF2" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" --- 57,66 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "ui - Win32 Release SoF2" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "ui___Win32_Release_SoF2" ! # PROP BASE Intermediate_Dir "ui___Win32_Release_SoF2" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" *************** *** 87,126 **** # ADD LINK32 /nologo /base:"0x40000000" /dll /map:"../Release/sof2mp_uix86.map" /debug /machine:I386 /out:"../Release/sof2mp_uix86.dll" - !ELSEIF "$(CFG)" == "SoF2ui - Win32 SH Debug SoF2" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "SoF2ui___Win32_SH_Debug_SoF2" - # PROP BASE Intermediate_Dir "SoF2ui___Win32_SH_Debug_SoF2" - # PROP BASE Ignore_Export_Lib 0 - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "..\SHDebug\ui" - # PROP Intermediate_Dir "..\SHDebug\ui" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_USRDLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "UI_EXPORTS" /D "MISSIONPACK" /D "_SOF2" /FR /YX /FD /GZ /c - # ADD CPP /nologo /G5 /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_USRDLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "UI_EXPORTS" /D "MISSIONPACK" /D "_SOF2" /D "MEM_DEBUG" /FR /YX /FD /GZ /c - # ADD BASE MTL /nologo /D "_Debug JK2" /mktyplib203 /win32 - # ADD MTL /nologo /D "_Debug JK2" /mktyplib203 /win32 - # ADD BASE RSC /l 0x409 /d "_Debug JK2" - # ADD RSC /l 0x409 /d "_Debug JK2" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LINK32=link.exe - # ADD BASE LINK32 /nologo /base:"0x40000000" /dll /map:"..\Debug\of2mp_uix86.map" /debug /machine:I386 /out:"../Debug/sof2mp_uix86.dll" /pdbtype:sept - # SUBTRACT BASE LINK32 /pdb:none - # ADD LINK32 /nologo /base:"0x40000000" /dll /map:"..\SHDebug\of2mp_uix86.map" /debug /machine:I386 /out:"../SHDebug/sof2mp_uix86.dll" /pdbtype:sept - # SUBTRACT LINK32 /pdb:none - !ENDIF # Begin Target ! # Name "SoF2ui - Win32 Debug SoF2" ! # Name "SoF2ui - Win32 Release SoF2" ! # Name "SoF2ui - Win32 SH Debug SoF2" # Begin Group "Source Files" --- 86,95 ---- # ADD LINK32 /nologo /base:"0x40000000" /dll /map:"../Release/sof2mp_uix86.map" /debug /machine:I386 /out:"../Release/sof2mp_uix86.dll" !ENDIF # Begin Target ! # Name "ui - Win32 Debug SoF2" ! # Name "ui - Win32 Release SoF2" # Begin Group "Source Files" |
|
From: Uwe G. <gi...@us...> - 2004-02-28 10:04:22
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/gametype/gt_tdm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5984 Modified Files: gt_tdm.dsp Log Message: SOF2 SDK 1.03 Index: gt_tdm.dsp =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/gametype/gt_tdm/gt_tdm.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gt_tdm.dsp 26 May 2002 08:58:21 -0000 1.1 --- gt_tdm.dsp 28 Feb 2004 09:54:42 -0000 1.2 *************** *** 18,21 **** --- 18,22 ---- !MESSAGE Possible choices for configuration are: !MESSAGE + !MESSAGE "gt_tdm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "gt_tdm - Win32 Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE *************** *** 27,32 **** RSC=rc.exe ! !IF "$(CFG)" == "gt_tdm - Win32 Debug SoF2" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 --- 28,63 ---- RSC=rc.exe ! !IF "$(CFG)" == "gt_tdm - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "gt_tdm_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "gt_tdm_EXPORTS" /YX /FD /GZ /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_DEBUG" ! # ADD RSC /l 0x409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept + !ELSEIF "$(CFG)" == "gt_tdm - Win32 Debug SoF2" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug SoF2" + # PROP BASE Intermediate_Dir "Debug SoF2" + # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 *************** *** 52,55 **** --- 83,87 ---- # Begin Target + # Name "gt_tdm - Win32 Debug" # Name "gt_tdm - Win32 Debug SoF2" # Begin Group "Source Files" |
|
From: Uwe G. <gi...@us...> - 2004-02-28 10:03:05
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/gametype/gt_inf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5753 Modified Files: gt_inf.dsp Log Message: SOF2 SDK 1.03 Index: gt_inf.dsp =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/gametype/gt_inf/gt_inf.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gt_inf.dsp 26 May 2002 08:57:22 -0000 1.1 --- gt_inf.dsp 28 Feb 2004 09:53:42 -0000 1.2 *************** *** 18,21 **** --- 18,22 ---- !MESSAGE Possible choices for configuration are: !MESSAGE + !MESSAGE "gt_inf - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "gt_inf - Win32 Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE *************** *** 27,32 **** RSC=rc.exe ! !IF "$(CFG)" == "gt_inf - Win32 Debug SoF2" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 --- 28,63 ---- RSC=rc.exe ! !IF "$(CFG)" == "gt_inf - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "gt_inf_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "gt_inf_EXPORTS" /YX /FD /GZ /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_DEBUG" ! # ADD RSC /l 0x409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept + !ELSEIF "$(CFG)" == "gt_inf - Win32 Debug SoF2" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug SoF2" + # PROP BASE Intermediate_Dir "Debug SoF2" + # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 *************** *** 52,55 **** --- 83,87 ---- # Begin Target + # Name "gt_inf - Win32 Debug" # Name "gt_inf - Win32 Debug SoF2" # Begin Group "Source Files" |
|
From: Uwe G. <gi...@us...> - 2004-02-28 10:02:12
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/gametype/gt_dm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5623 Modified Files: gt_dm.dsp Log Message: SOF2 SDK 1.03 Index: gt_dm.dsp =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/gametype/gt_dm/gt_dm.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gt_dm.dsp 26 May 2002 08:55:07 -0000 1.1 --- gt_dm.dsp 28 Feb 2004 09:52:36 -0000 1.2 *************** *** 18,21 **** --- 18,22 ---- !MESSAGE Possible choices for configuration are: !MESSAGE + !MESSAGE "gt_dm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "gt_dm - Win32 Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE *************** *** 27,32 **** RSC=rc.exe ! !IF "$(CFG)" == "gt_dm - Win32 Debug SoF2" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 --- 28,63 ---- RSC=rc.exe ! !IF "$(CFG)" == "gt_dm - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "gt_dm_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "gt_dm_EXPORTS" /YX /FD /GZ /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_DEBUG" ! # ADD RSC /l 0x409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept + !ELSEIF "$(CFG)" == "gt_dm - Win32 Debug SoF2" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug SoF2" + # PROP BASE Intermediate_Dir "Debug SoF2" + # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 *************** *** 52,55 **** --- 83,87 ---- # Begin Target + # Name "gt_dm - Win32 Debug" # Name "gt_dm - Win32 Debug SoF2" # Begin Group "Source Files" |
|
From: Uwe G. <gi...@us...> - 2004-02-28 10:01:00
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/gametype/gt_ctf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5504 Modified Files: gt_ctf.dsp Log Message: SOF2 SDK 1.03 Index: gt_ctf.dsp =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/gametype/gt_ctf/gt_ctf.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gt_ctf.dsp 26 May 2002 08:54:04 -0000 1.1 --- gt_ctf.dsp 28 Feb 2004 09:51:35 -0000 1.2 *************** *** 18,21 **** --- 18,22 ---- !MESSAGE Possible choices for configuration are: !MESSAGE + !MESSAGE "gt_ctf - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "gt_ctf - Win32 Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE *************** *** 27,32 **** RSC=rc.exe ! !IF "$(CFG)" == "gt_ctf - Win32 Debug SoF2" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 --- 28,63 ---- RSC=rc.exe ! !IF "$(CFG)" == "gt_ctf - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GT_CTF_EXPORTS" /YX /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GT_CTF_EXPORTS" /YX /FD /GZ /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_DEBUG" ! # ADD RSC /l 0x409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept + !ELSEIF "$(CFG)" == "gt_ctf - Win32 Debug SoF2" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug SoF2" + # PROP BASE Intermediate_Dir "Debug SoF2" + # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 *************** *** 52,55 **** --- 83,87 ---- # Begin Target + # Name "gt_ctf - Win32 Debug" # Name "gt_ctf - Win32 Debug SoF2" # Begin Group "Source Files" |
|
From: Uwe G. <gi...@us...> - 2004-02-28 09:59:52
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5396 Modified Files: sof2_game.dsp Log Message: SOF2 SDK 1.03 Index: sof2_game.dsp =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/game/sof2_game.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sof2_game.dsp 26 May 2002 08:48:50 -0000 1.1 --- sof2_game.dsp 28 Feb 2004 09:50:30 -0000 1.2 *************** *** 20,30 **** !MESSAGE "SoF2game - Win32 Release SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "SoF2game - Win32 Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "SoF2game - Win32 SH Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" CPP=cl.exe [...1130 lines suppressed...] SOURCE=.\q_shared.h # End Source File # Begin Source File SOURCE=.\surfaceflags.h # End Source File # Begin Source File SOURCE=.\syn.h # End Source File # Begin Source File SOURCE=..\qcommon\tags.h # End Source File # Begin Source File SOURCE=..\cgame\tr_types.h # End Source File # End Group |
|
From: Uwe G. <gi...@us...> - 2004-02-28 09:57:59
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/cgame In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5182 Modified Files: sof2_cgame.dsp Log Message: SOF2 SDK 1.03 Index: sof2_cgame.dsp =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/cgame/sof2_cgame.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sof2_cgame.dsp 26 May 2002 08:43:28 -0000 1.1 --- sof2_cgame.dsp 28 Feb 2004 09:48:35 -0000 1.2 *************** *** 5,9 **** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=SoF2cgame - Win32 SH Debug SoF2 !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 5,9 ---- # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=SoF2cgame - Win32 Release SoF2 !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,18 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "sof2_cgame.mak" CFG="SoF2cgame - Win32 SH Debug SoF2" !MESSAGE !MESSAGE Possible choices for configuration are: --- 14,18 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "sof2_cgame.mak" CFG="SoF2cgame - Win32 Release SoF2" !MESSAGE !MESSAGE Possible choices for configuration are: *************** *** 20,30 **** !MESSAGE "SoF2cgame - Win32 Release SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "SoF2cgame - Win32 Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "SoF2cgame - Win32 SH Debug SoF2" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" CPP=cl.exe MTL=midl.exe --- 20,27 ---- *************** *** 89,121 **** # SUBTRACT LINK32 /pdb:none - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "SoF2cgame___Win32_SH_Debug_SoF2" - # PROP BASE Intermediate_Dir "SoF2cgame___Win32_SH_Debug_SoF2" - # PROP BASE Ignore_Export_Lib 0 - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "SoF2cgame___Win32_SH_Debug_SoF2" - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - # PROP Ignore_Export_Lib 0 - # PROP Target_Dir "" - # ADD BASE CPP /nologo /G5 /MTd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "MISSIONPACK" /D "_SOF2" /FR /YX /FD /c - # ADD CPP /nologo /G5 /MTd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "MISSIONPACK" /D "_SOF2" /D "MEM_DEBUG" /D "CGAME" /FR /YX /FD /c - # ADD BASE MTL /nologo /D "_Debug SoF2" /mktyplib203 /o "NUL" /win32 - # ADD MTL /nologo /D "_Debug SoF2" /mktyplib203 /o "NUL" /win32 - # ADD BASE RSC /l 0x409 /d "_Debug SoF2" - # ADD RSC /l 0x409 /d "_Debug SoF2" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LINK32=link.exe - # ADD BASE LINK32 /nologo /base:"0x30000000" /subsystem:windows /dll /map:"..\Debug\sof2mp_cgamex86.map" /debug /machine:I386 /def:".\SoF2_cgame.def" /out:"..\Debug\sof2mp_cgamex86.dll" - # SUBTRACT BASE LINK32 /pdb:none - # ADD LINK32 /nologo /base:"0x30000000" /subsystem:windows /dll /pdb:"..\SHDebug/sof2mp_cgamex86.pdb" /map:"..\SHDebug\sof2mp_cgamex86.map" /debug /machine:I386 /def:".\SoF2_cgame.def" /out:"..\SHDebug\sof2mp_cgamex86.dll" - # SUBTRACT LINK32 /pdb:none - !ENDIF --- 86,89 ---- *************** *** 124,128 **** # Name "SoF2cgame - Win32 Release SoF2" # Name "SoF2cgame - Win32 Debug SoF2" - # Name "SoF2cgame - Win32 SH Debug SoF2" # Begin Group "Source Files" --- 92,95 ---- *************** *** 131,648 **** SOURCE=..\game\bg_gametype.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=..\game\bg_lib.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - # PROP BASE Exclude_From_Build 1 - # PROP Exclude_From_Build 1 - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - # PROP BASE Exclude_From_Build 1 - # PROP Exclude_From_Build 1 - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - # PROP BASE Exclude_From_Build 1 - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" # PROP Exclude_From_Build 1 - - !ENDIF - # End Source File # Begin Source File SOURCE=..\game\bg_misc.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=..\game\bg_player.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=..\game\bg_pmove.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=..\game\bg_slidemove.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=..\game\bg_weapons.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_consolecmds.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_draw.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_drawtools.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_effects.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_ents.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_event.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_gametype.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_gore.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_info.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_light.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_localents.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_main.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_miscents.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_newDraw.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_players.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_playerstate.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_predict.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_scoreboard.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_servercmds.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_snapshot.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_syscalls.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_view.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_weaponinit.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=.\cg_weapons.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=..\game\q_math.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=..\game\q_shared.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # Begin Source File SOURCE=..\ui\ui_shared.c - - !IF "$(CFG)" == "SoF2cgame - Win32 Release SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 Debug SoF2" - - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP Intermediate_Dir "..\SHDebug\SoF2cgame" - - !ENDIF - # End Source File # End Group --- 98,235 ---- *************** *** 680,687 **** --- 267,282 ---- # Begin Source File + SOURCE=.\cg_was.h + # End Source File + # Begin Source File + SOURCE=..\qcommon\disablewarnings.h # End Source File # Begin Source File + SOURCE=.\fx_local.h + # End Source File + # Begin Source File + SOURCE=..\ghoul2\G2.h # End Source File *************** *** 749,757 **** # PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "SoF2cgame - Win32 SH Debug SoF2" - - # PROP BASE Exclude_From_Build 1 - # PROP Exclude_From_Build 1 - !ENDIF --- 344,347 ---- |
|
From: Uwe G. <gi...@us...> - 2004-02-28 09:56:27
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5024 Modified Files: all.bat Log Message: SOF2 SDK 1.03 Index: all.bat =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/all.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** all.bat 26 May 2002 08:45:58 -0000 1.1 --- all.bat 28 Feb 2004 09:47:04 -0000 1.2 *************** *** 1,4 **** @set include= ! @del /q ..\base\vm @cd game call game.bat --- 1,4 ---- @set include= ! @del /q debug\base\mp\vm @cd game call game.bat *************** *** 13,16 **** --- 13,18 ---- @cd ..\gt_elim call gt_elim.bat + @cd ..\gt_dem + call gt_dem.bat @cd ..\gt_dm call gt_dm.bat *************** *** 37,40 **** --- 39,44 ---- :testinf if not exist "gametype\gt_inf\vm\gt_inf.qvm" goto badINF + :testdem + if not exist "gametype\gt_dem\vm\gt_dem.qvm" goto badDEM :testelim if not exist "gametype\gt_elim\vm\gt_elim.qvm" goto badELIM *************** *** 82,85 **** --- 86,94 ---- goto end + :badDEM + echo ***** gt_dem.qvm did not build! + set bad = 1 + goto end + :goodBuild echo VMs were built successfully! |
|
From: Uwe G. <gi...@us...> - 2004-02-28 09:56:09
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4981 Modified Files: Makefile Log Message: Gametype "dem" will be compiled as well. Index: Makefile =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 28 Sep 2003 19:29:37 -0000 1.4 --- Makefile 28 Feb 2004 09:46:45 -0000 1.5 *************** *** 32,35 **** --- 32,36 ---- CTFDIR=$(MOUNT_DIR)/gametype/gt_ctf GAMETYPEDIR=$(MOUNT_DIR)/gametype + DEMDIR=$(GAMETYPEDIR)/gt_dem DMDIR=$(GAMETYPEDIR)/gt_dm ELIMDIR=$(GAMETYPEDIR)/gt_elim *************** *** 105,108 **** --- 106,110 ---- $(B)/sof2mp_ui$(ARCH_GEN).$(SHLIBEXT_GEN) \ $(B)/gt_ctf$(ARCH_GEN).$(SHLIBEXT_GEN) \ + $(B)/gt_dem$(ARCH_GEN).$(SHLIBEXT_GEN) \ $(B)/gt_dm$(ARCH_GEN).$(SHLIBEXT_GEN) \ $(B)/gt_elim$(ARCH_GEN).$(SHLIBEXT_GEN) \ *************** *** 141,144 **** --- 143,147 ---- @if [ ! -d $(B)/gametype ];then mkdir $(B)/gametype;fi @if [ ! -d $(B)/gametype/gt_ctf ];then mkdir $(B)/gametype/gt_ctf;fi + @if [ ! -d $(B)/gametype/gt_dem ];then mkdir $(B)/gametype/gt_dem;fi @if [ ! -d $(B)/gametype/gt_dm ];then mkdir $(B)/gametype/gt_dm;fi @if [ ! -d $(B)/gametype/gt_elim ];then mkdir $(B)/gametype/gt_elim;fi *************** *** 396,399 **** --- 399,437 ---- ############################################################################# + # DEM + ############################################################################# + + DEM_OBJ_COMMON = \ + $(B)/gametype/gt_dem/gt_main.o \ + $(B)/gametype/gt_dem/q_shared.o \ + $(B)/gametype/gt_dem/q_math.o + + DEM_OBJ_UNIX = $(DEM_OBJ_COMMON) \ + $(B)/gametype/gt_syscalls.o + DEM_OBJ_RELEASE = $(DEM_OBJ_UNIX) + DEM_OBJ_DEBUG = $(DEM_OBJ_UNIX) + DEM_OBJ_QVM = $(subst .o,.$(OBJEXT_QVM),$(DEM_OBJ_COMMON)) \ + $(B)/gametype/gt_dm/bg_lib.$(OBJEXT_QVM) \ + $(GAMETYPEDIR)/gt_syscalls.asm + DEM_OBJ_WINDOWS = $(DEM_OBJ_UNIX) + DEM_OBJ_GEN = $(DEM_OBJ_$(EXT)) + DEM_OBJ_BATCH = $(subst .o,.c,$(subst $(B)/gametype/gt_dem/,,$(DEM_OBJ_COMMON))) \ + bg_lib.c + DEM_CFLAGS = -DMISSIONPACK + + # linking + $(B)/gt_dem$(ARCH_GEN).$(SHLIBEXT_GEN): $(DEM_OBJ_GEN) + $(LD_GEN) $(LDFLAGS_GEN) -o $@ $^ + + # file from gametype/gt_dem + $(B)/gametype/gt_dem/%.$(OBJEXT_GEN): $(DEMDIR)/%.c + $(CC_GEN) $(CFLAGS_GEN) $(DEM_CFLAGS) -c -o $@ $< + + # file from game + $(B)/gametype/gt_dem/%.$(OBJEXT_GEN): $(GDIR)/%.c + $(CC_GEN) $(CFLAGS_GEN) $(DEM_CFLAGS) -c -o $@ $< + + + ############################################################################# # DM ############################################################################# *************** *** 611,614 **** --- 649,664 ---- LINK_DESTFILE_CTF=gt_ctf + BATCH_DIR1_DEM= + BATCH_DIR2_DEM=../ + BATCH_DIR3_DEM=../../game/ + BATCH_LIST_DEM=$(DEM_OBJ_BATCH) + BATCH_BASEDIR_DEM=$(DEMDIR) + BATCH_TARGET_DEM=$(BATCH_BASEDIR_DEM)/gt_dem.bat + BATCH_LINKFILE_DEM=gt_dem + BATCH_CFLAGS_DEM=-DMISSIONPACK -I..\..\..\gametype -I..\..\gt_dem -I..\..\..\game + LINK_BASEDIR_DEM=..\..\..\..\base\vm + LINK_LIST_DEM=$(subst .c,,$(BATCH_LIST_DEM)) ..\..\gt_syscalls + LINK_DESTFILE_DEM=gt_dem + BATCH_DIR1_DM= BATCH_DIR2_DM=../ *************** *** 679,682 **** --- 729,733 ---- $(MAKE) batch2 BAT=UI $(MAKE) batch2 BAT=CTF + $(MAKE) batch2 BAT=DEM $(MAKE) batch2 BAT=DM $(MAKE) batch2 BAT=ELIM |
|
From: Uwe G. <gi...@us...> - 2004-02-28 09:40:58
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/gametype/gt_dem In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2913 Added Files: .cvsignore Log Message: ignore the created files (bat and q3asm) --- NEW FILE: .cvsignore --- .cvsignore gt_dem.bat gt_dem.q3asm |
