From coderjoe at icculus.org Thu Mar 4 13:36:34 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 4 Mar 2004 18:36:34 -0000 Subject: Module CVSROOT: Change committed Message-ID: <20040304183634.4014.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : CVSROOT Commit time: 2004-03-04 18:36:34 UTC Log message: enable cia notification and upgrade to the XML system. Modified files: ciabot_cvs.pl loginfo -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: CVSROOT.20040304.183634.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 6 12:55:04 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 6 Mar 2004 17:55:04 -0000 Subject: Module neither: Change committed Message-ID: <20040306175504.6313.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-06 17:55:04 UTC Log message: bump. (testing) Modified files: README -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040306.175504.coderjoe.diff URL: From black at icculus.org Sat Mar 6 13:32:31 2004 From: black at icculus.org (black at icculus.org) Date: 6 Mar 2004 18:32:31 -0000 Subject: Module neither: Change committed Message-ID: <20040306183231.7893.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-06 18:32:30 UTC Log message: another test. Modified files: README -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040306.183230.black.diff URL: From coderjoe at icculus.org Sat Mar 6 13:47:03 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 6 Mar 2004 18:47:03 -0000 Subject: Module CVSROOT: Change committed Message-ID: <20040306184703.8472.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : CVSROOT Commit time: 2004-03-06 18:47:03 UTC Log message: fix errors when user doesn't give a log message. Modified files: ciabot_cvs.pl -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: CVSROOT.20040306.184703.coderjoe.diff URL: From coderjoe at icculus.org Sun Mar 7 05:41:55 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 7 Mar 2004 10:41:55 -0000 Subject: Module CVSROOT: Change committed Message-ID: <20040307104155.13263.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : CVSROOT Commit time: 2004-03-07 10:41:55 UTC Log message: oops. boom. this should fix. Modified files: ciabot_cvs.pl -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: CVSROOT.20040307.104155.coderjoe.diff URL: From coderjoe at icculus.org Tue Mar 16 15:37:39 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 16 Mar 2004 20:37:39 -0000 Subject: Module CVSROOT: Change committed Message-ID: <20040316203739.13231.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : CVSROOT Commit time: 2004-03-16 20:37:39 UTC Log message: fix another no-log-message bug. *sigh* Modified files: ciabot_cvs.pl -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: CVSROOT.20040316.203739.coderjoe.diff URL: From warp at icculus.org Sun Mar 21 18:56:20 2004 From: warp at icculus.org (warp at icculus.org) Date: 21 Mar 2004 23:56:20 -0000 Subject: Module neither: Change committed Message-ID: <20040321235620.2911.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-21 23:56:20 UTC Log message: Hashing and crc code, nothing uses it yet. Added files: darkwar/crc.c darkwar/crc.h darkwar/hash.c darkwar/hash.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040321.235620.warp.diff URL: From havoc at icculus.org Tue Mar 23 12:38:23 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 23 Mar 2004 17:38:23 -0000 Subject: Module neither: Change committed Message-ID: <20040323173823.29142.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-23 17:38:23 UTC Log message: polygon processing functions Added files: darkwar/polygon.c darkwar/polygon.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040323.173823.havoc.diff URL: From havoc at icculus.org Wed Mar 24 11:53:22 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 24 Mar 2004 16:53:22 -0000 Subject: Module neither: Change committed Message-ID: <20040324165322.23886.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 16:53:22 UTC Log message: getting closer to loading a map (quake map parser partially written), added a lot of mesh handling functions Modified files: darkwar/Makefile darkwar/design.txt darkwar/dwmain.c darkwar/ncommon.h Added files: darkwar/dwmesh.c darkwar/dwmesh.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040324.165322.havoc.diff URL: From black at icculus.org Wed Mar 24 16:04:16 2004 From: black at icculus.org (black at icculus.org) Date: 24 Mar 2004 21:04:16 -0000 Subject: Module neither: Change committed Message-ID: <20040324210416.14452.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 21:04:16 UTC Log message: Some work done on the memory manager. Hopefully useful stuff. Modified files: darkwar/nmemory.c darkwar/nmemory.h darkwar/nstring.c darkwar/renderer/ngl.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040324.210416.black.diff URL: From black at icculus.org Wed Mar 24 16:06:39 2004 From: black at icculus.org (black at icculus.org) Date: 24 Mar 2004 21:06:39 -0000 Subject: Module neither: Change committed Message-ID: <20040324210639.14822.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 21:06:39 UTC Log message: Fixed the warnings - stupid VC7! Modified files: darkwar/nmemory.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040324.210639.black.diff URL: From warp at icculus.org Wed Mar 24 17:11:52 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:11:52 -0000 Subject: Module neither: Change committed Message-ID: <20040324221152.19571.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:11:52 UTC Log message: Whoops, forgot this. Added files: darkwar/ntypes.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040324.221152.warp.diff URL: From warp at icculus.org Wed Mar 24 17:15:16 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:15:16 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/ Message-ID: <20040324221516.19735.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:15:16 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95 added to the repository From warp at icculus.org Wed Mar 24 17:15:39 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:15:39 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/SCons/ Message-ID: <20040324221539.19781.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:15:39 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95/SCons added to the repository From warp at icculus.org Wed Mar 24 17:16:17 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:16:17 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/SCons/Node/ Message-ID: <20040324221617.19892.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:16:17 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95/SCons/Node added to the repository From warp at icculus.org Wed Mar 24 17:16:17 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:16:17 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/SCons/Optik/ Message-ID: <20040324221617.19914.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:16:17 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95/SCons/Optik added to the repository From warp at icculus.org Wed Mar 24 17:16:17 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:16:17 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/SCons/Options/ Message-ID: <20040324221617.19939.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:16:17 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95/SCons/Options added to the repository From warp at icculus.org Wed Mar 24 17:16:18 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:16:18 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/SCons/Platform/ Message-ID: <20040324221618.19955.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:16:18 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95/SCons/Platform added to the repository From warp at icculus.org Wed Mar 24 17:16:18 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:16:18 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/SCons/Scanner/ Message-ID: <20040324221618.19980.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:16:18 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95/SCons/Scanner added to the repository From warp at icculus.org Wed Mar 24 17:16:18 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:16:18 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/SCons/Script/ Message-ID: <20040324221618.20017.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:16:18 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95/SCons/Script added to the repository From warp at icculus.org Wed Mar 24 17:16:19 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:16:19 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/SCons/Sig/ Message-ID: <20040324221619.20034.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:16:19 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95/SCons/Sig added to the repository From warp at icculus.org Wed Mar 24 17:16:19 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:16:19 -0000 Subject: Module neither: New directory darkwar/scons-local-0.95/SCons/Tool/ Message-ID: <20040324221619.20058.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:16:19 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/scons-local-0.95/SCons/Tool added to the repository From warp at icculus.org Wed Mar 24 17:19:36 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:19:36 -0000 Subject: Module neither: Change committed Message-ID: <20040324221936.20686.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:19:34 UTC Log message: Ok, scons support! With the scons-local drop. Added files: darkwar/SConstruct darkwar/scons-LICENSE darkwar/scons-README darkwar/scons.py darkwar/sconsign.py darkwar/scons-local-0.95/SCons/Action.py darkwar/scons-local-0.95/SCons/Builder.py darkwar/scons-local-0.95/SCons/Conftest.py darkwar/scons-local-0.95/SCons/Debug.py darkwar/scons-local-0.95/SCons/Defaults.py darkwar/scons-local-0.95/SCons/Environment.py darkwar/scons-local-0.95/SCons/Errors.py darkwar/scons-local-0.95/SCons/Executor.py darkwar/scons-local-0.95/SCons/Job.py darkwar/scons-local-0.95/SCons/SConf.py darkwar/scons-local-0.95/SCons/Taskmaster.py darkwar/scons-local-0.95/SCons/Util.py darkwar/scons-local-0.95/SCons/Warnings.py darkwar/scons-local-0.95/SCons/__init__.py darkwar/scons-local-0.95/SCons/exitfuncs.py darkwar/scons-local-0.95/SCons/Node/Alias.py darkwar/scons-local-0.95/SCons/Node/FS.py darkwar/scons-local-0.95/SCons/Node/Python.py darkwar/scons-local-0.95/SCons/Node/__init__.py darkwar/scons-local-0.95/SCons/Optik/__init__.py darkwar/scons-local-0.95/SCons/Optik/errors.py darkwar/scons-local-0.95/SCons/Optik/option.py darkwar/scons-local-0.95/SCons/Optik/option_parser.py darkwar/scons-local-0.95/SCons/Options/BoolOption.py darkwar/scons-local-0.95/SCons/Options/EnumOption.py darkwar/scons-local-0.95/SCons/Options/ListOption.py darkwar/scons-local-0.95/SCons/Options/PackageOption.py darkwar/scons-local-0.95/SCons/Options/PathOption.py darkwar/scons-local-0.95/SCons/Options/__init__.py darkwar/scons-local-0.95/SCons/Platform/__init__.py darkwar/scons-local-0.95/SCons/Platform/aix.py darkwar/scons-local-0.95/SCons/Platform/cygwin.py darkwar/scons-local-0.95/SCons/Platform/hpux.py darkwar/scons-local-0.95/SCons/Platform/irix.py darkwar/scons-local-0.95/SCons/Platform/os2.py darkwar/scons-local-0.95/SCons/Platform/posix.py darkwar/scons-local-0.95/SCons/Platform/sunos.py darkwar/scons-local-0.95/SCons/Platform/win32.py darkwar/scons-local-0.95/SCons/Scanner/C.py darkwar/scons-local-0.95/SCons/Scanner/D.py darkwar/scons-local-0.95/SCons/Scanner/Fortran.py darkwar/scons-local-0.95/SCons/Scanner/IDL.py darkwar/scons-local-0.95/SCons/Scanner/Prog.py darkwar/scons-local-0.95/SCons/Scanner/__init__.py darkwar/scons-local-0.95/SCons/Script/SConscript.py darkwar/scons-local-0.95/SCons/Script/__init__.py darkwar/scons-local-0.95/SCons/Sig/MD5.py darkwar/scons-local-0.95/SCons/Sig/TimeStamp.py darkwar/scons-local-0.95/SCons/Sig/__init__.py darkwar/scons-local-0.95/SCons/Tool/386asm.py darkwar/scons-local-0.95/SCons/Tool/BitKeeper.py darkwar/scons-local-0.95/SCons/Tool/CVS.py darkwar/scons-local-0.95/SCons/Tool/JavaCommon.py darkwar/scons-local-0.95/SCons/Tool/Perforce.py darkwar/scons-local-0.95/SCons/Tool/PharLapCommon.py darkwar/scons-local-0.95/SCons/Tool/RCS.py darkwar/scons-local-0.95/SCons/Tool/SCCS.py darkwar/scons-local-0.95/SCons/Tool/Subversion.py darkwar/scons-local-0.95/SCons/Tool/__init__.py darkwar/scons-local-0.95/SCons/Tool/aixc++.py darkwar/scons-local-0.95/SCons/Tool/aixcc.py darkwar/scons-local-0.95/SCons/Tool/aixf77.py darkwar/scons-local-0.95/SCons/Tool/aixlink.py darkwar/scons-local-0.95/SCons/Tool/ar.py darkwar/scons-local-0.95/SCons/Tool/as.py darkwar/scons-local-0.95/SCons/Tool/bcc32.py darkwar/scons-local-0.95/SCons/Tool/c++.py darkwar/scons-local-0.95/SCons/Tool/cc.py darkwar/scons-local-0.95/SCons/Tool/default.py darkwar/scons-local-0.95/SCons/Tool/dmd.py darkwar/scons-local-0.95/SCons/Tool/dvipdf.py darkwar/scons-local-0.95/SCons/Tool/dvips.py darkwar/scons-local-0.95/SCons/Tool/f77.py darkwar/scons-local-0.95/SCons/Tool/g++.py darkwar/scons-local-0.95/SCons/Tool/g77.py darkwar/scons-local-0.95/SCons/Tool/gas.py darkwar/scons-local-0.95/SCons/Tool/gcc.py darkwar/scons-local-0.95/SCons/Tool/gnulink.py darkwar/scons-local-0.95/SCons/Tool/gs.py darkwar/scons-local-0.95/SCons/Tool/hpc++.py darkwar/scons-local-0.95/SCons/Tool/hpcc.py darkwar/scons-local-0.95/SCons/Tool/hplink.py darkwar/scons-local-0.95/SCons/Tool/icc.py darkwar/scons-local-0.95/SCons/Tool/icl.py darkwar/scons-local-0.95/SCons/Tool/ifl.py darkwar/scons-local-0.95/SCons/Tool/ilink.py darkwar/scons-local-0.95/SCons/Tool/ilink32.py darkwar/scons-local-0.95/SCons/Tool/jar.py darkwar/scons-local-0.95/SCons/Tool/javac.py darkwar/scons-local-0.95/SCons/Tool/javah.py darkwar/scons-local-0.95/SCons/Tool/latex.py darkwar/scons-local-0.95/SCons/Tool/lex.py darkwar/scons-local-0.95/SCons/Tool/link.py darkwar/scons-local-0.95/SCons/Tool/linkloc.py darkwar/scons-local-0.95/SCons/Tool/m4.py darkwar/scons-local-0.95/SCons/Tool/masm.py darkwar/scons-local-0.95/SCons/Tool/midl.py darkwar/scons-local-0.95/SCons/Tool/mingw.py darkwar/scons-local-0.95/SCons/Tool/mslib.py darkwar/scons-local-0.95/SCons/Tool/mslink.py darkwar/scons-local-0.95/SCons/Tool/msvc.py darkwar/scons-local-0.95/SCons/Tool/msvs.py darkwar/scons-local-0.95/SCons/Tool/nasm.py darkwar/scons-local-0.95/SCons/Tool/pdflatex.py darkwar/scons-local-0.95/SCons/Tool/pdftex.py darkwar/scons-local-0.95/SCons/Tool/qt.py darkwar/scons-local-0.95/SCons/Tool/rmic.py darkwar/scons-local-0.95/SCons/Tool/sgiar.py darkwar/scons-local-0.95/SCons/Tool/sgic++.py darkwar/scons-local-0.95/SCons/Tool/sgicc.py darkwar/scons-local-0.95/SCons/Tool/sgilink.py darkwar/scons-local-0.95/SCons/Tool/sunar.py darkwar/scons-local-0.95/SCons/Tool/sunc++.py darkwar/scons-local-0.95/SCons/Tool/suncc.py darkwar/scons-local-0.95/SCons/Tool/sunlink.py darkwar/scons-local-0.95/SCons/Tool/swig.py darkwar/scons-local-0.95/SCons/Tool/tar.py darkwar/scons-local-0.95/SCons/Tool/tex.py darkwar/scons-local-0.95/SCons/Tool/tlib.py darkwar/scons-local-0.95/SCons/Tool/yacc.py darkwar/scons-local-0.95/SCons/Tool/zip.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040324.221934.warp.diff URL: From warp at icculus.org Wed Mar 24 17:34:07 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:34:07 -0000 Subject: Module neither: Change committed Message-ID: <20040324223407.22462.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:34:07 UTC Log message: Err, WTF? How did this dissappear? Added files: darkwar/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040324.223407.warp.diff URL: From warp at icculus.org Wed Mar 24 17:38:57 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:38:57 -0000 Subject: Module neither: Change committed Message-ID: <20040324223857.22694.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:38:57 UTC Log message: Fix a typo in nmemory.h, and include some additional headers in nmemory.c to get rid of warnings. Modified files: darkwar/nmemory.c darkwar/nmemory.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040324.223857.warp.diff URL: From warp at icculus.org Wed Mar 24 17:44:54 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:44:54 -0000 Subject: Module neither: Change committed Message-ID: <20040324224454.22997.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:44:54 UTC Log message: Rearrange the includes and include ntypes.h. NString_Set now returns size_t, the length of the new string. (There is no reason /not/ to do this.) Modified files: darkwar/nstring.c darkwar/nstring.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040324.224454.warp.diff URL: From warp at icculus.org Wed Mar 24 17:46:36 2004 From: warp at icculus.org (warp at icculus.org) Date: 24 Mar 2004 22:46:36 -0000 Subject: Module neither: Change committed Message-ID: <20040324224636.23070.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-24 22:46:36 UTC Log message: Don't duplicate the world in ncommon, just include ntypes.h from it. (TRUE and FALSE disappear, replaced with true and false.) Modified files: darkwar/ncommon.h darkwar/nfile.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040324.224636.warp.diff URL: From warp at icculus.org Thu Mar 25 08:19:12 2004 From: warp at icculus.org (warp at icculus.org) Date: 25 Mar 2004 13:19:12 -0000 Subject: Module neither: Change committed Message-ID: <20040325131912.6536.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 13:19:12 UTC Log message: About to pass out. Cvars are incomplete. Minor scons changes. Make nfile a little harder to screw up by accident. Fix up dyngl somewhat. Try to make nmemory work, er, just work. Failed, someone needs to figure out WTF is smashing the stack. Modified files: darkwar/Makefile darkwar/SConstruct darkwar/dwmain.c darkwar/nfile.c darkwar/nmemory.c darkwar/renderer/dglfuncs.h darkwar/renderer/dyngl.c Added files: darkwar/cvar.c darkwar/cvar.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.131912.warp.diff URL: From havoc at icculus.org Thu Mar 25 08:56:36 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 25 Mar 2004 13:56:36 -0000 Subject: Module neither: Change committed Message-ID: <20040325135636.8627.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 13:56:36 UTC Log message: fix a signed/unsigned compare Modified files: darkwar/nmemory.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.135636.havoc.diff URL: From havoc at icculus.org Thu Mar 25 08:58:32 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 25 Mar 2004 13:58:32 -0000 Subject: Module neither: Change committed Message-ID: <20040325135832.8792.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 13:58:32 UTC Log message: changed u_int16_t and such to NUint16 and such added NUint8, NSint8, and so on types, there is also NUint and NSint for non-specific size variables Modified files: darkwar/crc.c darkwar/ntypes.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.135832.havoc.diff URL: From black at icculus.org Thu Mar 25 09:01:57 2004 From: black at icculus.org (black at icculus.org) Date: 25 Mar 2004 14:01:57 -0000 Subject: Module neither: Change committed Message-ID: <20040325140157.9043.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 14:01:57 UTC Log message: Reformatted so it loos nicer. Modified files: darkwar/ntypes.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.140157.black.diff URL: From havoc at icculus.org Thu Mar 25 09:18:22 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 25 Mar 2004 14:18:22 -0000 Subject: Module neither: Change committed Message-ID: <20040325141822.10958.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 14:18:22 UTC Log message: fixed one bug in NMemory_Alloc made NMEMORY_LEGACY mode use malloc/free until the memory manager is fixed Modified files: darkwar/nmemory.c darkwar/nmemory.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.141822.havoc.diff URL: From havoc at icculus.org Thu Mar 25 09:21:57 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 25 Mar 2004 14:21:57 -0000 Subject: Module neither: Change committed Message-ID: <20040325142157.11288.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 14:21:57 UTC Log message: note to self: examine carefully before mangling code Modified files: darkwar/nmemory.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.142157.havoc.diff URL: From havoc at icculus.org Thu Mar 25 09:30:34 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 25 Mar 2004 14:30:34 -0000 Subject: Module neither: Change committed Message-ID: <20040325143034.11892.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 14:30:33 UTC Log message: fix path concatenation (don't add a /, as the userpath/gamepath have them already) Modified files: darkwar/nfile.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.143033.havoc.diff URL: From havoc at icculus.org Thu Mar 25 09:35:06 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 25 Mar 2004 14:35:06 -0000 Subject: Module neither: Change committed Message-ID: <20040325143506.12232.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 14:35:06 UTC Log message: nothing to see here folks Modified files: darkwar/matrixlib.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.143506.havoc.diff URL: From havoc at icculus.org Thu Mar 25 09:49:23 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 25 Mar 2004 14:49:23 -0000 Subject: Module neither: Change committed Message-ID: <20040325144923.13681.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 14:49:23 UTC Log message: include stdlib.h to get size_t on all platforms (not just Linux) Modified files: darkwar/ntypes.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.144923.havoc.diff URL: From black at icculus.org Thu Mar 25 12:13:38 2004 From: black at icculus.org (black at icculus.org) Date: 25 Mar 2004 17:13:38 -0000 Subject: Module neither: Change committed Message-ID: <20040325171338.27294.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 17:13:38 UTC Log message: Second try with the mem manager. Modified files: darkwar/crc.c darkwar/crc.h darkwar/dwmain.c darkwar/ncommon.h darkwar/nconsole.c darkwar/nhost.c darkwar/nmemory.c darkwar/nmemory.h darkwar/nstring.c darkwar/ntypes.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.171338.black.diff URL: From black at icculus.org Thu Mar 25 14:26:55 2004 From: black at icculus.org (black at icculus.org) Date: 25 Mar 2004 19:26:55 -0000 Subject: Module neither: Change committed Message-ID: <20040325192655.8079.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 19:26:55 UTC Log message: Memory zone print functions added. Modified files: darkwar/dwmain.c darkwar/nmemory.c darkwar/nmemory.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.192655.black.diff URL: From coderjoe at icculus.org Thu Mar 25 15:17:46 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 25 Mar 2004 20:17:46 -0000 Subject: Module neither: Change committed Message-ID: <20040325201746.13532.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-25 20:17:46 UTC Log message: add useful comment to win32 people about DYNGLENTRY. (I just hope it proves useful in the future.) Modified files: darkwar/renderer/dyngl.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040325.201746.coderjoe.diff URL: From warp at icculus.org Thu Mar 25 22:09:21 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 03:09:21 -0000 Subject: Module neither: Change committed Message-ID: <20040326030921.23292.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 03:09:21 UTC Log message: Bah, the scons drop should work for win32 and just about everything else now too. Modified files: darkwar/SConstruct Added files: darkwar/scons_config.py darkwar/scons_lib.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.030921.warp.diff URL: From warp at icculus.org Thu Mar 25 22:40:30 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 03:40:30 -0000 Subject: Module neither: Change committed Message-ID: <20040326034030.25366.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 03:40:30 UTC Log message: Cleanup some scons stuff. Add a check for __attribute__((unused)), and give a UNUSED define, actually use it. (TODO: Check for however MSVC does it.) Include config.h in ncommon.h for now. Modified files: darkwar/SConstruct darkwar/cvar.c darkwar/dwmain.c darkwar/ncommon.h darkwar/scons_config.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.034030.warp.diff URL: From warp at icculus.org Thu Mar 25 22:49:59 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 03:49:59 -0000 Subject: Module neither: Change committed Message-ID: <20040326034959.25860.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 03:49:59 UTC Log message: We have a TODO file! Added files: darkwar/TODO.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.034959.warp.diff URL: From warp at icculus.org Fri Mar 26 02:31:01 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 07:31:01 -0000 Subject: Module neither: Change committed Message-ID: <20040326073101.4370.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 07:31:01 UTC Log message: Allocate /cleared/ memory. (Yes, yes, I know, systems exist where NULL != 0, DarkWar will not support such systems without a hell of a lot of work anyways.) Modified files: darkwar/nmemory.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.073101.warp.diff URL: From warp at icculus.org Fri Mar 26 03:43:57 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 08:43:57 -0000 Subject: Module neither: Change committed Message-ID: <20040326084357.8629.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 08:43:57 UTC Log message: Texture management code, a bit cleaner, and out of dwmain.c. Minor formatting change for cvar.c. Replace CHECKGLERROR with CheckGLError();, er, quite a bin saner as far as formatting goes. (And it looks better.) Modified files: darkwar/SConstruct darkwar/cvar.c darkwar/dwmain.c darkwar/renderer/dglfuncs.h darkwar/renderer/ngl.h Added files: darkwar/renderer/ntextures.c darkwar/renderer/ntextures.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.084357.warp.diff URL: From warp at icculus.org Fri Mar 26 03:59:49 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 08:59:49 -0000 Subject: Module neither: Change committed Message-ID: <20040326085949.9274.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 08:59:49 UTC Log message: Minor tweaks, this is not Twilight, this is DarkWar. We are at version 0.0. Modified files: darkwar/scons_config.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.085949.warp.diff URL: From coderjoe at icculus.org Fri Mar 26 06:35:10 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 11:35:10 -0000 Subject: Module neither: Change committed Message-ID: <20040326113510.18348.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 11:35:10 UTC Log message: make scons find. (all below are fixes for MSVC) /O2 and /Og cannot be used with /GZ. remove extra /subsystem:windows from linker options. remove extra libs. quiet the compiler "logo". Modified files: darkwar/scons_config.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.113510.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 06:44:55 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 11:44:55 -0000 Subject: Module neither: Change committed Message-ID: <20040326114455.18910.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 11:44:55 UTC Log message: like the comment said, define DYNGLENTRY in config.h. (scons is doing this for all platforms ANYWAY) Modified files: darkwar/renderer/dyngl.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.114455.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 06:58:08 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 11:58:08 -0000 Subject: Module neither: Change committed Message-ID: <20040326115808.19644.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 11:58:08 UTC Log message: add some ignores. Modified files: darkwar/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.115808.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 06:58:39 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 11:58:39 -0000 Subject: Module neither: Change committed Message-ID: <20040326115839.19728.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 11:58:39 UTC Log message: forgot one. Modified files: darkwar/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.115839.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 06:59:02 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 11:59:02 -0000 Subject: Module neither: Change committed Message-ID: <20040326115902.19793.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 11:59:02 UTC Log message: add some ignores. Modified files: darkwar/renderer/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.115902.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 06:59:35 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 11:59:35 -0000 Subject: Module neither: Change committed Message-ID: <20040326115935.19858.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 11:59:35 UTC Log message: add note. Modified files: darkwar/TODO.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.115935.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 07:00:26 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 12:00:26 -0000 Subject: Module neither: Change committed Message-ID: <20040326120026.19987.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 12:00:26 UTC Log message: add /DWIN32 to the msvc commandline, as it seems to be undefined. Modified files: darkwar/scons_config.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.120026.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 07:02:43 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 12:02:43 -0000 Subject: Module neither: Change committed Message-ID: <20040326120243.20441.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 12:02:42 UTC Log message: include config.h where needed. Modified files: darkwar/dwmain.c darkwar/nfile.c darkwar/renderer/dyngl.c darkwar/renderer/ngl.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.120242.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 07:13:55 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 12:13:55 -0000 Subject: Module neither: Change committed Message-ID: <20040326121355.21119.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 12:13:55 UTC Log message: use the PROPER method of defining WIN32 on the commandline... Modified files: darkwar/scons_config.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.121355.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 07:20:42 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 12:20:42 -0000 Subject: Module neither: Change committed Message-ID: <20040326122042.21722.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 12:20:42 UTC Log message: when building a debug binary, need to send the /DEBUG flag to MSVC's linker. Modified files: darkwar/scons_config.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.122042.coderjoe.diff URL: From warp at icculus.org Fri Mar 26 07:26:27 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 12:26:27 -0000 Subject: Module neither: Change committed Message-ID: <20040326122627.22032.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 12:26:27 UTC Log message: Tweak the scons stuff for gcc. (Pass optimization and debugging options to the linker as well.) Fix ntextures, er, oops. Modified files: darkwar/scons_config.py darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.122627.warp.diff URL: From warp at icculus.org Fri Mar 26 07:32:40 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 12:32:40 -0000 Subject: Module neither: Change committed Message-ID: <20040326123240.22448.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 12:32:40 UTC Log message: Whoops, NString_Set returns strlen + 1, not strlen. (Back to over a thousand FPS.) Modified files: darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.123240.warp.diff URL: From coderjoe at icculus.org Fri Mar 26 08:02:16 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 13:02:16 -0000 Subject: Module neither: Change committed Message-ID: <20040326130216.24637.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 13:02:16 UTC Log message: er... forgot to #ifdef those config.h includes... Modified files: darkwar/dwmain.c darkwar/nfile.c darkwar/renderer/dyngl.c darkwar/renderer/dyngl.h darkwar/renderer/ngl.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.130216.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 08:03:17 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 13:03:17 -0000 Subject: Module neither: Change committed Message-ID: <20040326130317.24733.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 13:03:17 UTC Log message: oops. didn't mean to commit that... Modified files: darkwar/dwmain.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.130317.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 08:10:00 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 13:10:00 -0000 Subject: Module neither: Change committed Message-ID: <20040326131000.25487.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 13:10:00 UTC Log message: add .ilk, and fix typo Modified files: darkwar/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.131000.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 08:16:48 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 13:16:48 -0000 Subject: Module neither: Change committed Message-ID: <20040326131648.25774.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 13:16:48 UTC Log message: er. *groan* re-add the compiler /nologo MSVC flag... Modified files: darkwar/scons_config.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.131648.coderjoe.diff URL: From coderjoe at icculus.org Fri Mar 26 08:40:28 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 13:40:28 -0000 Subject: Module neither: Change committed Message-ID: <20040326134028.27224.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 13:40:28 UTC Log message: a couple more msvc flags. (linker this time) Modified files: darkwar/scons_config.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.134028.coderjoe.diff URL: From havoc at icculus.org Fri Mar 26 08:51:50 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 13:51:50 -0000 Subject: Module neither: Change committed Message-ID: <20040326135150.28191.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 13:51:50 UTC Log message: added fallbackconfig.h which is used if HAVE_CONFIG_H is not defined, this means that the makefile and projects work without scons Modified files: darkwar/cvar.c darkwar/dwmain.c darkwar/ncommon.h darkwar/nfile.c Added files: darkwar/fallbackconfig.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.135150.havoc.diff URL: From havoc at icculus.org Fri Mar 26 08:53:02 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 13:53:02 -0000 Subject: Module neither: Change committed Message-ID: <20040326135302.28329.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 13:53:02 UTC Log message: added -MD because there's no point in supporting .d files without making them Modified files: darkwar/Makefile -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.135302.havoc.diff URL: From black at icculus.org Fri Mar 26 09:22:00 2004 From: black at icculus.org (black at icculus.org) Date: 26 Mar 2004 14:22:00 -0000 Subject: Module neither: Change committed Message-ID: <20040326142200.31033.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 14:22:00 UTC Log message: Added wrap_ialloc. Modified files: darkwar/dwmain.c darkwar/nmemory.c darkwar/nmemory.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.142200.black.diff URL: From havoc at icculus.org Fri Mar 26 09:28:16 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 14:28:16 -0000 Subject: Module neither: Change committed Message-ID: <20040326142816.31398.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 14:28:16 UTC Log message: missed a config.h Modified files: darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.142816.havoc.diff URL: From havoc at icculus.org Fri Mar 26 09:36:50 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 14:36:50 -0000 Subject: Module neither: Change committed Message-ID: <20040326143650.31877.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 14:36:50 UTC Log message: added renderer/ntextures.o Modified files: darkwar/Makefile -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.143650.havoc.diff URL: From havoc at icculus.org Fri Mar 26 09:37:23 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 14:37:23 -0000 Subject: Module neither: Change committed Message-ID: <20040326143723.31958.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 14:37:23 UTC Log message: many changes to DWMesh and it now has documentation Modified files: darkwar/dwmesh.c darkwar/dwmesh.h darkwar/ncommon.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.143723.havoc.diff URL: From havoc at icculus.org Fri Mar 26 09:46:46 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 14:46:46 -0000 Subject: Module neither: Change committed Message-ID: <20040326144646.32676.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 14:46:46 UTC Log message: renamed CRC_Block to CRC16_Block, and renamed internal CRC stuff to CRC16, changed length parameter back to size_t Modified files: darkwar/crc.c darkwar/crc.h darkwar/cvar.c darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.144646.havoc.diff URL: From havoc at icculus.org Fri Mar 26 10:08:26 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 15:08:26 -0000 Subject: Module neither: Change committed Message-ID: <20040326150826.1648.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 15:08:26 UTC Log message: now fits Neither naming conventions Modified files: darkwar/cvar.c darkwar/cvar.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.150826.havoc.diff URL: From coderjoe at icculus.org Fri Mar 26 10:45:23 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 15:45:23 -0000 Subject: Module neither: Change committed Message-ID: <20040326154523.4752.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 15:45:23 UTC Log message: drop scons config.h output in... Modified files: darkwar/fallbackconfig.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.154523.coderjoe.diff URL: From havoc at icculus.org Fri Mar 26 10:49:44 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 15:49:44 -0000 Subject: Module neither: Change committed Message-ID: <20040326154944.5024.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 15:49:44 UTC Log message: now handles compiler and platform separately (for UNUSED and inline) Modified files: darkwar/fallbackconfig.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.154944.havoc.diff URL: From warp at icculus.org Fri Mar 26 10:49:49 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 15:49:49 -0000 Subject: Module neither: Change committed Message-ID: <20040326154949.5065.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 15:49:49 UTC Log message: Pull the SDL_image stuff from scons. Clean up the hash and the users somewhat, still not as clean as I would like. Modified files: darkwar/cvar.c darkwar/cvar.h darkwar/hash.c darkwar/hash.h darkwar/scons_config.py darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.154949.warp.diff URL: From coderjoe at icculus.org Fri Mar 26 10:59:41 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 15:59:41 -0000 Subject: Module neither: Change committed Message-ID: <20040326155941.6533.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 15:59:41 UTC Log message: missed a config.h Modified files: darkwar/renderer/dyngl.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.155941.coderjoe.diff URL: From havoc at icculus.org Fri Mar 26 11:04:19 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 16:04:19 -0000 Subject: Module neither: Change committed Message-ID: <20040326160419.6877.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 16:04:19 UTC Log message: added a note to Mercury about DynGL stubs for GL logging and debugging Modified files: darkwar/TODO.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.160419.havoc.diff URL: From coderjoe at icculus.org Fri Mar 26 11:04:21 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 26 Mar 2004 16:04:21 -0000 Subject: Module neither: Change committed Message-ID: <20040326160421.6909.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 16:04:21 UTC Log message: add MSVC6 project files. Added files: darkwar/darkwar.dsp darkwar/darkwar.dsw darkwar/renderer/renderer.dsp ------=MIME.e59460a22c482eb6704e6dca96d4d525 Content-Type: text/plain; name="neither.20040326.160421.coderjoe.diff" Content-Disposition: attachment; filename="neither.20040326.160421.coderjoe.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/darkwar.dsp diff -u /dev/null neither/darkwar/darkwar.dsp:1.1 --- /dev/null Fri Mar 26 11:04:21 2004 +++ neither/darkwar/darkwar.dsp Fri Mar 26 11:04:11 2004 @@ -0,0 +1,191 @@ +# Microsoft Developer Studio Project File - Name="darkwar" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=darkwar - 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 "darkwar.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 "darkwar.mak" CFG="darkwar - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "darkwar - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "darkwar - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +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 /subsystem:windows /machine:I386 +# ADD LINK32 sdlmain.lib sdl.lib /nologo /subsystem:windows /machine:I386 + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "darkwar___Win32_Debug" +# PROP BASE Intermediate_Dir "darkwar___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "darkwar___Win32_Debug" +# PROP Intermediate_Dir "darkwar___Win32_Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /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 /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 sdlmain.lib sdl.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "darkwar - Win32 Release" +# Name "darkwar - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\crc.c +# End Source File +# Begin Source File + +SOURCE=.\cvar.c +# End Source File +# Begin Source File + +SOURCE=.\dwmain.c +# End Source File +# Begin Source File + +SOURCE=.\hash.c +# End Source File +# Begin Source File + +SOURCE=.\matrixlib.c +# End Source File +# Begin Source File + +SOURCE=.\nconsole.c +# End Source File +# Begin Source File + +SOURCE=.\nfile.c +# End Source File +# Begin Source File + +SOURCE=.\nimage.c +# End Source File +# Begin Source File + +SOURCE=.\nmemory.c +# End Source File +# Begin Source File + +SOURCE=.\nstring.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\crc.h +# End Source File +# Begin Source File + +SOURCE=.\cvar.h +# End Source File +# Begin Source File + +SOURCE=.\fallbackconfig.h +# End Source File +# Begin Source File + +SOURCE=.\hash.h +# End Source File +# Begin Source File + +SOURCE=.\matrixlib.h +# End Source File +# Begin Source File + +SOURCE=.\ncommon.h +# End Source File +# Begin Source File + +SOURCE=.\nconsole.h +# End Source File +# Begin Source File + +SOURCE=.\nfile.h +# End Source File +# Begin Source File + +SOURCE=.\nimage.h +# End Source File +# Begin Source File + +SOURCE=.\nmemory.h +# End Source File +# Begin Source File + +SOURCE=.\nstring.h +# End Source File +# Begin Source File + +SOURCE=.\ntypes.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: neither/darkwar/darkwar.dsw diff -u /dev/null neither/darkwar/darkwar.dsw:1.1 --- /dev/null Fri Mar 26 11:04:21 2004 +++ neither/darkwar/darkwar.dsw Fri Mar 26 11:04:11 2004 @@ -0,0 +1,44 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "darkwar"=.\darkwar.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name renderer + End Project Dependency +}}} + +############################################################################### + +Project: "renderer"=.\renderer\renderer.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + Index: neither/darkwar/renderer/renderer.dsp diff -u /dev/null neither/darkwar/renderer/renderer.dsp:1.1 --- /dev/null Fri Mar 26 11:04:21 2004 +++ neither/darkwar/renderer/renderer.dsp Fri Mar 26 11:04:11 2004 @@ -0,0 +1,120 @@ +# Microsoft Developer Studio Project File - Name="renderer" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=renderer - 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 "renderer.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 "renderer.mak" CFG="renderer - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "renderer - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "renderer - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "renderer - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "renderer - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "renderer - Win32 Release" +# Name "renderer - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\dyngl.c +# End Source File +# Begin Source File + +SOURCE=.\ngl.c +# End Source File +# Begin Source File + +SOURCE=.\ntextures.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\dglfuncs.h +# End Source File +# Begin Source File + +SOURCE=.\dyngl.h +# End Source File +# Begin Source File + +SOURCE=.\ngl.h +# End Source File +# Begin Source File + +SOURCE=.\ntextures.h +# End Source File +# End Group +# End Target +# End Project From havoc at icculus.org Fri Mar 26 11:06:13 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 16:06:13 -0000 Subject: Module neither: Change committed Message-ID: <20040326160613.7194.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 16:06:13 UTC Log message: added *.d Modified files: darkwar/.cvsignore darkwar/renderer/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.160613.havoc.diff URL: From black at icculus.org Fri Mar 26 11:10:47 2004 From: black at icculus.org (black at icculus.org) Date: 26 Mar 2004 16:10:47 -0000 Subject: Module neither: Change committed Message-ID: <20040326161047.7435.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 16:10:47 UTC Log message: Reformatted it a bit Modified files: darkwar/fallbackconfig.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.161047.black.diff URL: From havoc at icculus.org Fri Mar 26 11:21:55 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 16:21:55 -0000 Subject: Module neither: Change committed Message-ID: <20040326162155.8340.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 16:21:55 UTC Log message: renamed NTex_ to NTexture_ Modified files: darkwar/dwmain.c darkwar/renderer/ntextures.c darkwar/renderer/ntextures.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.162155.havoc.diff URL: From black at icculus.org Fri Mar 26 12:41:08 2004 From: black at icculus.org (black at icculus.org) Date: 26 Mar 2004 17:41:08 -0000 Subject: Module neither: Change committed Message-ID: <20040326174108.16425.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 17:41:08 UTC Log message: Stripped the N off. Modified files: darkwar/nconsole.c darkwar/nconsole.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.174108.black.diff URL: From black at icculus.org Fri Mar 26 14:22:02 2004 From: black at icculus.org (black at icculus.org) Date: 26 Mar 2004 19:22:02 -0000 Subject: Module neither: Change committed Message-ID: <20040326192202.25659.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 19:22:02 UTC Log message: Stripped the N prefix off. Modified files: darkwar/nmemory.c darkwar/nmemory.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.192202.black.diff URL: From black at icculus.org Fri Mar 26 14:26:22 2004 From: black at icculus.org (black at icculus.org) Date: 26 Mar 2004 19:26:22 -0000 Subject: Module neither: Change committed Message-ID: <20040326192622.26071.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 19:26:22 UTC Log message: Stripped the N prefix off. Modified files: darkwar/nstring.c darkwar/nstring.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.192622.black.diff URL: From black at icculus.org Fri Mar 26 14:33:32 2004 From: black at icculus.org (black at icculus.org) Date: 26 Mar 2004 19:33:32 -0000 Subject: Module neither: Change committed Message-ID: <20040326193332.26657.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 19:33:32 UTC Log message: Stripped all other N prefixes off (except ngl). Modified files: darkwar/cvar.c darkwar/cvar.h darkwar/dwmain.c darkwar/dwmesh.c darkwar/hash.c darkwar/nfile.c darkwar/nfile.h darkwar/nhost.c darkwar/nimage.c darkwar/nimage.h darkwar/nmemory.c darkwar/nmemory.h darkwar/ntypes.h darkwar/renderer/ngl.c darkwar/renderer/ntextures.c darkwar/renderer/ntextures.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.193332.black.diff URL: From warp at icculus.org Fri Mar 26 15:31:00 2004 From: warp at icculus.org (warp at icculus.org) Date: 26 Mar 2004 20:31:00 -0000 Subject: Module neither: Change committed Message-ID: <20040326203100.32300.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 20:31:00 UTC Log message: Check for __forceinline as well. Modified files: darkwar/scons_config.py -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.203100.warp.diff URL: From black at icculus.org Fri Mar 26 15:31:55 2004 From: black at icculus.org (black at icculus.org) Date: 26 Mar 2004 20:31:55 -0000 Subject: Module neither: Change committed Message-ID: <20040326203155.32430.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 20:31:55 UTC Log message: Fixed missing fallbackconfig.h include. Modified files: darkwar/hash.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.203155.black.diff URL: From havoc at icculus.org Fri Mar 26 16:20:59 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 21:20:59 -0000 Subject: Module neither: Change committed Message-ID: <20040326212059.4142.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 21:20:59 UTC Log message: R_SetMatrix no longer tries to eliminate duplicate SetMatrix calls Modified files: darkwar/dwmain.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.212059.havoc.diff URL: From black at icculus.org Fri Mar 26 17:32:49 2004 From: black at icculus.org (black at icculus.org) Date: 26 Mar 2004 22:32:49 -0000 Subject: Module neither: Change committed Message-ID: <20040326223249.8912.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 22:32:49 UTC Log message: Using the Ntypes now. Modified files: darkwar/hash.c darkwar/hash.h darkwar/cvar.c darkwar/cvar.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.223249.black.diff URL: From havoc at icculus.org Fri Mar 26 17:38:29 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 22:38:29 -0000 Subject: Module neither: Change committed Message-ID: <20040326223829.9354.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 22:38:29 UTC Log message: split up dwmain into many files, still a bit rough but a lot cleaner added enginedesign.txt (nearly empty so far) Modified files: darkwar/Makefile darkwar/TODO.txt darkwar/dwmain.c Added files: darkwar/dwgame.c darkwar/dwgame.h darkwar/dwmain.h darkwar/dwmap.c darkwar/dwmap.h darkwar/enginedesign.txt darkwar/renderer/main.c darkwar/renderer/main.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.223829.havoc.diff URL: From havoc at icculus.org Fri Mar 26 17:40:37 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 22:40:37 -0000 Subject: Module neither: Change committed Message-ID: <20040326224037.9653.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 22:40:37 UTC Log message: forgot to commit these Added files: darkwar/dwinput.c darkwar/dwinput.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.224037.havoc.diff URL: From havoc at icculus.org Fri Mar 26 17:46:39 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 22:46:39 -0000 Subject: Module neither: Change committed Message-ID: <20040326224639.10077.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 22:46:39 UTC Log message: fixed includes Modified files: darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.224639.havoc.diff URL: From havoc at icculus.org Fri Mar 26 17:47:49 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 22:47:49 -0000 Subject: Module neither: Change committed Message-ID: <20040326224749.10211.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 22:47:49 UTC Log message: fixed include Modified files: darkwar/renderer/ntextures.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.224749.havoc.diff URL: From havoc at icculus.org Fri Mar 26 18:04:41 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 23:04:41 -0000 Subject: Module neither: Change committed Message-ID: <20040326230441.11025.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 23:04:41 UTC Log message: renamed r_video variables to DWVideo_ and made them public Modified files: darkwar/enginedesign.txt darkwar/renderer/main.c darkwar/renderer/main.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.230441.havoc.diff URL: From havoc at icculus.org Fri Mar 26 18:11:34 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 23:11:34 -0000 Subject: Module neither: Change committed Message-ID: <20040326231134.11418.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 23:11:34 UTC Log message: Tomaz's patch for mouse grabbing Modified files: darkwar/dwinput.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.231134.havoc.diff URL: From havoc at icculus.org Fri Mar 26 18:15:14 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 23:15:14 -0000 Subject: Module neither: Change committed Message-ID: <20040326231514.11637.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 23:15:14 UTC Log message: move the config.h include to the top Modified files: darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040326.231514.havoc.diff URL: From havoc at icculus.org Fri Mar 26 18:20:02 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 23:20:02 -0000 Subject: Module neither: Change committed Message-ID: <20040326232002.11970.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 23:20:02 UTC Log message: Tomaz updated the project files Modified files: darkwar/darkwar.dsp darkwar/darkwar.dsw ------=MIME.90b4a05cb9bca96a5f1d23e132a7a67e Content-Type: text/plain; name="neither.20040326.232002.havoc.diff" Content-Disposition: attachment; filename="neither.20040326.232002.havoc.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/darkwar.dsp diff -u neither/darkwar/darkwar.dsp:1.1 neither/darkwar/darkwar.dsp:1.2 --- neither/darkwar/darkwar.dsp:1.1 Fri Mar 26 11:04:11 2004 +++ neither/darkwar/darkwar.dsp Fri Mar 26 18:19:52 2004 @@ -100,10 +100,22 @@ # End Source File # Begin Source File +SOURCE=.\dwgame.c +# End Source File +# Begin Source File + +SOURCE=.\dwinput.c +# End Source File +# Begin Source File + SOURCE=.\dwmain.c # End Source File # Begin Source File +SOURCE=.\dwmap.c +# End Source File +# Begin Source File + SOURCE=.\hash.c # End Source File # Begin Source File Index: neither/darkwar/darkwar.dsw diff -u neither/darkwar/darkwar.dsw:1.1 neither/darkwar/darkwar.dsw:1.2 --- neither/darkwar/darkwar.dsw:1.1 Fri Mar 26 11:04:11 2004 +++ neither/darkwar/darkwar.dsw Fri Mar 26 18:19:52 2004 @@ -3,22 +3,7 @@ ############################################################################### -Project: "darkwar"=.\darkwar.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name renderer - End Project Dependency -}}} - -############################################################################### - -Project: "renderer"=.\renderer\renderer.dsp - Package Owner=<4> +Project: "darkwar"=".\darkwar.dsp" - Package Owner=<4> Package=<5> {{{ From havoc at icculus.org Fri Mar 26 18:27:53 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 23:27:53 -0000 Subject: Module neither: Change committed Message-ID: <20040326232753.12576.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 23:27:53 UTC Log message: Tomaz fixed the workspace Modified files: darkwar/darkwar.dsw ------=MIME.9e79bbac13c2615f285d4f24862f6654 Content-Type: text/plain; name="neither.20040326.232753.havoc.diff" Content-Disposition: attachment; filename="neither.20040326.232753.havoc.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/darkwar.dsw diff -u neither/darkwar/darkwar.dsw:1.2 neither/darkwar/darkwar.dsw:1.3 --- neither/darkwar/darkwar.dsw:1.2 Fri Mar 26 18:19:52 2004 +++ neither/darkwar/darkwar.dsw Fri Mar 26 18:27:43 2004 @@ -3,7 +3,22 @@ ############################################################################### -Project: "darkwar"=".\darkwar.dsp" - Package Owner=<4> +Project: "darkwar"=.\darkwar.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name renderer + End Project Dependency +}}} + +############################################################################### + +Project: "renderer"=.\renderer\renderer.dsp - Package Owner=<4> Package=<5> {{{ From havoc at icculus.org Fri Mar 26 18:34:52 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 26 Mar 2004 23:34:52 -0000 Subject: Module neither: Change committed Message-ID: <20040326233452.13107.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-26 23:34:52 UTC Log message: Tomaz updated this project file Modified files: darkwar/renderer/renderer.dsp ------=MIME.09ca3fca416a37179e23da6dff8446ce Content-Type: text/plain; name="neither.20040326.233452.havoc.diff" Content-Disposition: attachment; filename="neither.20040326.233452.havoc.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/renderer/renderer.dsp diff -u neither/darkwar/renderer/renderer.dsp:1.1 neither/darkwar/renderer/renderer.dsp:1.2 --- neither/darkwar/renderer/renderer.dsp:1.1 Fri Mar 26 11:04:11 2004 +++ neither/darkwar/renderer/renderer.dsp Fri Mar 26 18:34:42 2004 @@ -63,8 +63,8 @@ # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -89,6 +89,10 @@ # End Source File # Begin Source File +SOURCE=.\main.c +# End Source File +# Begin Source File + SOURCE=.\ngl.c # End Source File # Begin Source File From havoc at icculus.org Fri Mar 26 19:12:22 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 27 Mar 2004 00:12:22 -0000 Subject: Module neither: Change committed Message-ID: <20040327001222.15303.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 00:12:22 UTC Log message: ignore move input for first two frames Modified files: darkwar/dwgame.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.001222.havoc.diff URL: From havoc at icculus.org Fri Mar 26 19:13:33 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 27 Mar 2004 00:13:33 -0000 Subject: Module neither: Change committed Message-ID: <20040327001333.15432.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 00:13:33 UTC Log message: cleaned up matrix handling a bit Modified files: darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.001333.havoc.diff URL: From havoc at icculus.org Fri Mar 26 19:27:31 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 27 Mar 2004 00:27:31 -0000 Subject: Module neither: Change committed Message-ID: <20040327002731.16570.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 00:27:31 UTC Log message: Tomaz's patch to add test geometry to look at, and fixed the yaw turning the wrong way Modified files: darkwar/dwgame.c darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.002731.havoc.diff URL: From havoc at icculus.org Fri Mar 26 19:42:28 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 27 Mar 2004 00:42:28 -0000 Subject: Module neither: Change committed Message-ID: <20040327004228.17750.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 00:42:28 UTC Log message: now supports fov Modified files: darkwar/dwgame.c darkwar/renderer/main.c darkwar/renderer/main.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.004228.havoc.diff URL: From havoc at icculus.org Fri Mar 26 19:46:56 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 27 Mar 2004 00:46:56 -0000 Subject: Module neither: Change committed Message-ID: <20040327004656.17989.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 00:46:56 UTC Log message: no longer weird vertical fov, now square fov like people expect Modified files: darkwar/dwgame.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.004656.havoc.diff URL: From coderjoe at icculus.org Sat Mar 27 00:03:48 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 05:03:48 -0000 Subject: Module neither: Change committed Message-ID: <20040327050348.31707.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 05:03:48 UTC Log message: add some more ignores Modified files: darkwar/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.050348.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 00:07:48 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 05:07:48 -0000 Subject: Module neither: Change committed Message-ID: <20040327050748.31943.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 05:07:48 UTC Log message: start on redefining msvc warnings to match gcc's warnings. Added files: darkwar/msvcwarnings.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.050748.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 00:09:00 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 05:09:00 -0000 Subject: Module neither: Change committed Message-ID: <20040327050900.32074.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 05:09:00 UTC Log message: use dwconfig.h to pull in the proper config items. (please make sure that you include this as the first thing. msvc's warning levels get redefined in here.) Added files: darkwar/dwconfig.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.050900.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 00:09:57 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 05:09:57 -0000 Subject: Module neither: Change committed Message-ID: <20040327050957.32194.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 05:09:57 UTC Log message: add/change to dwconfig.h Modified files: darkwar/crc.c darkwar/cvar.c darkwar/darkwar.dsp darkwar/dwgame.c darkwar/dwinput.c darkwar/dwmain.c darkwar/dwmap.c darkwar/dwmesh.c darkwar/hash.c darkwar/matrixlib.c darkwar/nconsole.c darkwar/nfile.c darkwar/nhost.c darkwar/nimage.c darkwar/nmemory.c darkwar/nstring.c darkwar/polygon.c darkwar/renderer/dyngl.c darkwar/renderer/main.c darkwar/renderer/ngl.c darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.050957.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 00:11:05 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 05:11:05 -0000 Subject: Module neither: Change committed Message-ID: <20040327051105.32286.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 05:11:05 UTC Log message: add Debug/Release dirs to the ignore list Modified files: darkwar/.cvsignore darkwar/renderer/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.051105.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 00:40:34 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 05:40:34 -0000 Subject: Module neither: Change committed Message-ID: <20040327054034.1546.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 05:40:34 UTC Log message: add some comments Modified files: darkwar/msvcwarnings.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.054034.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 00:43:00 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 05:43:00 -0000 Subject: Module neither: Change committed Message-ID: <20040327054300.1722.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 05:43:00 UTC Log message: whoops. newline at EOF. Modified files: darkwar/dwconfig.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.054300.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 00:46:23 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 05:46:23 -0000 Subject: Module neither: Change committed Message-ID: <20040327054623.1962.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 05:46:23 UTC Log message: add the new .c files from earlier to the scons config. Modified files: darkwar/SConstruct -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.054623.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 00:48:28 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 05:48:28 -0000 Subject: Module neither: Change committed Message-ID: <20040327054828.2159.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 05:48:28 UTC Log message: add UNUSED flag to silence compiler warning. Modified files: darkwar/dwinput.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.054828.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 02:43:53 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 07:43:53 -0000 Subject: Module neither: Change committed Message-ID: <20040327074353.7742.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 07:43:53 UTC Log message: add missing parameter names. Modified files: darkwar/renderer/dglfuncs.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.074353.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 02:44:45 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 07:44:45 -0000 Subject: Module neither: Change committed Message-ID: <20040327074445.7810.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 07:44:45 UTC Log message: add beginnings of debug stubs for OpenGL calls. Added files: darkwar/renderer/dynglstubs.c darkwar/renderer/dynglstubs.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.074445.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 02:49:33 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 07:49:33 -0000 Subject: Module neither: Change committed Message-ID: <20040327074933.8056.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 07:49:33 UTC Log message: add comments. Modified files: darkwar/TODO.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.074933.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 03:04:56 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 08:04:56 -0000 Subject: Module neither: Change committed Message-ID: <20040327080456.8946.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 08:04:56 UTC Log message: missed a config.h -> dwconfig.h Modified files: darkwar/ncommon.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.080456.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 03:08:56 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 08:08:56 -0000 Subject: Module neither: Change committed Message-ID: <20040327080856.9164.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 08:08:56 UTC Log message: er. forgot to check to see if we were already included. Modified files: darkwar/dwconfig.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.080856.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 05:25:15 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 10:25:15 -0000 Subject: Module neither: Change committed Message-ID: <20040327102515.19505.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 10:25:15 UTC Log message: fix includes to all be relative to the root source dir. Modified files: darkwar/renderer/main.c darkwar/renderer/ngl.c darkwar/renderer/ntextures.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.102515.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 06:30:50 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 11:30:50 -0000 Subject: Module neither: Change committed Message-ID: <20040327113050.22781.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 11:30:49 UTC Log message: flesh out the DynGL stubs system. (for some reason I cannot figure out, I get a warning on the three functions that take no parameters.) Stub functions still don't do the error checking they are intended to do, but everything renders properly. Modified files: darkwar/renderer/dyngl.c darkwar/renderer/dyngl.h darkwar/renderer/dynglstubs.c darkwar/renderer/dynglstubs.h darkwar/renderer/renderer.dsp ------=MIME.73d8eff9f75062cf1bd7d05590e13677 Content-Type: text/plain; name="neither.20040327.113049.coderjoe.diff" Content-Disposition: attachment; filename="neither.20040327.113049.coderjoe.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/renderer/dyngl.c diff -u neither/darkwar/renderer/dyngl.c:1.6 neither/darkwar/renderer/dyngl.c:1.7 --- neither/darkwar/renderer/dyngl.c:1.6 Sat Mar 27 00:09:47 2004 +++ neither/darkwar/renderer/dyngl.c Sat Mar 27 06:30:39 2004 @@ -11,7 +11,7 @@ other less-evolved hacks which usually don't work right. ;) */ static const char rcsid[] = -"$Id: dyngl.c,v 1.6 2004/03/27 05:09:47 coderjoe Exp $"; +"$Id: dyngl.c,v 1.7 2004/03/27 11:30:39 coderjoe Exp $"; #include "dwconfig.h" @@ -22,6 +22,7 @@ #include "SDL.h" #include "dyngl.h" +#include "dynglstubs.h" #include "matrixlib.h" /* @@ -87,6 +88,16 @@ #undef DYNGL_NEED #undef DYNGL_EXT #undef DYNGL_WANT +/* this set of function pointers contains the real functions, for use with the stub + * system. + */ +#define DYNGL_NEED(ret, name, args) ret (DYNGLENTRY * DynGL_Real_##name) args = NULL; +#define DYNGL_EXT(ret, name, args, extension) ret (DYNGLENTRY * DynGL_Real_##name) args = NULL; +#define DYNGL_WANT(ret, name, args, alt) ret (DYNGLENTRY * DynGL_Real_##name) args = NULL; +#include "dglfuncs.h" +#undef DYNGL_NEED +#undef DYNGL_EXT +#undef DYNGL_WANT /* Internal flag for shutting things down properly */ @@ -262,6 +273,13 @@ #undef DYNGL_NEED #undef DYNGL_EXT #undef DYNGL_WANT +#define DYNGL_NEED(ret, name, args) DynGL_Real_##name = NULL; +#define DYNGL_EXT(ret, name, args, extension) DynGL_Real_##name = NULL; +#define DYNGL_WANT(ret, name, args, alt) DynGL_Real_##name = NULL; +#include "dglfuncs.h" +#undef DYNGL_NEED +#undef DYNGL_EXT +#undef DYNGL_WANT return; } @@ -354,22 +372,22 @@ /* Assign all of the functions, except extensions */ #define DYNGL_NEED(ret, name, args) \ - if (!(q##name = SDL_GL_GetProcAddress (#name))) \ + if (!(DynGL_Real_##name = SDL_GL_GetProcAddress (#name))) \ { \ SDL_SetError ("DynGL_GetFunctions: can't find %s", #name); \ return SDL_FALSE; \ } #define DYNGL_EXT(ret, name, args, extension) #define DYNGL_WANT(ret, name, args, alt) \ - if (!(q##name = SDL_GL_GetProcAddress (#name))) \ - q##name = alt; + if (!(DynGL_Real_##name = SDL_GL_GetProcAddress (#name))) \ + DynGL_Real_##name = alt; #include "dglfuncs.h" #undef DYNGL_NEED #undef DYNGL_EXT #undef DYNGL_WANT /* Now we need the extensions list */ - gl_extensions_list = strdup (qglGetString (GL_EXTENSIONS)); + gl_extensions_list = strdup (DynGL_Real_glGetString (GL_EXTENSIONS)); p = gl_extensions_list; last = p + strlen (p); @@ -388,7 +406,7 @@ #define DYNGL_NEED(ret, name, args) #define DYNGL_EXT(ret, name, args, extension) \ if (DynGL_HasExtension (extension)) \ - if (!(q##name = SDL_GL_GetProcAddress (#name))) \ + if (!(DynGL_Real_##name = SDL_GL_GetProcAddress (#name))) \ { \ DynGL_BadExtension (extension); \ if (errfunc != NULL) \ @@ -405,12 +423,13 @@ */ #define DYNGL_EXT(ret, name, args, extension) \ if (!DynGL_HasExtension (extension)) \ - q##name = NULL; + DynGL_Real_##name = NULL; #include "dglfuncs.h" #undef DYNGL_NEED #undef DYNGL_EXT #undef DYNGL_WANT + DynGL_UseStubs (SDL_TRUE); return SDL_TRUE; } @@ -452,3 +471,33 @@ return SDL_FALSE; } +/* DynGL_UseStubs - enables or disables the debugging stub functions. */ +SDL_bool +DynGL_UseStubs (SDL_bool UseThem) +{ + if (!dyngl_loaded) + { + SDL_SetError ("DynGL_UseStubs: no OpenGL library loaded"); + return SDL_FALSE; + } + + if (UseThem) { +#define DYNGL_NEED(ret, name, args) q##name = DynGL_Stub_##name; +#define DYNGL_EXT(ret, name, args, extension) q##name = DynGL_Stub_##name; +#define DYNGL_WANT(ret, name, args, alt) q##name = DynGL_Stub_##name; +#include "dglfuncs.h" +#undef DYNGL_NEED +#undef DYNGL_EXT +#undef DYNGL_WANT + } else { +#define DYNGL_NEED(ret, name, args) q##name = DynGL_Real_##name; +#define DYNGL_EXT(ret, name, args, extension) q##name = DynGL_Real_##name; +#define DYNGL_WANT(ret, name, args, alt) q##name = DynGL_Real_##name; +#include "dglfuncs.h" +#undef DYNGL_NEED +#undef DYNGL_EXT +#undef DYNGL_WANT + } + + return SDL_TRUE; +} Index: neither/darkwar/renderer/dyngl.h diff -u neither/darkwar/renderer/dyngl.h:1.4 neither/darkwar/renderer/dyngl.h:1.5 --- neither/darkwar/renderer/dyngl.h:1.4 Fri Mar 26 08:02:06 2004 +++ neither/darkwar/renderer/dyngl.h Sat Mar 27 06:30:39 2004 @@ -29,7 +29,7 @@ whatsoever, express or implied, in the hopes that others will use it instead of other less-evolved hacks which usually don't work right. ;) - $Id: dyngl.h,v 1.4 2004/03/26 13:02:06 coderjoe Exp $ + $Id: dyngl.h,v 1.5 2004/03/27 11:30:39 coderjoe Exp $ */ #ifndef __dyngl_h @@ -99,6 +99,9 @@ * If the function is an ALT then it will be replaced * with the alternate function. If the function is a * NEED then errfunc will be called. + * DynGL_UseStubs - Enables or disables the use of debugging stubs, + * defined in dynglstubs.[ch], to do error checking + * transparently to the caller. */ SDL_bool DynGL_LoadLibrary (const char *name); void DynGL_CloseLibrary (void); @@ -106,6 +109,7 @@ SDL_bool DynGL_BadFunction (const char *func, void (*errfunc)(const char *fmt, ...)); SDL_bool DynGL_HasExtension (const char *ext); void DynGL_BadExtension (const char *ext); +SDL_bool DynGL_UseStubs (SDL_bool UseThem); /* * Types Index: neither/darkwar/renderer/dynglstubs.c diff -u neither/darkwar/renderer/dynglstubs.c:1.1 neither/darkwar/renderer/dynglstubs.c:1.2 --- neither/darkwar/renderer/dynglstubs.c:1.1 Sat Mar 27 02:44:35 2004 +++ neither/darkwar/renderer/dynglstubs.c Sat Mar 27 06:30:39 2004 @@ -7,125 +7,190 @@ #include "dwconfig.h" #include "dyngl.h" #include "dynglstubs.h" +#include "ntypes.h" + +Nbool InImmediateMode = false; // glGetError is not allowed between glBegin and glEnd. if it is called between // them, we need to scream loudly. -DYNGLCALL GLenum DYNGLENTRY DynGL_Stub_glGetError () +GLenum DYNGLENTRY +DynGL_Stub_glGetError () { + if(InImmediateMode) { + // TODO: COMPLAIN here. + } + return DynGL_Real_glGetError (); } // need to disable the error checking when glBegin is called // and re-enable it when glEnd is called. -DYNGLCALL void DYNGLENTRY DynGL_Stub_glBegin (GLenum mode) +void DYNGLENTRY +DynGL_Stub_glBegin (GLenum mode) { + InImmediateMode = true; + DynGL_Real_glBegin (mode); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glEnd () +void DYNGLENTRY +DynGL_Stub_glEnd () { + InImmediateMode = false; + DynGL_Real_glEnd (); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glBindTexture (GLenum target, GLuint texture) +void DYNGLENTRY +DynGL_Stub_glBindTexture (GLenum target, GLuint texture) { + DynGL_Real_glBindTexture (target, texture); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glClear (GLbitfield mask) +void DYNGLENTRY +DynGL_Stub_glClear (GLbitfield mask) { + DynGL_Real_glClear (mask); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) +void DYNGLENTRY +DynGL_Stub_glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { + DynGL_Real_glColor4f (red, green, blue, alpha); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glDeleteTextures (GLsizei n, const GLuint * textures) +void DYNGLENTRY +DynGL_Stub_glDeleteTextures (GLsizei n, const GLuint * textures) { + DynGL_Real_glDeleteTextures(n, textures); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glDisable (GLenum cap) +void DYNGLENTRY +DynGL_Stub_glDisable (GLenum cap) { + DynGL_Real_glDisable (cap); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glEnable (GLenum cap) +void DYNGLENTRY +DynGL_Stub_glEnable (GLenum cap) { + DynGL_Real_glEnable (cap); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) +void DYNGLENTRY +DynGL_Stub_glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) { + DynGL_Real_glFrustum (left, right, bottom, top, zNear, zFar); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glGenTextures (GLsizei n, GLuint * textures) +void DYNGLENTRY +DynGL_Stub_glGenTextures (GLsizei n, GLuint * textures) { + DynGL_Real_glGenTextures (n, textures); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glGetIntegerv (GLenum pname, GLint * params) +void DYNGLENTRY +DynGL_Stub_glGetIntegerv (GLenum pname, GLint * params) { + DynGL_Real_glGetIntegerv (pname, params); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glLoadIdentity () +void DYNGLENTRY +DynGL_Stub_glLoadIdentity () { + DynGL_Real_glLoadIdentity (); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glLoadMatrixd (const GLdouble * m) +void DYNGLENTRY +DynGL_Stub_glLoadMatrixd (const GLdouble * m) { + DynGL_Real_glLoadMatrixd (m); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glMatrixMode (GLenum mode) +void DYNGLENTRY +DynGL_Stub_glMatrixMode (GLenum mode) { + DynGL_Real_glMatrixMode (mode); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) +void DYNGLENTRY +DynGL_Stub_glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) { + DynGL_Real_glOrtho (left, right, bottom, top, zNear, zFar); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glTexCoord2f (GLfloat s, GLfloat t) +void DYNGLENTRY +DynGL_Stub_glTexCoord2f (GLfloat s, GLfloat t) { + DynGL_Real_glTexCoord2f (s, t); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) +void DYNGLENTRY +DynGL_Stub_glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) { + DynGL_Real_glTexImage2D (target, level, internalformat, width, height, border, format, type, pixels); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glTexParameteri (GLenum target, GLenum pname, GLint param) +void DYNGLENTRY +DynGL_Stub_glTexParameteri (GLenum target, GLenum pname, GLint param) { + DynGL_Real_glTexParameteri (target, pname, param); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glVertex3f (GLfloat x, GLfloat y, GLfloat z) +void DYNGLENTRY +DynGL_Stub_glVertex3f (GLfloat x, GLfloat y, GLfloat z) { + DynGL_Real_glVertex3f (x, y, z); } - -DYNGLCALL const GLubyte * DYNGLENTRY DynGL_Stub_glGetString (GLenum name) +const GLubyte * DYNGLENTRY +DynGL_Stub_glGetString (GLenum name) { + return DynGL_Real_glGetString (name); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glMultMatrixd (const GLdouble * m) +void DYNGLENTRY +DynGL_Stub_glMultMatrixd (const GLdouble * m) { + DynGL_Real_glMultMatrixd (m); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices) +void DYNGLENTRY +DynGL_Stub_glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices) { + DynGL_Real_glDrawElements (mode, count, type, indices); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) +void DYNGLENTRY +DynGL_Stub_glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) { + DynGL_Real_glDrawRangeElements (mode, start, end, count, type, indices); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) +void DYNGLENTRY +DynGL_Stub_glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) { + DynGL_Real_glDrawRangeElementsEXT (mode, start, end, count, type, indices); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glLoadTransposeMatrixd (const GLdouble * m) +void DYNGLENTRY +DynGL_Stub_glLoadTransposeMatrixd (const GLdouble * m) { + DynGL_Real_glLoadTransposeMatrixd (m); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glMultTransposeMatrixd (const GLdouble * m) +void DYNGLENTRY +DynGL_Stub_glMultTransposeMatrixd (const GLdouble * m) { + DynGL_Real_glMultTransposeMatrixd (m); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glLoadTransposeMatrixdARB (const GLdouble * m) +void DYNGLENTRY +DynGL_Stub_glLoadTransposeMatrixdARB (const GLdouble * m) { + DynGL_Real_glLoadTransposeMatrixdARB (m); } -DYNGLCALL void DYNGLENTRY DynGL_Stub_glMultTransposeMatrixdARB (const GLdouble * m) +void DYNGLENTRY +DynGL_Stub_glMultTransposeMatrixdARB (const GLdouble * m) { + DynGL_Real_glMultTransposeMatrixdARB (m); } Index: neither/darkwar/renderer/dynglstubs.h diff -u neither/darkwar/renderer/dynglstubs.h:1.1 neither/darkwar/renderer/dynglstubs.h:1.2 --- neither/darkwar/renderer/dynglstubs.h:1.1 Sat Mar 27 02:44:35 2004 +++ neither/darkwar/renderer/dynglstubs.h Sat Mar 27 06:30:39 2004 @@ -1,4 +1,8 @@ -/* this file declares stubs for all the OpenGL functions. */ +/* + dynglstubs.h - declares prototypes for stub functions based + on dglfuncs.h. this file is only meant to be included by + dyngl.c and dynglstubs.c. +*/ #ifndef _dynglstubs_h_ #define _dynglstubs_h_ @@ -17,4 +21,20 @@ #undef DYNGL_EXT #undef DYNGL_WANT +/* and now a set of function pointers to hold the REAL opengl functions. the + qgl* functions just get switched between these... + (these are here because they are private between dyngl.c and dynglstubs.c) + */ +#define DYNGL_NEED(ret, name, args) \ + DYNGLCALL ret (DYNGLENTRY * DynGL_Real_##name) args; +#define DYNGL_EXT(ret, name, args, extension) \ + DYNGLCALL ret (DYNGLENTRY * DynGL_Real_##name) args; +#define DYNGL_WANT(ret, name, args, alt) \ + DYNGLCALL ret (DYNGLENTRY * DynGL_Real_##name) args; +#include "dglfuncs.h" +#undef DYNGL_NEED +#undef DYNGL_EXT +#undef DYNGL_WANT + + #endif /* _dynglstubs_h_ */ Index: neither/darkwar/renderer/renderer.dsp diff -u neither/darkwar/renderer/renderer.dsp:1.2 neither/darkwar/renderer/renderer.dsp:1.3 --- neither/darkwar/renderer/renderer.dsp:1.2 Fri Mar 26 18:34:42 2004 +++ neither/darkwar/renderer/renderer.dsp Sat Mar 27 06:30:39 2004 @@ -89,6 +89,10 @@ # End Source File # Begin Source File +SOURCE=.\dynglstubs.c +# End Source File +# Begin Source File + SOURCE=.\main.c # End Source File # Begin Source File @@ -113,6 +117,10 @@ # End Source File # Begin Source File +SOURCE=.\dynglstubs.h +# End Source File +# Begin Source File + SOURCE=.\ngl.h # End Source File # Begin Source File From coderjoe at icculus.org Sat Mar 27 06:33:55 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 11:33:55 -0000 Subject: Module neither: Change committed Message-ID: <20040327113355.23134.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 11:33:55 UTC Log message: add dynglstubs.c to the scons config. Modified files: darkwar/SConstruct -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.113355.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 06:35:29 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 11:35:29 -0000 Subject: Module neither: Change committed Message-ID: <20040327113529.23264.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 11:35:29 UTC Log message: add dynglstubs.c to the Makefile. Modified files: darkwar/Makefile -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.113529.coderjoe.diff URL: From black at icculus.org Sat Mar 27 06:46:34 2004 From: black at icculus.org (black at icculus.org) Date: 27 Mar 2004 11:46:34 -0000 Subject: Module neither: Change committed Message-ID: <20040327114634.23960.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 11:46:34 UTC Log message: Fixed some warnings. Modified files: darkwar/renderer/dglfuncs.h darkwar/renderer/dyngl.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.114634.black.diff URL: From black at icculus.org Sat Mar 27 09:40:24 2004 From: black at icculus.org (black at icculus.org) Date: 27 Mar 2004 14:40:24 -0000 Subject: Module neither: Change committed Message-ID: <20040327144024.876.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 14:40:23 UTC Log message: DW should compile under C++ now, too. Modified files: darkwar/cvar.c darkwar/dwmap.c darkwar/dwmesh.c darkwar/fallbackconfig.h darkwar/hash.c darkwar/ncommon.h darkwar/nfile.c darkwar/nhost.c darkwar/nimage.c darkwar/nimage.h darkwar/nmemory.c darkwar/nmemory.h darkwar/nstring.c darkwar/ntypes.h darkwar/renderer/dyngl.c darkwar/renderer/main.c darkwar/renderer/ngl.c darkwar/renderer/ngl.h darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.144023.black.diff URL: From coderjoe at icculus.org Sat Mar 27 10:35:40 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 15:35:40 -0000 Subject: Module neither: Change committed Message-ID: <20040327153540.5325.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 15:35:39 UTC Log message: roll back black's commit. Modified files: darkwar/cvar.c darkwar/dwmap.c darkwar/dwmesh.c darkwar/fallbackconfig.h darkwar/hash.c darkwar/ncommon.h darkwar/nfile.c darkwar/nhost.c darkwar/nimage.c darkwar/nimage.h darkwar/nmemory.c darkwar/nmemory.h darkwar/nstring.c darkwar/ntypes.h darkwar/renderer/dyngl.c darkwar/renderer/main.c darkwar/renderer/ngl.c darkwar/renderer/ngl.h darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.153539.coderjoe.diff URL: From coderjoe at icculus.org Sat Mar 27 11:05:19 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 16:05:19 -0000 Subject: Module neither: Change committed Message-ID: <20040327160519.8100.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 16:05:19 UTC Log message: add more msvc droppings. Modified files: darkwar/renderer/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.160519.coderjoe.diff URL: From tomaz at icculus.org Sat Mar 27 11:59:15 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 27 Mar 2004 16:59:15 -0000 Subject: Module neither: New directory darkwar/game/ Message-ID: <20040327165915.11966.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 16:59:15 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/game added to the repository From tomaz at icculus.org Sat Mar 27 12:01:13 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 27 Mar 2004 17:01:13 -0000 Subject: Module neither: Change committed Message-ID: <20040327170113.12188.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 17:01:13 UTC Log message: testing.. these dont work yet Added files: darkwar/game/particle.c darkwar/game/particle.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.170113.tomaz.diff URL: From tomaz at icculus.org Sat Mar 27 12:04:11 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 27 Mar 2004 17:04:11 -0000 Subject: Module neither: Change committed Message-ID: <20040327170411.12405.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 17:04:11 UTC Log message: fixing the missing dwconfig include Modified files: darkwar/game/particle.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.170411.tomaz.diff URL: From black at icculus.org Sat Mar 27 12:35:49 2004 From: black at icculus.org (black at icculus.org) Date: 27 Mar 2004 17:35:49 -0000 Subject: Module neither: Change committed Message-ID: <20040327173549.14443.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 17:35:49 UTC Log message: More stuff using Ntypes now. Modified files: darkwar/cvar.c darkwar/nfile.c darkwar/nfile.h darkwar/nimage.c darkwar/nimage.h darkwar/ntypes.h darkwar/renderer/ngl.c darkwar/renderer/ngl.h darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.173549.black.diff URL: From tomaz at icculus.org Sat Mar 27 12:40:03 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 27 Mar 2004 17:40:03 -0000 Subject: Module neither: Change committed Message-ID: <20040327174003.14692.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 17:40:03 UTC Log message: now this actually compiles.. and also added the game.dsp Modified files: darkwar/game/particle.c darkwar/game/particle.h Added files: darkwar/game/game.dsp -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.174003.tomaz.diff URL: From tomaz at icculus.org Sat Mar 27 12:41:07 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 27 Mar 2004 17:41:07 -0000 Subject: Module neither: Change committed Message-ID: <20040327174107.14823.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 17:41:07 UTC Log message: updated project file Modified files: darkwar/darkwar.dsw ------=MIME.0a2383f9e71810ca4f42bc36204e1efe Content-Type: text/plain; name="neither.20040327.174107.tomaz.diff" Content-Disposition: attachment; filename="neither.20040327.174107.tomaz.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/darkwar.dsw diff -u neither/darkwar/darkwar.dsw:1.3 neither/darkwar/darkwar.dsw:1.4 --- neither/darkwar/darkwar.dsw:1.3 Fri Mar 26 18:27:43 2004 +++ neither/darkwar/darkwar.dsw Sat Mar 27 12:40:57 2004 @@ -3,7 +3,7 @@ ############################################################################### -Project: "darkwar"=.\darkwar.dsp - Package Owner=<4> +Project: "darkwar"=".\darkwar.dsp" - Package Owner=<4> Package=<5> {{{ @@ -14,11 +14,26 @@ Begin Project Dependency Project_Dep_Name renderer End Project Dependency + Begin Project Dependency + Project_Dep_Name game + End Project Dependency +}}} + +############################################################################### + +Project: "game"=".\game\game.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ }}} ############################################################################### -Project: "renderer"=.\renderer\renderer.dsp - Package Owner=<4> +Project: "renderer"=".\renderer\renderer.dsp" - Package Owner=<4> Package=<5> {{{ From tomaz at icculus.org Sat Mar 27 12:44:57 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 27 Mar 2004 17:44:57 -0000 Subject: Module neither: Change committed Message-ID: <20040327174457.15042.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 17:44:57 UTC Log message: updated these with 4 more gl functions Modified files: darkwar/renderer/dglfuncs.h darkwar/renderer/dynglstubs.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.174457.tomaz.diff URL: From havoc at icculus.org Sat Mar 27 12:57:37 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 27 Mar 2004 17:57:37 -0000 Subject: Module neither: Change committed Message-ID: <20040327175737.16105.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 17:57:37 UTC Log message: added a list of Game submodules Modified files: darkwar/enginedesign.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.175737.havoc.diff URL: From tomaz at icculus.org Sat Mar 27 13:34:24 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 27 Mar 2004 18:34:24 -0000 Subject: Module neither: Change committed Message-ID: <20040327183424.18162.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 18:34:24 UTC Log message: fixed a few things and added a test explosion Modified files: darkwar/game/particle.c darkwar/game/particle.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.183424.tomaz.diff URL: From tomaz at icculus.org Sat Mar 27 13:35:25 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 27 Mar 2004 18:35:25 -0000 Subject: Module neither: Change committed Message-ID: <20040327183525.18267.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 18:35:25 UTC Log message: testing out the new explosion Modified files: darkwar/dwgame.c darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.183525.tomaz.diff URL: From havoc at icculus.org Sat Mar 27 13:57:39 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 27 Mar 2004 18:57:39 -0000 Subject: Module neither: Change committed Message-ID: <20040327185739.19516.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 18:57:39 UTC Log message: fixed prototype for File_AddPath Modified files: darkwar/nfile.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.185739.havoc.diff URL: From black at icculus.org Sat Mar 27 14:01:14 2004 From: black at icculus.org (black at icculus.org) Date: 27 Mar 2004 19:01:14 -0000 Subject: Module neither: Change committed Message-ID: <20040327190114.19731.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 19:01:14 UTC Log message: Added Min, Max and Bound. Modified files: darkwar/ncommon.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.190114.black.diff URL: From warp at icculus.org Sat Mar 27 14:05:16 2004 From: warp at icculus.org (warp at icculus.org) Date: 27 Mar 2004 19:05:16 -0000 Subject: Module neither: Change committed Message-ID: <20040327190516.19957.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 19:05:16 UTC Log message: Er, it is a list of .o files, not .c files. Modified files: darkwar/Makefile -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.190516.warp.diff URL: From tomaz at icculus.org Sat Mar 27 14:06:23 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 27 Mar 2004 19:06:23 -0000 Subject: Module neither: Change committed Message-ID: <20040327190623.20063.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 19:06:23 UTC Log message: added particledot texture generator to Texture_Getand removed some crap from Particle_Init Modified files: darkwar/renderer/ntextures.c darkwar/game/particle.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.190623.tomaz.diff URL: From havoc at icculus.org Sat Mar 27 14:14:17 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 27 Mar 2004 19:14:17 -0000 Subject: Module neither: Change committed Message-ID: <20040327191417.20498.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 19:14:17 UTC Log message: fixed make clean added game/particle.o Modified files: darkwar/Makefile -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.191417.havoc.diff URL: From warp at icculus.org Sat Mar 27 14:15:48 2004 From: warp at icculus.org (warp at icculus.org) Date: 27 Mar 2004 19:15:48 -0000 Subject: Module neither: Change committed Message-ID: <20040327191548.20658.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 19:15:48 UTC Log message: Add game/particle.c Modified files: darkwar/SConstruct -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.191548.warp.diff URL: From warp at icculus.org Sat Mar 27 15:06:11 2004 From: warp at icculus.org (warp at icculus.org) Date: 27 Mar 2004 20:06:11 -0000 Subject: Module neither: New directory darkwar/fs/ Message-ID: <20040327200611.23277.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 20:06:11 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/fs added to the repository From coderjoe at icculus.org Sat Mar 27 15:32:50 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 20:32:50 -0000 Subject: Module neither: Change committed Message-ID: <20040327203250.24826.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 20:32:50 UTC Log message: flag as binary. (update with -A) Modified files: darkwar/game/game.dsp ------=MIME.418222d5537de5eb5caac71355bdf116 Content-Type: text/plain; name="neither.20040327.203250.coderjoe.diff" Content-Disposition: attachment; filename="neither.20040327.203250.coderjoe.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/game/game.dsp diff -u neither/darkwar/game/game.dsp:1.1 neither/darkwar/game/game.dsp:1.2 --- neither/darkwar/game/game.dsp:1.1 Sat Mar 27 12:39:53 2004 +++ neither/darkwar/game/game.dsp Sat Mar 27 15:32:40 2004 @@ -1,100 +1,100 @@ -# Microsoft Developer Studio Project File - Name="game" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=game - 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 "game.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 "game.mak" CFG="game - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "game - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "game - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "game - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "game - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "game - Win32 Release" -# Name "game - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\particle.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\particle.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="game" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=game - 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 "game.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 "game.mak" CFG="game - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "game - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "game - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "game - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "game - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "game - Win32 Release" +# Name "game - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\particle.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\particle.h +# End Source File +# End Group +# End Target +# End Project From coderjoe at icculus.org Sat Mar 27 15:42:39 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 27 Mar 2004 20:42:39 -0000 Subject: Module CVSROOT: Change committed Message-ID: <20040327204239.25301.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : CVSROOT Commit time: 2004-03-27 20:42:39 UTC Log message: add file types to cvswrappers to make files that should be marked "binary" actually so. Modified files: cvswrappers -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: CVSROOT.20040327.204239.coderjoe.diff URL: From warp at icculus.org Sat Mar 27 15:57:51 2004 From: warp at icculus.org (warp at icculus.org) Date: 27 Mar 2004 20:57:51 -0000 Subject: Module neither: Change committed Message-ID: <20040327205751.26089.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 20:57:51 UTC Log message: Completely non-operational fs code, needs heavy changes. Update the SConstruct to be a little cleaner, and for the fs code. Modified files: darkwar/SConstruct darkwar/scons_config.py Added files: darkwar/fs/dir.h darkwar/fs/dir_posix.c darkwar/fs/dir_win32.c darkwar/fs/embedded.c darkwar/fs/embedded.h darkwar/fs/fs.c darkwar/fs/fs.h darkwar/fs/fs_hash.c darkwar/fs/fs_hash.h darkwar/fs/fs_new.c darkwar/fs/fs_new.h darkwar/fs/pak.c darkwar/fs/pak.h darkwar/fs/rw_ops.c darkwar/fs/rw_ops.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.205751.warp.diff URL: From warp at icculus.org Sat Mar 27 16:12:39 2004 From: warp at icculus.org (warp at icculus.org) Date: 27 Mar 2004 21:12:39 -0000 Subject: Module neither: Change committed Message-ID: <20040327211239.26859.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 21:12:38 UTC Log message: Memory_ZAlloc, same as Memory_Zone_Alloc but bloody shorter to type. Modified files: darkwar/nmemory.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.211238.warp.diff URL: From black at icculus.org Sat Mar 27 16:43:51 2004 From: black at icculus.org (black at icculus.org) Date: 27 Mar 2004 21:43:51 -0000 Subject: Module neither: Change committed Message-ID: <20040327214351.29229.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 21:43:50 UTC Log message: Using Mem_ instead of Memory_ now. Modified files: darkwar/cvar.c darkwar/dwmain.c darkwar/dwmap.c darkwar/nfile.c darkwar/nimage.c darkwar/nmemory.c darkwar/nmemory.h darkwar/nstring.c darkwar/game/particle.c darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.214350.black.diff URL: From black at icculus.org Sat Mar 27 17:13:49 2004 From: black at icculus.org (black at icculus.org) Date: 27 Mar 2004 22:13:49 -0000 Subject: Module neither: Change committed Message-ID: <20040327221349.31471.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 22:13:49 UTC Log message: I forgot to replace MEMORY_ with MEM_. Modified files: darkwar/nmemory.c darkwar/nmemory.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.221349.black.diff URL: From havoc at icculus.org Sat Mar 27 18:21:31 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 27 Mar 2004 23:21:31 -0000 Subject: Module neither: Change committed Message-ID: <20040327232131.3325.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-27 23:21:30 UTC Log message: some String functions now take a zone parameter Modified files: darkwar/nstring.c darkwar/nstring.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040327.232130.havoc.diff URL: From warp at icculus.org Sat Mar 27 19:05:36 2004 From: warp at icculus.org (warp at icculus.org) Date: 28 Mar 2004 00:05:36 -0000 Subject: Module neither: Change committed Message-ID: <20040328000536.6088.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 00:05:35 UTC Log message: Two noticeable things. The first is to fix up all the various Mem_Alloc calls. The second is a good bit more work in the fs code. I've commented out most of nfile.c but I have not replaced it yet, er, getting there slowly. Modified files: darkwar/SConstruct darkwar/cvar.c darkwar/dwmain.c darkwar/nfile.c darkwar/nimage.c darkwar/nmemory.c darkwar/nmemory.h darkwar/nstring.c darkwar/nstring.h darkwar/fs/fs.c darkwar/fs/fs.h darkwar/fs/fs_new.c darkwar/fs/fs_new.h darkwar/fs/pak.c darkwar/fs/rw_ops.c darkwar/game/particle.c darkwar/renderer/ntextures.c Removed files: darkwar/fs/fs_hash.c darkwar/fs/fs_hash.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.000535.warp.diff URL: From warp at icculus.org Sat Mar 27 19:07:52 2004 From: warp at icculus.org (warp at icculus.org) Date: 28 Mar 2004 00:07:52 -0000 Subject: Module neither: Change committed Message-ID: <20040328000752.6226.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 00:07:52 UTC Log message: Ok, mathlib.h Modified files: darkwar/ncommon.h Added files: darkwar/mathlib.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.000752.warp.diff URL: From warp at icculus.org Sat Mar 27 19:08:45 2004 From: warp at icculus.org (warp at icculus.org) Date: 28 Mar 2004 00:08:45 -0000 Subject: Module neither: Change committed Message-ID: <20040328000845.6313.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 00:08:45 UTC Log message: Whoops. Modified files: darkwar/mathlib.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.000845.warp.diff URL: From warp at icculus.org Sat Mar 27 21:33:06 2004 From: warp at icculus.org (warp at icculus.org) Date: 28 Mar 2004 02:33:06 -0000 Subject: Module neither: Change committed Message-ID: <20040328023306.13287.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 02:33:06 UTC Log message: Endian detection, feel free to rewrite how it figures out the current endian. Added files: darkwar/nendian.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.023306.warp.diff URL: From warp at icculus.org Sat Mar 27 21:46:29 2004 From: warp at icculus.org (warp at icculus.org) Date: 28 Mar 2004 02:46:29 -0000 Subject: Module neither: Change committed Message-ID: <20040328024629.13880.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 02:46:28 UTC Log message: Add BIT to mathlib, and make the fs code compile! We don't link because of the old commented out file code, and I'm off to redesign the FS code to suit what we actually need. Modified files: darkwar/SConstruct darkwar/mathlib.h darkwar/fs/dir_posix.c darkwar/fs/pak.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.024628.warp.diff URL: From havoc at icculus.org Sat Mar 27 23:16:44 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 28 Mar 2004 04:16:44 -0000 Subject: Module neither: Change committed Message-ID: <20040328041644.18177.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 04:16:44 UTC Log message: note about DWGame needing proper quitting Modified files: darkwar/TODO.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.041644.havoc.diff URL: From havoc at icculus.org Sat Mar 27 23:17:35 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 28 Mar 2004 04:17:35 -0000 Subject: Module neither: Change committed Message-ID: <20040328041735.18264.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 04:17:35 UTC Log message: cleaned up design, it is now file by file, the names are open to discussion Modified files: darkwar/enginedesign.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.041735.havoc.diff URL: From warp at icculus.org Sun Mar 28 04:36:23 2004 From: warp at icculus.org (warp at icculus.org) Date: 28 Mar 2004 09:36:23 -0000 Subject: Module neither: Change committed Message-ID: <20040328093623.32351.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 09:36:23 UTC Log message: Reloading /should/ work now, but there are absolutely no test cases. Modified files: darkwar/fs/dir_posix.c darkwar/fs/fs.c darkwar/fs/fs.h darkwar/fs/pak.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.093623.warp.diff URL: From black at icculus.org Sun Mar 28 04:47:18 2004 From: black at icculus.org (black at icculus.org) Date: 28 Mar 2004 09:47:18 -0000 Subject: Module neither: Change committed Message-ID: <20040328094718.830.qmail@icculus.org> Commiter : black CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 09:47:18 UTC Log message: Small changes.(size is now of type Nsize in the Alloc struct, too.) Modified files: darkwar/nmemory.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.094718.black.diff URL: From warp at icculus.org Sun Mar 28 05:39:35 2004 From: warp at icculus.org (warp at icculus.org) Date: 28 Mar 2004 10:39:35 -0000 Subject: Module neither: Change committed Message-ID: <20040328103935.3643.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 10:39:35 UTC Log message: Fix nendian.h. We compile and link again! The new fs code is now vaguely connected, still needs work. I need help tracking down this bloody segfault though. Modified files: darkwar/dwgame.c darkwar/nendian.h darkwar/nfile.c darkwar/fs/fs.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.103935.warp.diff URL: From warp at icculus.org Sun Mar 28 05:50:27 2004 From: warp at icculus.org (warp at icculus.org) Date: 28 Mar 2004 10:50:27 -0000 Subject: Module neither: Change committed Message-ID: <20040328105027.4310.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 10:50:27 UTC Log message: DOH! Modified files: darkwar/fs/dir_posix.c darkwar/fs/fs.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.105027.warp.diff URL: From warp at icculus.org Sun Mar 28 06:16:01 2004 From: warp at icculus.org (warp at icculus.org) Date: 28 Mar 2004 11:16:01 -0000 Subject: Module neither: Change committed Message-ID: <20040328111601.5689.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 11:16:01 UTC Log message: Whoops, things should /work/ now. Modified files: darkwar/nfile.c darkwar/fs/dir_posix.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.111601.warp.diff URL: From coderjoe at icculus.org Sun Mar 28 07:58:03 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 12:58:03 -0000 Subject: Module neither: Change committed Message-ID: <20040328125803.12127.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 12:58:03 UTC Log message: add HAVE_ENDIAN_H define and use it around #include Modified files: darkwar/fallbackconfig.h darkwar/nendian.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.125803.coderjoe.diff URL: From coderjoe at icculus.org Sun Mar 28 08:33:03 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 13:33:03 -0000 Subject: Module neither: Change committed Message-ID: <20040328133303.14007.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 13:33:03 UTC Log message: add cvsignore to "game" Added files: darkwar/game/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.133303.coderjoe.diff URL: From coderjoe at icculus.org Sun Mar 28 08:33:45 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 13:33:45 -0000 Subject: Module neither: Change committed Message-ID: <20040328133345.14090.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 13:33:45 UTC Log message: add cvsignore to "fs" Added files: darkwar/fs/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.133345.coderjoe.diff URL: From coderjoe at icculus.org Sun Mar 28 08:35:13 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 13:35:13 -0000 Subject: Module neither: Change committed Message-ID: <20040328133513.14215.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 13:35:13 UTC Log message: fix up fs/dir_win32.c update msvc6 projects. Modified files: darkwar/darkwar.dsw darkwar/fs/dir_win32.c Added files: darkwar/fs/fs.dsp ------=MIME.59ecbb129a9e3fca80d85d5fe1429ca4 Content-Type: text/plain; name="neither.20040328.133513.coderjoe.diff" Content-Disposition: attachment; filename="neither.20040328.133513.coderjoe.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/darkwar.dsw diff -u neither/darkwar/darkwar.dsw:1.4 neither/darkwar/darkwar.dsw:1.5 --- neither/darkwar/darkwar.dsw:1.4 Sat Mar 27 12:40:57 2004 +++ neither/darkwar/darkwar.dsw Sun Mar 28 08:35:03 2004 @@ -3,7 +3,7 @@ ############################################################################### -Project: "darkwar"=".\darkwar.dsp" - Package Owner=<4> +Project: "darkwar"=.\darkwar.dsp - Package Owner=<4> Package=<5> {{{ @@ -17,11 +17,26 @@ Begin Project Dependency Project_Dep_Name game End Project Dependency + Begin Project Dependency + Project_Dep_Name fs + End Project Dependency +}}} + +############################################################################### + +Project: "fs"=.\fs\fs.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ }}} ############################################################################### -Project: "game"=".\game\game.dsp" - Package Owner=<4> +Project: "game"=.\game\game.dsp - Package Owner=<4> Package=<5> {{{ @@ -33,7 +48,7 @@ ############################################################################### -Project: "renderer"=".\renderer\renderer.dsp" - Package Owner=<4> +Project: "renderer"=.\renderer\renderer.dsp - Package Owner=<4> Package=<5> {{{ Index: neither/darkwar/fs/dir_win32.c diff -u neither/darkwar/fs/dir_win32.c:1.1 neither/darkwar/fs/dir_win32.c:1.2 --- neither/darkwar/fs/dir_win32.c:1.1 Sat Mar 27 15:57:41 2004 +++ neither/darkwar/fs/dir_win32.c Sun Mar 28 08:35:03 2004 @@ -23,118 +23,242 @@ */ static const char rcsid[] = - "$Id: dir_win32.c,v 1.1 2004/03/27 20:57:41 warp Exp $"; + "$Id: dir_win32.c,v 1.2 2004/03/28 13:35:03 coderjoe Exp $"; -#include "twiconfig.h" +#include "dwconfig.h" #include #include #include #include +#include #include -#include "common.h" -#include "strlib.h" -#include "qtypes.h" -#include "fs.h" -#include "fs_hash.h" -#include "dir.h" +#include "ncommon.h" +#include "nconsole.h" +#include "nstring.h" +#include "ntypes.h" +#include "fs/fs.h" +#include "fs/dir.h" typedef struct fsd_group_s { - char *path; + char *path; + NUint seq; } fsd_group_t; +typedef struct fsd_file_s { + char *path; + NUint last_seen; + time_t mtime; +} fsd_file_t; + static void FSD_Free (fs_group_t *group) { - Zone_Free (group->fs_data); + Mem_Free (group->fs_data); } static void FSD_Free_File (fs_file_t *file) { - Zone_Free (file->name_base); + fsd_file_t *f = file->fs_data; + + Mem_Free (f->path); + Mem_Free (f); + Mem_Free (file->h.name); } static SDL_RWops * FSD_Open_File (fs_file_t *file, Uint32 flags) { - fsd_group_t *dir; - char *name; + fsd_file_t *f = file->fs_data; SDL_RWops *rw; - dir = file->group->fs_data; - if (file->ext) - name = zasprintf (tempzone, "%s/%s.%s", dir->path, file->name_base, file->ext); - else - name = zasprintf (tempzone, "%s/%s", dir->path, file->name_base); - - if (flags & FSF_WRITE) { - if (file->group->flags & FS_READ_ONLY) { - Com_Printf ("Refusing to open '%s' in write mode.\n", name); + if (flags & FSO_WRITE) { + if (file->group->flags & FSG_READ_ONLY) { + Console_Printf ("Refusing to open '%s' in write mode.\n", f->path); rw = NULL; } else - rw = SDL_RWFromFile (name, (flags & FSF_ASCII) ? "w" : "wb"); + rw = SDL_RWFromFile (f->path, (flags & FSO_ASCII) ? "w" : "wb"); } else - rw = SDL_RWFromFile (name, (flags & FSF_ASCII) ? "r" : "rb"); + rw = SDL_RWFromFile (f->path, (flags & FSO_ASCII) ? "r" : "rb"); - Zone_Free (name); return rw; } static void -FSD_Add_Dir (fs_group_t *group, fsd_group_t *g_dir, char *path, int depth) +FSD_Add_File (fs_group_t *group, fsd_group_t *g_dir, struct _finddata_t *n_file, char *name, char *path) +{ + fsd_file_t *f; + + f = Mem_Alloc (fs_zone, sizeof (fsd_file_t)); + String_Set (&f->path, fs_zone, path); + f->last_seen = g_dir->seq; + f->mtime = n_file->time_write; + + FS_Add_File (group, name, n_file->size, FSD_Open_File, f, 0); +} + +static void +FSD_Purge_Old (fs_group_t *group) +{ + fsd_group_t *dgroup = (fsd_group_t *) group->fs_data; + fs_file_t *file; + fsd_file_t *dfile; + hash_value_t *val, *next; + NUint i; + + for (i = 0; i < group->files->length; i++) { + val = group->files->values[i]; + while (val) { + next = val->next; + file = (fs_file_t *) val->data; + dfile = (fsd_file_t *) file->fs_data; + if (dfile->last_seen != dgroup->seq) + hash_del (group->files, val->data); + val = next; + } + } +} + +static void +FSD_Reload_Dir (fs_group_t *group, fsd_group_t *g_dir, char *path, int depth) { long int dir; struct _finddata_t n_file; - char *file, *tmp; + char file_id[512], full_path[512], f_path[512], *tmp; + fs_file_t *file; + hash_data_t search; if (depth > 32) return; - tmp = zasprintf(fs_zone, "%s/%s/*", g_dir->path, path); + if (path) + snprintf (full_path, sizeof (full_path), "%s/%s/", g_dir->path, path); + else + snprintf (full_path, sizeof (full_path), "%s/", g_dir->path); + + tmp = String_APrintf (fs_zone, "%s*", full_path); dir = _findfirst (tmp, &n_file); + Mem_Free (tmp); + +// Com_DFPrintf (DEBUG_FS, "Posix Add Dir: %s %p\n", full_path, dir); + if (dir!=-1) { + g_dir->seq++; + goto fire; + } + Console_Printf("FSD_Add_Dir: Unable to open %s. (%s)\n", full_path, strerror(errno)); + Mem_Free (full_path); + return; - Com_DFPrintf (DEBUG_FS, "Win32 Add Dir: %s %p\n", tmp, dir); + while (!_findnext(dir, &n_file)) { +fire: + if (!strcmp(".", n_file.name) || !strcmp("..", n_file.name)) + continue; + + snprintf (f_path, sizeof(f_path), "%s/%s", full_path, n_file.name); - Zone_Free (tmp); - if (dir != -1) + if (path) + search.name_len = snprintf (file_id, sizeof (file_id), "%s/%s", path, n_file.name) + 1; + else + search.name_len = snprintf (file_id, sizeof (file_id), "%s", n_file.name) + 1; + search.name = file_id; + if (n_file.attrib & _A_SUBDIR) + FSD_Reload_Dir (group, g_dir, file_id, depth + 1); + else { + file = (fs_file_t *) hash_get (group->files, &search); + if (!file) + FSD_Add_File (group, g_dir, &n_file, file_id, f_path); + else { + fsd_file_t *f = (fsd_file_t *) file->fs_data; + + if ((file->len != (size_t) n_file.size) || + (f->mtime != n_file.time_write)) { + hash_del (group->files, &file->h); + FSD_Add_File (group, g_dir, &n_file, file_id, f_path); + } else + f->last_seen = g_dir->seq; + } + } + } + _findclose (dir); + Mem_Free (full_path); + FSD_Purge_Old (group); +} + +static void +FSD_Add_Dir (fs_group_t *group, fsd_group_t *g_dir, char *path, int depth) +{ + char *file, *full_path, *tmp, *f_path; + struct _finddata_t n_file; + long int dir; + + if (depth > 32) + return; + + if (path) + full_path = String_APrintf (fs_zone, "%s/%s/", g_dir->path, path); + else + full_path = String_APrintf (fs_zone, "%s/", g_dir->path); + + tmp = String_APrintf (fs_zone, "%s*", full_path); + dir = _findfirst (tmp, &n_file); + Mem_Free (tmp); + +// Com_DFPrintf (DEBUG_FS, "Win32 Add Dir: %s %p\n", full_path, dir); + if (dir != -1) { + g_dir->seq++; goto fire; + } + Console_Printf("FSD_Add_Dir: Unable to open %s. (%s)\n", full_path, strerror(errno)); + Mem_Free (full_path); return; - while (!_findnext (dir, &n_file)) { + while (!_findnext(dir, &n_file)) { fire: if (!strcmp(".", n_file.name) || !strcmp("..", n_file.name)) continue; - file = zasprintf(fs_zone, "%s/%s", path, n_file.name); + + f_path = String_APrintf (fs_zone, "%s/%s", full_path, n_file.name); + + if (path) + file = String_APrintf(fs_zone, "%s/%s", path, n_file.name); + else + file = String_APrintf(fs_zone, "%s", n_file.name); + if (n_file.attrib & _A_SUBDIR) FSD_Add_Dir (group, g_dir, file, depth + 1); else - FS_Add_File (group, file, n_file.size, FSD_Open_File, NULL); - Zone_Free (file); + FSD_Add_File (group, g_dir, &n_file, file, f_path); + Mem_Free (file); + Mem_Free (f_path); } _findclose (dir); + Mem_Free (full_path); } -qboolean +Nbool FSD_Open_New (fs_group_t *group, fs_new_t *new) { fsd_group_t *dir = group->fs_data; - char *name; + FILE *file; + char *tmp; - new->temp = zasprintf (fs_zone, "%s.tmp", new->wanted); - name = zasprintf (tempzone, "%s/%s", dir->path, new->temp); - new->rw = SDL_RWFromFile (name, (new->flags & FSF_ASCII) ? "w" : "wb"); - if (!new->rw) { - Com_Printf ("FSD_Open_New: Unable to open %s. (%s) (%s)\n", name, strerror(errno), SDL_GetError()); - Zone_Free (new->temp); - Zone_Free (name); + new->temp = String_APrintf (fs_zone, "%s.tmp", new->wanted); + tmp = String_APrintf(fs_zone, "%s/%s", dir->path, new->temp); + if (!(file = fopen(tmp, (new->flags & FSO_ASCII) ? "w" : "wb"))) { + Console_Printf ("FSD_Open_New: Unable to fdopen. %s\n", strerror(errno)); + Mem_Free (new->temp); + Mem_Free (tmp); + new->temp = NULL; return false; - } else { - Zone_Free (name); - return true; } + Mem_Free (tmp); + if ((new->rw = SDL_RWFromFP (file, 1))) + return true; + else + return false; } void @@ -142,15 +266,19 @@ { fsd_group_t *dir = group->fs_data; int len; + char *t0, *t1; SDL_RWseek (new->rw, 0, SEEK_END); len = SDL_RWtell (new->rw); SDL_RWclose (new->rw); - rename (va("%s/%s", dir->path, new->temp), - va("%s/%s", dir->path, new->wanted)); - Zone_Free (new->temp); + t0 = String_APrintf (fs_zone, "%s/%s", dir->path, new->temp); + t1 = String_APrintf (fs_zone, "%s/%s", dir->path, new->wanted); + rename (t0, t1); + Mem_Free (new->temp); + Mem_Free (t0); + Mem_Free (t1); new->temp = NULL; - FS_Add_File (group, new->wanted, len, FSD_Open_File, NULL); + FS_Add_File (group, new->wanted, len, FSD_Open_File, NULL, 0); } fs_group_t * @@ -161,21 +289,21 @@ fsd_group_t *dir; group = FS_Alloc_Group (parent, id); - dir = Zone_Alloc (fs_zone, sizeof (fsd_group_t)); + dir = Mem_Alloc (fs_zone, sizeof (fsd_group_t)); group->fs_data = dir; group->free = FSD_Free; group->free_file = FSD_Free_File; group->flags |= flags; if (parent) group->flags |= parent->flags; - if (!(group->flags & FS_READ_ONLY)) { + if (!(group->flags & FSG_READ_ONLY)) { group->open_new = FSD_Open_New; group->close_new = FSD_Close_New; } - dir->path = Zstrdup (fs_zone, path); + String_Set (&dir->path, fs_zone, path); - FSD_Add_Dir (group, dir, "", 0); + FSD_Add_Dir (group, dir, NULL, 0); return group; } Index: neither/darkwar/fs/fs.dsp diff -u /dev/null neither/darkwar/fs/fs.dsp:1.1 --- /dev/null Sun Mar 28 08:35:13 2004 +++ neither/darkwar/fs/fs.dsp Sun Mar 28 08:35:03 2004 @@ -0,0 +1,132 @@ +# Microsoft Developer Studio Project File - Name="fs" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=fs - 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 "fs.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 "fs.mak" CFG="fs - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "fs - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "fs - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "fs - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "fs - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "fs - Win32 Release" +# Name "fs - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\dir_win32.c +# End Source File +# Begin Source File + +SOURCE=.\fs.c +# End Source File +# Begin Source File + +SOURCE=.\fs_new.c +# End Source File +# Begin Source File + +SOURCE=.\pak.c +# End Source File +# Begin Source File + +SOURCE=.\rw_ops.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\dir.h +# End Source File +# Begin Source File + +SOURCE=.\fs.h +# End Source File +# Begin Source File + +SOURCE=.\fs_new.h +# End Source File +# Begin Source File + +SOURCE=.\pak.h +# End Source File +# Begin Source File + +SOURCE=.\rw_ops.h +# End Source File +# End Group +# End Target +# End Project From coderjoe at icculus.org Sun Mar 28 09:19:46 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 14:19:46 -0000 Subject: Module neither: Change committed Message-ID: <20040328141946.17110.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 14:19:45 UTC Log message: switch over the MSVC6 project files from a nest of static libs to one main project. Modified files: darkwar/darkwar.dsp darkwar/darkwar.dsw Removed files: darkwar/fs/fs.dsp darkwar/game/game.dsp darkwar/renderer/renderer.dsp ------=MIME.e4041b03a9cf4e3f7319d6d796b68692 Content-Type: text/plain; name="neither.20040328.141945.coderjoe.diff" Content-Disposition: attachment; filename="neither.20040328.141945.coderjoe.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/darkwar.dsp diff -u neither/darkwar/darkwar.dsp:1.3 neither/darkwar/darkwar.dsp:1.4 --- neither/darkwar/darkwar.dsp:1.3 Sat Mar 27 00:09:46 2004 +++ neither/darkwar/darkwar.dsp Sun Mar 28 09:19:35 2004 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,14 +53,14 @@ # 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 /subsystem:windows /machine:I386 -# ADD LINK32 sdlmain.lib sdl.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 SDLmain.lib SDL.lib /nologo /subsystem:windows /machine:I386 /out:"darkwar.exe" !ELSEIF "$(CFG)" == "darkwar - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "darkwar___Win32_Debug" -# PROP BASE Intermediate_Dir "darkwar___Win32_Debug" +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /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" @@ -79,7 +79,7 @@ # 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 /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 sdlmain.lib sdl.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 SDLmain.lib SDL.lib /nologo /subsystem:windows /debug /machine:I386 /out:"darkwar-debug.exe" /pdbtype:sept !ENDIF @@ -87,65 +87,378 @@ # Name "darkwar - Win32 Release" # Name "darkwar - Win32 Debug" -# Begin Group "Source Files" +# Begin Group "fs" -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# PROP Default_Filter "" +# Begin Group "fs headers" + +# PROP Default_Filter ".h" # Begin Source File -SOURCE=.\crc.c +SOURCE=.\fs\dir.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\cvar.c +SOURCE=.\fs\fs.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\dwgame.c +SOURCE=.\fs\fs_new.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\dwinput.c +SOURCE=.\fs\pak.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\dwmain.c +SOURCE=.\fs\rw_ops.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File +# End Group # Begin Source File -SOURCE=.\dwmap.c +SOURCE=.\fs\dir_win32.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\hash.c +SOURCE=.\fs\fs.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\matrixlib.c +SOURCE=.\fs\fs_new.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\nconsole.c +SOURCE=.\fs\pak.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\nfile.c +SOURCE=.\fs\rw_ops.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File +# End Group +# Begin Group "game" + +# PROP Default_Filter "" +# Begin Group "game headers" + +# PROP Default_Filter ".h" # Begin Source File -SOURCE=.\nimage.c +SOURCE=.\game\particle.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File +# End Group # Begin Source File -SOURCE=.\nmemory.c +SOURCE=.\game\particle.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File +# End Group +# Begin Group "renderer" + +# PROP Default_Filter "" +# Begin Group "renderer headers" + +# PROP Default_Filter ".h" # Begin Source File -SOURCE=.\nstring.c +SOURCE=.\renderer\dglfuncs.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\renderer\dyngl.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\renderer\dynglstubs.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\renderer\main.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\renderer\ngl.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\renderer\ntextures.h + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# End Group +# Begin Source File + +SOURCE=.\renderer\dyngl.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\renderer\dynglstubs.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\renderer\main.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\renderer\ngl.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\renderer\ntextures.c + +!IF "$(CFG)" == "darkwar - Win32 Release" + +# PROP Intermediate_Dir "Release" + +!ELSEIF "$(CFG)" == "darkwar - Win32 Debug" + +# PROP Intermediate_Dir "Debug" + +!ENDIF + # End Source File # End Group -# Begin Group "Header Files" +# Begin Group "darkwar headers" -# PROP Default_Filter "h;hpp;hxx;hm;inl" +# PROP Default_Filter ".h" # Begin Source File SOURCE=.\crc.h @@ -156,6 +469,26 @@ # End Source File # Begin Source File +SOURCE=.\dwconfig.h +# End Source File +# Begin Source File + +SOURCE=.\dwgame.h +# End Source File +# Begin Source File + +SOURCE=.\dwinput.h +# End Source File +# Begin Source File + +SOURCE=.\dwmain.h +# End Source File +# Begin Source File + +SOURCE=.\dwmap.h +# End Source File +# Begin Source File + SOURCE=.\fallbackconfig.h # End Source File # Begin Source File @@ -164,10 +497,18 @@ # End Source File # Begin Source File +SOURCE=.\mathlib.h +# End Source File +# Begin Source File + SOURCE=.\matrixlib.h # End Source File # Begin Source File +SOURCE=.\msvcwarnings.h +# End Source File +# Begin Source File + SOURCE=.\ncommon.h # End Source File # Begin Source File @@ -176,6 +517,10 @@ # End Source File # Begin Source File +SOURCE=.\nendian.h +# End Source File +# Begin Source File + SOURCE=.\nfile.h # End Source File # Begin Source File @@ -195,9 +540,57 @@ SOURCE=.\ntypes.h # End Source File # End Group -# Begin Group "Resource Files" +# Begin Source File -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group +SOURCE=.\crc.c +# End Source File +# Begin Source File + +SOURCE=.\cvar.c +# End Source File +# Begin Source File + +SOURCE=.\dwgame.c +# End Source File +# Begin Source File + +SOURCE=.\dwinput.c +# End Source File +# Begin Source File + +SOURCE=.\dwmain.c +# End Source File +# Begin Source File + +SOURCE=.\dwmap.c +# End Source File +# Begin Source File + +SOURCE=.\hash.c +# End Source File +# Begin Source File + +SOURCE=.\matrixlib.c +# End Source File +# Begin Source File + +SOURCE=.\nconsole.c +# End Source File +# Begin Source File + +SOURCE=.\nfile.c +# End Source File +# Begin Source File + +SOURCE=.\nimage.c +# End Source File +# Begin Source File + +SOURCE=.\nmemory.c +# End Source File +# Begin Source File + +SOURCE=.\nstring.c +# End Source File # End Target # End Project Index: neither/darkwar/darkwar.dsw diff -u neither/darkwar/darkwar.dsw:1.5 neither/darkwar/darkwar.dsw:1.6 --- neither/darkwar/darkwar.dsw:1.5 Sun Mar 28 08:35:03 2004 +++ neither/darkwar/darkwar.dsw Sun Mar 28 09:19:35 2004 @@ -11,51 +11,6 @@ Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name renderer - End Project Dependency - Begin Project Dependency - Project_Dep_Name game - End Project Dependency - Begin Project Dependency - Project_Dep_Name fs - End Project Dependency -}}} - -############################################################################### - -Project: "fs"=.\fs\fs.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "game"=.\game\game.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "renderer"=.\renderer\renderer.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ }}} ############################################################################### Index: neither/darkwar/fs/fs.dsp diff -u neither/darkwar/fs/fs.dsp:1.1 neither/darkwar/fs/fs.dsp:removed --- neither/darkwar/fs/fs.dsp:1.1 Sun Mar 28 08:35:03 2004 +++ neither/darkwar/fs/fs.dsp Sun Mar 28 09:19:46 2004 @@ -1,132 +0,0 @@ -# Microsoft Developer Studio Project File - Name="fs" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=fs - 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 "fs.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 "fs.mak" CFG="fs - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fs - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "fs - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fs - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "fs - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "fs - Win32 Release" -# Name "fs - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\dir_win32.c -# End Source File -# Begin Source File - -SOURCE=.\fs.c -# End Source File -# Begin Source File - -SOURCE=.\fs_new.c -# End Source File -# Begin Source File - -SOURCE=.\pak.c -# End Source File -# Begin Source File - -SOURCE=.\rw_ops.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\dir.h -# End Source File -# Begin Source File - -SOURCE=.\fs.h -# End Source File -# Begin Source File - -SOURCE=.\fs_new.h -# End Source File -# Begin Source File - -SOURCE=.\pak.h -# End Source File -# Begin Source File - -SOURCE=.\rw_ops.h -# End Source File -# End Group -# End Target -# End Project Index: neither/darkwar/game/game.dsp diff -u neither/darkwar/game/game.dsp:1.2 neither/darkwar/game/game.dsp:removed --- neither/darkwar/game/game.dsp:1.2 Sat Mar 27 15:32:40 2004 +++ neither/darkwar/game/game.dsp Sun Mar 28 09:19:46 2004 @@ -1,100 +0,0 @@ -# Microsoft Developer Studio Project File - Name="game" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=game - 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 "game.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 "game.mak" CFG="game - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "game - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "game - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "game - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "game - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "game - Win32 Release" -# Name "game - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\particle.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\particle.h -# End Source File -# End Group -# End Target -# End Project Index: neither/darkwar/renderer/renderer.dsp diff -u neither/darkwar/renderer/renderer.dsp:1.3 neither/darkwar/renderer/renderer.dsp:removed --- neither/darkwar/renderer/renderer.dsp:1.3 Sat Mar 27 06:30:39 2004 +++ neither/darkwar/renderer/renderer.dsp Sun Mar 28 09:19:46 2004 @@ -1,132 +0,0 @@ -# Microsoft Developer Studio Project File - Name="renderer" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=renderer - 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 "renderer.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 "renderer.mak" CFG="renderer - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "renderer - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "renderer - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "renderer - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "renderer - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G5 /MD /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "renderer - Win32 Release" -# Name "renderer - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\dyngl.c -# End Source File -# Begin Source File - -SOURCE=.\dynglstubs.c -# End Source File -# Begin Source File - -SOURCE=.\main.c -# End Source File -# Begin Source File - -SOURCE=.\ngl.c -# End Source File -# Begin Source File - -SOURCE=.\ntextures.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\dglfuncs.h -# End Source File -# Begin Source File - -SOURCE=.\dyngl.h -# End Source File -# Begin Source File - -SOURCE=.\dynglstubs.h -# End Source File -# Begin Source File - -SOURCE=.\ngl.h -# End Source File -# Begin Source File - -SOURCE=.\ntextures.h -# End Source File -# End Group -# End Target -# End Project From havoc at icculus.org Sun Mar 28 10:07:44 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 28 Mar 2004 15:07:44 -0000 Subject: Module neither: Change committed Message-ID: <20040328150744.21282.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 15:07:44 UTC Log message: broke out filesystem into its own section Modified files: darkwar/enginedesign.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.150744.havoc.diff URL: From havoc at icculus.org Sun Mar 28 10:14:40 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 28 Mar 2004 15:14:40 -0000 Subject: Module neither: Change committed Message-ID: <20040328151440.21959.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 15:14:40 UTC Log message: moved video stuff into e_system Modified files: darkwar/enginedesign.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.151440.havoc.diff URL: From havoc at icculus.org Sun Mar 28 10:30:22 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 28 Mar 2004 15:30:22 -0000 Subject: Module neither: Change committed Message-ID: <20040328153022.23080.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 15:30:22 UTC Log message: compiles from makefile again Modified files: darkwar/Makefile -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.153022.havoc.diff URL: From havoc at icculus.org Sun Mar 28 10:36:53 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 28 Mar 2004 15:36:53 -0000 Subject: Module neither: Change committed Message-ID: <20040328153653.23402.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 15:36:53 UTC Log message: removed directories Modified files: darkwar/enginedesign.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.153653.havoc.diff URL: From coderjoe at icculus.org Sun Mar 28 11:30:32 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 16:30:32 -0000 Subject: Module neither: Change committed Message-ID: <20040328163032.26750.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 16:30:31 UTC Log message: grr. DynGL_GetFunctions is supposed to call UseStubs(FALSE), NOT TRUE... also, only set stubs for functions that actually exist. (DynGL_Real_x != NULL) Modified files: darkwar/renderer/dyngl.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.163031.coderjoe.diff URL: From coderjoe at icculus.org Sun Mar 28 12:56:51 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 17:56:51 -0000 Subject: Module neither: Change committed Message-ID: <20040328175651.32414.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 17:56:51 UTC Log message: add a Profile config. Modified files: darkwar/darkwar.dsp ------=MIME.ff0695eae24bbffa5ad5211393de41f3 Content-Type: text/plain; name="neither.20040328.175651.coderjoe.diff" Content-Disposition: attachment; filename="neither.20040328.175651.coderjoe.diff" Content-Transfer-Encoding: 8bit Index: neither/darkwar/darkwar.dsp diff -u neither/darkwar/darkwar.dsp:1.4 neither/darkwar/darkwar.dsp:1.5 --- neither/darkwar/darkwar.dsp:1.4 Sun Mar 28 09:19:35 2004 +++ neither/darkwar/darkwar.dsp Sun Mar 28 12:56:40 2004 @@ -19,6 +19,7 @@ !MESSAGE !MESSAGE "darkwar - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "darkwar - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "darkwar - Win32 Profile" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -80,6 +81,34 @@ 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 /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 SDLmain.lib SDL.lib /nologo /subsystem:windows /debug /machine:I386 /out:"darkwar-debug.exe" /pdbtype:sept +# SUBTRACT LINK32 /profile + +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "darkwar___Win32_Profile" +# PROP BASE Intermediate_Dir "darkwar___Win32_Profile" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Profile" +# PROP Intermediate_Dir "Profile" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /G5 /MD /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 SDLmain.lib SDL.lib /nologo /subsystem:windows /machine:I386 /out:"darkwar.exe" +# ADD LINK32 SDLmain.lib SDL.lib /nologo /subsystem:windows /profile /machine:I386 /out:"darkwar-profile.exe" !ENDIF @@ -87,6 +116,7 @@ # Name "darkwar - Win32 Release" # Name "darkwar - Win32 Debug" +# Name "darkwar - Win32 Profile" # Begin Group "fs" # PROP Default_Filter "" @@ -105,6 +135,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -120,6 +155,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -135,6 +175,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -150,6 +195,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -165,6 +215,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -181,6 +236,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -196,6 +256,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -211,6 +276,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -226,6 +296,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -241,6 +316,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -263,6 +343,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -279,6 +364,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -301,6 +391,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -316,6 +411,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -331,6 +431,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -346,6 +451,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -361,6 +471,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -376,6 +491,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -392,6 +512,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -407,6 +532,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -422,6 +552,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -437,6 +572,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File @@ -452,6 +592,11 @@ # PROP Intermediate_Dir "Debug" +!ELSEIF "$(CFG)" == "darkwar - Win32 Profile" + +# PROP BASE Intermediate_Dir "Release" +# PROP Intermediate_Dir "Release" + !ENDIF # End Source File From coderjoe at icculus.org Sun Mar 28 12:58:37 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 17:58:37 -0000 Subject: Module neither: Change committed Message-ID: <20040328175837.32576.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 17:58:37 UTC Log message: more efficient input event handling. Modified files: darkwar/dwgame.c darkwar/dwinput.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.175837.coderjoe.diff URL: From coderjoe at icculus.org Sun Mar 28 13:01:01 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 18:01:01 -0000 Subject: Module neither: Change committed Message-ID: <20040328180101.509.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 18:01:01 UTC Log message: add profiler droppings. Modified files: darkwar/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.180101.coderjoe.diff URL: From coderjoe at icculus.org Sun Mar 28 13:22:21 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 28 Mar 2004 18:22:21 -0000 Subject: Module neither: Change committed Message-ID: <20040328182221.1753.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 18:22:20 UTC Log message: split out common code from dir_posix.c and dir_win32.c into dir.c Modified files: darkwar/Makefile darkwar/SConstruct darkwar/darkwar.dsp darkwar/fs/dir.h darkwar/fs/dir_posix.c darkwar/fs/dir_win32.c Added files: darkwar/fs/dir.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.182220.coderjoe.diff URL: From tomaz at icculus.org Sun Mar 28 17:01:30 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 28 Mar 2004 22:01:30 -0000 Subject: Module neither: Change committed Message-ID: <20040328220130.14468.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 22:01:30 UTC Log message: updated the particle system to use vertex arrays and cleaned it up abit.. had to add 6 new gl functions for it to work as well.. Modified files: darkwar/game/particle.c darkwar/game/particle.h darkwar/renderer/dglfuncs.h darkwar/renderer/dynglstubs.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.220130.tomaz.diff URL: From havoc at icculus.org Sun Mar 28 17:03:47 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 28 Mar 2004 22:03:47 -0000 Subject: Module neither: Change committed Message-ID: <20040328220347.14639.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 22:03:47 UTC Log message: removed MouseX and MouseY to cure warnings Modified files: darkwar/dwinput.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.220347.havoc.diff URL: From havoc at icculus.org Sun Mar 28 17:10:48 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 28 Mar 2004 22:10:48 -0000 Subject: Module neither: Change committed Message-ID: <20040328221048.15317.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 22:10:48 UTC Log message: fix a couple static functions that can't be Modified files: darkwar/fs/dir.c darkwar/fs/dir_posix.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.221048.havoc.diff URL: From tomaz at icculus.org Sun Mar 28 17:31:32 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 28 Mar 2004 22:31:32 -0000 Subject: Module neither: Change committed Message-ID: <20040328223132.16523.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 22:31:32 UTC Log message: desperately trying to speed up the particles Modified files: darkwar/game/particle.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.223132.tomaz.diff URL: From tomaz at icculus.org Sun Mar 28 18:18:43 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 28 Mar 2004 23:18:43 -0000 Subject: Module neither: Change committed Message-ID: <20040328231843.19042.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-28 23:18:43 UTC Log message: trying to optimize this but filed.. at least its a little bit cleaner Modified files: darkwar/game/particle.c darkwar/game/particle.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040328.231843.tomaz.diff URL: From havoc at icculus.org Sun Mar 28 22:09:01 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 29 Mar 2004 03:09:01 -0000 Subject: Module neither: Change committed Message-ID: <20040329030901.30170.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 03:09:01 UTC Log message: fixed mingw support (just some changes to the LDFLAGS and CFLAGS) Modified files: darkwar/Makefile -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.030901.havoc.diff URL: From coderjoe at icculus.org Sun Mar 28 22:28:36 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 29 Mar 2004 03:28:36 -0000 Subject: Module neither: Change committed Message-ID: <20040329032836.31506.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 03:28:36 UTC Log message: add *.o to ignores. (why wasn't it there already?) Modified files: darkwar/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.032836.coderjoe.diff URL: From coderjoe at icculus.org Sun Mar 28 23:03:17 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 29 Mar 2004 04:03:17 -0000 Subject: Module neither: Change committed Message-ID: <20040329040317.890.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 04:03:17 UTC Log message: add gmon.out Modified files: darkwar/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.040317.coderjoe.diff URL: From coderjoe at icculus.org Mon Mar 29 07:20:01 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 29 Mar 2004 12:20:01 -0000 Subject: Module neither: Change committed Message-ID: <20040329122001.31098.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 12:20:01 UTC Log message: Switch back to event-based input, rather than snagging the states of everything each frame. Modified files: darkwar/dwgame.c darkwar/dwinput.c darkwar/dwinput.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.122001.coderjoe.diff URL: From tomaz at icculus.org Mon Mar 29 09:15:36 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 29 Mar 2004 14:15:36 -0000 Subject: Module neither: Change committed Message-ID: <20040329141536.13429.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 14:15:36 UTC Log message: continuing the quest to speed up the particles Modified files: darkwar/game/particle.c darkwar/game/particle.h darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.141536.tomaz.diff URL: From tomaz at icculus.org Mon Mar 29 10:13:14 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 29 Mar 2004 15:13:14 -0000 Subject: Module neither: Change committed Message-ID: <20040329151314.19098.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 15:13:14 UTC Log message: adding Random and VectorRandom defines Modified files: darkwar/mathlib.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.151314.tomaz.diff URL: From tomaz at icculus.org Mon Mar 29 10:33:09 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 29 Mar 2004 15:33:09 -0000 Subject: Module neither: Change committed Message-ID: <20040329153309.20801.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 15:33:09 UTC Log message: made particle.* use Ntypes and redid the explosion to use VectorRandom to get a more spherical effect instead of the quadratic one Modified files: darkwar/game/particle.c darkwar/game/particle.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.153309.tomaz.diff URL: From tomaz at icculus.org Mon Mar 29 10:34:52 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 29 Mar 2004 15:34:52 -0000 Subject: Module neither: Change committed Message-ID: <20040329153452.20960.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 15:34:52 UTC Log message: missed one thing Modified files: darkwar/game/particle.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.153452.tomaz.diff URL: From tomaz at icculus.org Mon Mar 29 10:40:28 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 29 Mar 2004 15:40:28 -0000 Subject: Module neither: Change committed Message-ID: <20040329154028.22112.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 15:40:28 UTC Log message: oops.. my misstake Modified files: darkwar/dwgame.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.154028.tomaz.diff URL: From tomaz at icculus.org Mon Mar 29 10:57:00 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 29 Mar 2004 15:57:00 -0000 Subject: Module neither: Change committed Message-ID: <20040329155700.24255.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 15:57:00 UTC Log message: fixing some float / double issues Modified files: darkwar/game/particle.c darkwar/game/particle.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.155700.tomaz.diff URL: From coderjoe at icculus.org Mon Mar 29 12:07:54 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 29 Mar 2004 17:07:54 -0000 Subject: Module neither: Change committed Message-ID: <20040329170754.4528.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 17:07:54 UTC Log message: use sdl-config for linker flags as well as compiler flags. Modified files: darkwar/Makefile -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.170754.coderjoe.diff URL: From tomaz at icculus.org Mon Mar 29 12:10:13 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 29 Mar 2004 17:10:13 -0000 Subject: Module neither: Change committed Message-ID: <20040329171013.5046.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 17:10:13 UTC Log message: minimalistic cleanup and speed.. if anyone notices a speed change.. seek medical attention Modified files: darkwar/game/particle.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.171013.tomaz.diff URL: From warp at icculus.org Mon Mar 29 12:25:21 2004 From: warp at icculus.org (warp at icculus.org) Date: 29 Mar 2004 17:25:21 -0000 Subject: Module neither: Change committed Message-ID: <20040329172521.7197.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 17:25:21 UTC Log message: This is DynGL. This is DynGL on Mercury vapors. Modified files: darkwar/dwinput.c darkwar/renderer/dglfuncs.h darkwar/renderer/dyngl.c darkwar/renderer/dyngl.h darkwar/renderer/dynglstubs.c darkwar/renderer/dynglstubs.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.172521.warp.diff URL: From coderjoe at icculus.org Mon Mar 29 12:31:06 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 29 Mar 2004 17:31:06 -0000 Subject: Module neither: Change committed Message-ID: <20040329173106.7529.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 17:31:06 UTC Log message: another case of the missing *.o ignore. Modified files: darkwar/renderer/.cvsignore -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.173106.coderjoe.diff URL: From coderjoe at icculus.org Mon Mar 29 12:39:03 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 29 Mar 2004 17:39:03 -0000 Subject: Module neither: Change committed Message-ID: <20040329173903.8488.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 17:39:03 UTC Log message: whitespace. (bleh) Modified files: darkwar/renderer/dynglstubs.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.173903.coderjoe.diff URL: From coderjoe at icculus.org Mon Mar 29 12:40:47 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 29 Mar 2004 17:40:47 -0000 Subject: Module neither: Change committed Message-ID: <20040329174047.8643.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 17:40:47 UTC Log message: R_DrawString now uses an interleaved tex/vert array instead of calling glTexCoord2f and glVertex3f directly. (approximately 2-3 times faster. :) Modified files: darkwar/renderer/dglfuncs.h darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.174047.coderjoe.diff URL: From warp at icculus.org Mon Mar 29 12:44:22 2004 From: warp at icculus.org (warp at icculus.org) Date: 29 Mar 2004 17:44:22 -0000 Subject: Module neither: Change committed Message-ID: <20040329174422.8954.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 17:44:22 UTC Log message: Include for strlen. Modified files: darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.174422.warp.diff URL: From warp at icculus.org Mon Mar 29 12:45:07 2004 From: warp at icculus.org (warp at icculus.org) Date: 29 Mar 2004 17:45:07 -0000 Subject: Module neither: Change committed Message-ID: <20040329174507.9058.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-29 17:45:07 UTC Log message: Make the wrappers actually /do/ something. Modified files: darkwar/renderer/dglfuncs.h darkwar/renderer/dyngl.c darkwar/renderer/dynglstubs.c darkwar/renderer/dynglstubs.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040329.174507.warp.diff URL: From havoc at icculus.org Tue Mar 30 11:09:16 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 30 Mar 2004 16:09:16 -0000 Subject: Module neither: Change committed Message-ID: <20040330160916.20259.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-30 16:09:16 UTC Log message: removed e_ prefix, renamed g_ files to game/g_ Modified files: darkwar/enginedesign.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040330.160916.havoc.diff URL: From havoc at icculus.org Tue Mar 30 13:30:08 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 30 Mar 2004 18:30:08 -0000 Subject: Module neither: Change committed Message-ID: <20040330183008.31494.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-30 18:30:08 UTC Log message: the beginnings of the new system.c (see enginedesign.txt to understand) there is some code destined for other subsystems currently residing in a #ifdef that will be broken out later this is NOT finished, I repeat NOT finished, it does NOT compile yet Added files: darkwar/system.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040330.183008.havoc.diff URL: From warp at icculus.org Tue Mar 30 18:59:37 2004 From: warp at icculus.org (warp at icculus.org) Date: 30 Mar 2004 23:59:37 -0000 Subject: Module neither: Change committed Message-ID: <20040330235937.26904.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-30 23:59:37 UTC Log message: Deal with some syntax errors and other simple issues. Still does not compile. Modified files: darkwar/system.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040330.235937.warp.diff URL: From havoc at icculus.org Tue Mar 30 19:10:14 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 31 Mar 2004 00:10:14 -0000 Subject: Module neither: Change committed Message-ID: <20040331001014.27540.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 00:10:14 UTC Log message: more explanation added Modified files: darkwar/enginedesign.txt -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.001014.havoc.diff URL: From tomaz at icculus.org Wed Mar 31 11:02:55 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 31 Mar 2004 16:02:55 -0000 Subject: Module neither: Change committed Message-ID: <20040331160255.20730.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 16:02:55 UTC Log message: totally recoded particle system that now is effects based.. still not complete but compiles and runs.. also added a simple rain effect Modified files: darkwar/dwgame.c darkwar/game/particle.c darkwar/game/particle.h darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.160255.tomaz.diff URL: From tomaz at icculus.org Wed Mar 31 11:55:17 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 31 Mar 2004 16:55:17 -0000 Subject: Module neither: Change committed Message-ID: <20040331165517.24957.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 16:55:17 UTC Log message: made the rain area cover the whole.. 3 wireframe thingies.. and made the rain fall faster.. and made the rain drops slightly bigger.. Modified files: darkwar/dwgame.c darkwar/game/particle.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.165517.tomaz.diff URL: From tomaz at icculus.org Wed Mar 31 11:56:49 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 31 Mar 2004 16:56:49 -0000 Subject: Module neither: Change committed Message-ID: <20040331165649.25078.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 16:56:49 UTC Log message: forgot this file Modified files: darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.165649.tomaz.diff URL: From havoc at icculus.org Wed Mar 31 12:39:14 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 31 Mar 2004 17:39:14 -0000 Subject: Module neither: New directory darkwar/base/effects/ Message-ID: <20040331173914.28581.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 17:39:14 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/base/effects added to the repository From havoc at icculus.org Wed Mar 31 12:40:25 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 31 Mar 2004 17:40:25 -0000 Subject: Module neither: Change committed Message-ID: <20040331174025.28714.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 17:40:25 UTC Log message: added a couple textures for rain splashes to use Added files: darkwar/base/effects/rainsplash_backsplash.tga darkwar/base/effects/rainsplash_ring.tga -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.174025.havoc.diff URL: From havoc at icculus.org Wed Mar 31 12:57:21 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 31 Mar 2004 17:57:21 -0000 Subject: Module neither: Change committed Message-ID: <20040331175721.29935.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 17:57:21 UTC Log message: the raindrop Added files: darkwar/base/effects/raindrop.tga -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.175721.havoc.diff URL: From havoc at icculus.org Wed Mar 31 13:13:14 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 31 Mar 2004 18:13:14 -0000 Subject: Module neither: Change committed Message-ID: <20040331181314.31257.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 18:13:14 UTC Log message: added a spark texture (and the xcf incase anyone needs to edit it later) Added files: darkwar/base/effects/spark.tga darkwar/base/effects/spark.xcf -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.181314.havoc.diff URL: From tomaz at icculus.org Wed Mar 31 13:28:56 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 31 Mar 2004 18:28:56 -0000 Subject: Module neither: Change committed Message-ID: <20040331182856.32422.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 18:28:56 UTC Log message: make these images pure white with alpha channel Modified files: darkwar/base/effects/raindrop.tga darkwar/base/effects/rainsplash_backsplash.tga darkwar/base/effects/rainsplash_ring.tga darkwar/base/effects/spark.tga -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.182856.tomaz.diff URL: From tomaz at icculus.org Wed Mar 31 13:38:31 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 31 Mar 2004 18:38:31 -0000 Subject: Module neither: Change committed Message-ID: <20040331183831.720.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 18:38:31 UTC Log message: adding custom textures and rainsplashes.. also redid the generated particle dot slightly (made it pure white+alpha) Modified files: darkwar/game/particle.c darkwar/game/particle.h darkwar/renderer/main.c darkwar/renderer/ntextures.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.183831.tomaz.diff URL: From tomaz at icculus.org Wed Mar 31 13:54:57 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 31 Mar 2004 18:54:57 -0000 Subject: Module neither: Change committed Message-ID: <20040331185457.2341.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 18:54:57 UTC Log message: tweaking rain splashes Modified files: darkwar/game/particle.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.185457.tomaz.diff URL: From coderjoe at icculus.org Wed Mar 31 16:23:26 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 31 Mar 2004 21:23:26 -0000 Subject: Module CVSROOT: Change committed Message-ID: <20040331212326.19855.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : CVSROOT Commit time: 2004-03-31 21:23:26 UTC Log message: er, add force binary for xcf and tga. (just in case.) Modified files: cvswrappers -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: CVSROOT.20040331.212326.coderjoe.diff URL: From coderjoe at icculus.org Wed Mar 31 16:33:18 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 31 Mar 2004 21:33:18 -0000 Subject: Module neither: Change committed Message-ID: <20040331213318.20903.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 21:33:18 UTC Log message: make the "sky" and "ground" not share a plane with the top and bottom ends of the vertical "thing" Modified files: darkwar/renderer/main.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.213318.coderjoe.diff URL: From coderjoe at icculus.org Wed Mar 31 17:42:58 2004 From: coderjoe at icculus.org (coderjoe at icculus.org) Date: 31 Mar 2004 22:42:58 -0000 Subject: Module neither: Change committed Message-ID: <20040331224258.26977.qmail@icculus.org> Commiter : coderjoe CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 22:42:58 UTC Log message: input grab off by default. m will toggle. Modified files: darkwar/dwgame.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.224258.coderjoe.diff URL: From warp at icculus.org Wed Mar 31 18:01:43 2004 From: warp at icculus.org (warp at icculus.org) Date: 31 Mar 2004 23:01:43 -0000 Subject: Module neither: Change committed Message-ID: <20040331230143.28425.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 23:01:43 UTC Log message: Fix some formatting, fix some unused stuff, and make the timing of the splashes look less fake Modified files: darkwar/game/particle.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.230143.warp.diff URL: From warp at icculus.org Wed Mar 31 18:15:11 2004 From: warp at icculus.org (warp at icculus.org) Date: 31 Mar 2004 23:15:11 -0000 Subject: Module neither: Change committed Message-ID: <20040331231511.29336.qmail@icculus.org> Commiter : warp CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 23:15:11 UTC Log message: R_DrawString now takes another argument, it is the second and it is the maximum number of characters to draw. Did a bit of work on the console, not complete but it compiles and runs. Modified files: darkwar/dwgame.c darkwar/nconsole.c darkwar/renderer/main.c darkwar/renderer/main.h -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.231511.warp.diff URL: From tomaz at icculus.org Wed Mar 31 18:39:32 2004 From: tomaz at icculus.org (tomaz at icculus.org) Date: 31 Mar 2004 23:39:32 -0000 Subject: Module neither: Change committed Message-ID: <20040331233932.31065.qmail@icculus.org> Commiter : tomaz CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-03-31 23:39:32 UTC Log message: make the particles use g_frametime instead of g_realframetime Modified files: darkwar/game/particle.c -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040331.233932.tomaz.diff URL: From havoc at icculus.org Wed Mar 31 19:57:31 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 1 Apr 2004 00:57:31 -0000 Subject: Module neither: New directory darkwar/base/maps/ Message-ID: <20040401005731.4616.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-04-01 00:57:31 UTC Log message: Directory /cvs/cvsroot/neither/neither/darkwar/base/maps added to the repository From havoc at icculus.org Wed Mar 31 19:58:36 2004 From: havoc at icculus.org (havoc at icculus.org) Date: 1 Apr 2004 00:58:36 -0000 Subject: Module neither: Change committed Message-ID: <20040401005836.4697.qmail@icculus.org> Commiter : havoc CVSROOT : /cvs/cvsroot/neither Module : neither Commit time: 2004-04-01 00:58:36 UTC Log message: added a map to test the loader when it's finished Added files: darkwar/base/maps/test.map -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: neither.20040401.005836.havoc.diff URL: