Module twilight: Change committed
warp at icculus.org
warp at icculus.org
Sat Nov 23 23:28:00 EST 2002
Commiter : warp
CVSROOT : /cvs/cvsroot/twilight
Module : twilight
Commit time: 2002-11-24 04:28:00 UTC
Log message:
Tweak the stain colors, so that you don't end up with completely
BLACK rooms.
Add .*.swp files to the .cvsignore files.
Add .vcproj files from Damm, for the .net compiler apparently.
Modified files:
.cvsignore include/.cvsignore nq/.cvsignore nq/cl_tent.c
nq/gl_rsurf.c nq/r_part.c qw/.cvsignore qw/cl_ents.c qw/cl_tent.c
qw/gl_rsurf.c qw/r_part.c src/base/.cvsignore
src/image/.cvsignore src/renderer/.cvsignore
Added files:
twilight.sln nq/nq.vcproj qw/qw.vcproj qw/qwsv.vcproj
src/base/twilight_base.vcproj src/image/twilight_image.vcproj
src/renderer/twilight_renderer.vcproj
src/sound/twilight_sound.vcproj
------=MIME.031c0c06e46632ac0d090e3f70f8787b
Content-Type: text/plain; name="twilight.20021124.042800.warp.diff"
Content-Disposition: attachment; filename="twilight.20021124.042800.warp.diff"
Content-Transfer-Encoding: 8bit
Index: twilight/.cvsignore
diff -u twilight/.cvsignore:1.5 twilight/.cvsignore:1.6
--- twilight/.cvsignore:1.5 Sat Jun 29 03:52:51 2002
+++ twilight/.cvsignore Sat Nov 23 23:27:47 2002
@@ -13,4 +13,5 @@
twilight-*.tar.gz
twilight.spec
autom4te.cache
+.*.swp
Index: twilight/include/.cvsignore
diff -u twilight/include/.cvsignore:1.4 twilight/include/.cvsignore:1.5
--- twilight/include/.cvsignore:1.4 Thu Oct 11 13:53:21 2001
+++ twilight/include/.cvsignore Sat Nov 23 23:27:48 2002
@@ -1,3 +1,4 @@
+.*.swp
config.*
stamp-h.in
stamp-h*
Index: twilight/nq/.cvsignore
diff -u twilight/nq/.cvsignore:1.2 twilight/nq/.cvsignore:1.3
--- twilight/nq/.cvsignore:1.2 Fri Jul 27 17:12:07 2001
+++ twilight/nq/.cvsignore Sat Nov 23 23:27:48 2002
@@ -1,5 +1,6 @@
Makefile
Makefile.in
*.o
+.*.swp
twilight-nq
.deps
Index: twilight/nq/cl_tent.c
diff -u twilight/nq/cl_tent.c:1.35 twilight/nq/cl_tent.c:1.36
--- twilight/nq/cl_tent.c:1.35 Tue Nov 19 16:36:52 2002
+++ twilight/nq/cl_tent.c Sat Nov 23 23:27:48 2002
@@ -23,7 +23,7 @@
*/
static const char rcsid[] =
- "$Id: cl_tent.c,v 1.35 2002/11/19 21:36:52 warp Exp $";
+ "$Id: cl_tent.c,v 1.36 2002/11/24 04:27:48 warp Exp $";
#include "twiconfig.h"
@@ -151,7 +151,7 @@
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
R_RunParticleEffect (pos, vec3_origin, 226, 20);
- R_Stain (pos, 32, 60, 60, 60, 32, 96, 96, 96, 32);
+ R_Stain (pos, 32, 64, 64, 64, 32, 192, 192, 192, 32);
S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1);
break;
@@ -160,7 +160,7 @@
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
R_RunParticleEffect (pos, vec3_origin, 0, 10);
- R_Stain (pos, 32, 60, 60, 60, 32, 96, 96, 96, 32);
+ R_Stain (pos, 32, 64, 64, 64, 32, 192, 192, 192, 32);
if (rand () % 5)
S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
else {
@@ -177,7 +177,7 @@
pos[0] = MSG_ReadCoord ();
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
- R_Stain (pos, 32, 60, 60, 60, 32, 96, 96, 96, 32);
+ R_Stain (pos, 32, 64, 64, 64, 32, 192, 192, 192, 32);
R_RunParticleEffect (pos, vec3_origin, 0, 20);
if (rand () % 5)
@@ -198,7 +198,7 @@
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
R_RunParticleEffect (pos, vec3_origin, 0, 20);
- R_Stain (pos, 32, 60, 60, 60, 32, 96, 96, 96, 32);
+ R_Stain (pos, 32, 64, 64, 64, 32, 192, 192, 192, 32);
break;
case TE_EXPLOSION: // rocket explosion
@@ -215,7 +215,7 @@
dl->color[0] = 1.25f;
dl->color[1] = 1.0f;
dl->color[2] = 0.5f;
- R_Stain (pos, 96, 60, 60, 60, 128, 128, 128, 128, 128);
+ R_Stain (pos, 96, 64, 64, 64, 128, 192, 192, 192, 192);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
break;
@@ -224,7 +224,7 @@
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
R_BlobExplosion (pos);
- R_Stain (pos, 96, 60, 60, 60, 128, 128, 128, 128, 128);
+ R_Stain (pos, 96, 64, 64, 64, 128, 192, 192, 192, 192);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
break;
@@ -282,7 +282,7 @@
pos[2] = MSG_ReadCoord ();
colorStart = MSG_ReadByte ();
colorLength = MSG_ReadByte ();
- R_Stain (pos, 64, 60, 60, 60, 128, 128, 128, 128, 128);
+ R_Stain (pos, 96, 64, 64, 64, 128, 192, 192, 192, 192);
R_ParticleExplosion2 (pos, colorStart, colorLength);
dl = CL_AllocDlight (0);
VectorCopy (pos, dl->origin);
@@ -303,7 +303,7 @@
pos2[1] = MSG_ReadCoord();
pos2[2] = MSG_ReadCoord();
R_RailTrail (pos, pos2);
- R_Stain (pos2, 32, 60, 60, 60, 32, 96, 96, 96, 32);
+ R_Stain (pos2, 32, 64, 64, 64, 32, 192, 192, 192, 32);
break;
default:
Index: twilight/nq/gl_rsurf.c
diff -u twilight/nq/gl_rsurf.c:1.107 twilight/nq/gl_rsurf.c:1.108
--- twilight/nq/gl_rsurf.c:1.107 Tue Nov 19 16:36:53 2002
+++ twilight/nq/gl_rsurf.c Sat Nov 23 23:27:48 2002
@@ -23,7 +23,7 @@
*/
static const char rcsid[] =
- "$Id: gl_rsurf.c,v 1.107 2002/11/19 21:36:53 warp Exp $";
+ "$Id: gl_rsurf.c,v 1.108 2002/11/24 04:27:48 warp Exp $";
#include "twiconfig.h"
@@ -174,14 +174,14 @@
}
inline qboolean
-R_StainBlendTexel (int k, int *icolor, Uint8 *bl)
+R_StainBlendTexel (Sint64 k, int *icolor, Uint8 *bl)
{
int ratio, a;
int cr, cg, cb, ca;
ratio = rand() & 255;
ca = (((icolor[7] - icolor[3]) * ratio) >> 8) + icolor[3];
- a = (ca * k);
+ a = (ca * k) >> 8;
if (a > 0)
{
@@ -212,10 +212,11 @@
int i, stained;
int s, t, td, smax, tmax, smax3;
int dist2, maxdist, maxdist2, maxdist3;
- int impacts, impactt, subtract, k;
+ int impacts, impactt, subtract;
int sdtable[256];
Uint8 *bl;
vec3_t impact;
+ Sint64 k;
// for comparisons to minimum acceptable light
// compensate for 4096 offset
@@ -304,7 +305,6 @@
{
k = dlightdivtable[(sdtable[s] + td) >> 7]
- subtract;
- k >>= 8;
if (k > 0)
if (R_StainBlendTexel (k, icolor, bl))
stained = true;
Index: twilight/nq/nq.vcproj
diff -u /dev/null twilight/nq/nq.vcproj:1.1
--- /dev/null Sat Nov 23 23:28:00 2002
+++ twilight/nq/nq.vcproj Sat Nov 23 23:27:48 2002
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="nq"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../include,../src/renderer,../SDL/include,../src/sound,../src/image"
+ PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Debug/nq.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
+ OutputFile="tw-nq-debug.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../SDL/lib"
+ IgnoreDefaultLibraryNames="libc.lib,libcd.lib,msvcrt.lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\Debug/tw-nq-debug.pdb"
+ SubSystem="2"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Debug/nq.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../include,../src/renderer,../SDL/include,../src/sound,../src/image"
+ PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Release/nq.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
+ OutputFile="tw-nq.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../SDL/lib"
+ IgnoreDefaultLibraryNames="libc.lib"
+ ProgramDatabaseFile=".\Release/tw-nq.pdb"
+ SubSystem="2"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Release/nq.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1049"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath=".\chase.c">
+ </File>
+ <File
+ RelativePath=".\cl_demo.c">
+ </File>
+ <File
+ RelativePath=".\cl_ents.c">
+ </File>
+ <File
+ RelativePath=".\cl_input.c">
+ </File>
+ <File
+ RelativePath=".\cl_main.c">
+ </File>
+ <File
+ RelativePath=".\cl_model.c">
+ </File>
+ <File
+ RelativePath=".\cl_parse.c">
+ </File>
+ <File
+ RelativePath=".\cl_tent.c">
+ </File>
+ <File
+ RelativePath=".\common.c">
+ </File>
+ <File
+ RelativePath=".\console.c">
+ </File>
+ <File
+ RelativePath=".\gl_alias.c">
+ </File>
+ <File
+ RelativePath=".\gl_draw.c">
+ </File>
+ <File
+ RelativePath=".\gl_rlight.c">
+ </File>
+ <File
+ RelativePath=".\gl_rmain.c">
+ </File>
+ <File
+ RelativePath=".\gl_rsurf.c">
+ </File>
+ <File
+ RelativePath=".\gl_screen.c">
+ </File>
+ <File
+ RelativePath=".\host.c">
+ </File>
+ <File
+ RelativePath=".\host_cmd.c">
+ </File>
+ <File
+ RelativePath=".\keys.c">
+ </File>
+ <File
+ RelativePath="..\src\base\locs.c">
+ </File>
+ <File
+ RelativePath=".\menu.c">
+ </File>
+ <File
+ RelativePath=".\net_bsd.c">
+ </File>
+ <File
+ RelativePath=".\net_dgrm.c">
+ </File>
+ <File
+ RelativePath=".\net_loop.c">
+ </File>
+ <File
+ RelativePath=".\net_main.c">
+ </File>
+ <File
+ RelativePath=".\net_udp.c">
+ </File>
+ <File
+ RelativePath=".\pr_cmds.c">
+ </File>
+ <File
+ RelativePath=".\pr_edict.c">
+ </File>
+ <File
+ RelativePath=".\pr_exec.c">
+ </File>
+ <File
+ RelativePath=".\r_explosion.c">
+ </File>
+ <File
+ RelativePath=".\r_part.c">
+ </File>
+ <File
+ RelativePath=".\sbar.c">
+ </File>
+ <File
+ RelativePath=".\snd_dma.c">
+ </File>
+ <File
+ RelativePath=".\sv_main.c">
+ </File>
+ <File
+ RelativePath=".\sv_move.c">
+ </File>
+ <File
+ RelativePath=".\sv_phys.c">
+ </File>
+ <File
+ RelativePath=".\sv_user.c">
+ </File>
+ <File
+ RelativePath=".\sys.c">
+ </File>
+ <File
+ RelativePath=".\teamplay.c">
+ </File>
+ <File
+ RelativePath=".\vid_sdl.c">
+ </File>
+ <File
+ RelativePath=".\view.c">
+ </File>
+ <File
+ RelativePath=".\world.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath="..\include\TGL_defines.h">
+ </File>
+ <File
+ RelativePath="..\include\TGL_funcs.h">
+ </File>
+ <File
+ RelativePath="..\include\TGL_funcs_list.h">
+ </File>
+ <File
+ RelativePath="..\include\TGL_types.h">
+ </File>
+ <File
+ RelativePath="..\include\anorm_dots.h">
+ </File>
+ <File
+ RelativePath="..\include\anorms.h">
+ </File>
+ <File
+ RelativePath="..\include\bothdefs.h">
+ </File>
+ <File
+ RelativePath=".\bspfile.h">
+ </File>
+ <File
+ RelativePath=".\client.h">
+ </File>
+ <File
+ RelativePath="..\include\cmd.h">
+ </File>
+ <File
+ RelativePath="..\include\common.h">
+ </File>
+ <File
+ RelativePath="..\include\compat.h">
+ </File>
+ <File
+ RelativePath=".\console.h">
+ </File>
+ <File
+ RelativePath="..\include\crc.h">
+ </File>
+ <File
+ RelativePath="..\include\cvar.h">
+ </File>
+ <File
+ RelativePath="..\include\draw.h">
+ </File>
+ <File
+ RelativePath="..\include\host.h">
+ </File>
+ <File
+ RelativePath="..\include\input.h">
+ </File>
+ <File
+ RelativePath=".\keys.h">
+ </File>
+ <File
+ RelativePath="..\include\mathlib.h">
+ </File>
+ <File
+ RelativePath="..\include\mdfour.h">
+ </File>
+ <File
+ RelativePath="..\include\menu.h">
+ </File>
+ <File
+ RelativePath="..\include\model.h">
+ </File>
+ <File
+ RelativePath="..\include\modelgen.h">
+ </File>
+ <File
+ RelativePath=".\net.h">
+ </File>
+ <File
+ RelativePath=".\net_dgrm.h">
+ </File>
+ <File
+ RelativePath=".\net_loop.h">
+ </File>
+ <File
+ RelativePath=".\net_udp.h">
+ </File>
+ <File
+ RelativePath="..\include\pcx.h">
+ </File>
+ <File
+ RelativePath="..\include\pmove.h">
+ </File>
+ <File
+ RelativePath="..\include\pr_comp.h">
+ </File>
+ <File
+ RelativePath=".\progdefs.h">
+ </File>
+ <File
+ RelativePath=".\progs.h">
+ </File>
+ <File
+ RelativePath=".\protocol.h">
+ </File>
+ <File
+ RelativePath="..\include\qtypes.h">
+ </File>
+ <File
+ RelativePath=".\r_explosion.h">
+ </File>
+ <File
+ RelativePath=".\render.h">
+ </File>
+ <File
+ RelativePath="..\include\sbar.h">
+ </File>
+ <File
+ RelativePath=".\screen.h">
+ </File>
+ <File
+ RelativePath=".\server.h">
+ </File>
+ <File
+ RelativePath="..\include\sound.h">
+ </File>
+ <File
+ RelativePath="..\include\spritegn.h">
+ </File>
+ <File
+ RelativePath="..\include\strlib.h">
+ </File>
+ <File
+ RelativePath=".\sys.h">
+ </File>
+ <File
+ RelativePath="..\include\tga.h">
+ </File>
+ <File
+ RelativePath="..\include\vid.h">
+ </File>
+ <File
+ RelativePath="..\include\view.h">
+ </File>
+ <File
+ RelativePath="..\include\wad.h">
+ </File>
+ <File
+ RelativePath="..\include\win32config.h">
+ </File>
+ <File
+ RelativePath=".\world.h">
+ </File>
+ <File
+ RelativePath="..\include\zone.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Index: twilight/nq/r_part.c
diff -u twilight/nq/r_part.c:1.74 twilight/nq/r_part.c:1.75
--- twilight/nq/r_part.c:1.74 Thu Oct 17 16:56:02 2002
+++ twilight/nq/r_part.c Sat Nov 23 23:27:48 2002
@@ -23,7 +23,7 @@
*/
static const char rcsid[] =
- "$Id: r_part.c,v 1.74 2002/10/17 20:56:02 warp Exp $";
+ "$Id: r_part.c,v 1.75 2002/11/24 04:27:48 warp Exp $";
#include "twiconfig.h"
@@ -691,7 +691,7 @@
pcolor = 0x40 + (rand () & 3);
for (j = 0; j < 3; j++)
porg[j] = start[j] + ((rand () % 6) - 3);
- R_Stain (start, 32, 32, 16, 16, 32, 192, 48, 48, 32);
+ R_Stain (start, 32, 64, 32, 32, 32, 192, 64, 64, 32);
break;
case EF_TRACER:
Index: twilight/qw/.cvsignore
diff -u twilight/qw/.cvsignore:1.3 twilight/qw/.cvsignore:1.4
--- twilight/qw/.cvsignore:1.3 Fri Jun 7 23:17:13 2002
+++ twilight/qw/.cvsignore Sat Nov 23 23:27:48 2002
@@ -1,6 +1,7 @@
Makefile
Makefile.in
*.o
+.*.swp
twilight-qw
twilight-qwsv
.deps
Index: twilight/qw/cl_ents.c
diff -u twilight/qw/cl_ents.c:1.78 twilight/qw/cl_ents.c:1.79
--- twilight/qw/cl_ents.c:1.78 Tue Nov 19 16:36:53 2002
+++ twilight/qw/cl_ents.c Sat Nov 23 23:27:48 2002
@@ -23,7 +23,7 @@
*/
static const char rcsid[] =
- "$Id: cl_ents.c,v 1.78 2002/11/19 21:36:53 warp Exp $";
+ "$Id: cl_ents.c,v 1.79 2002/11/24 04:27:48 warp Exp $";
#include <SDL.h>
@@ -592,6 +592,7 @@
int pnum, flags;
dlight_t *dl;
qboolean moved;
+ vec3_t angles;
pack = &cl.frames[cl.validsequence & UPDATE_MASK].packet_entities;
@@ -624,10 +625,6 @@
ent->modelindex = state->modelindex;
ent->model = model = cl.model_precache[state->modelindex]; // Model.
- moved = CL_Update_OriginAngles (ent, state->origin, state->angles, cl.time);
- CL_Lerp_OriginAngles (ent);
- CL_Update_Frame (ent, state->frame, cl.time);
-
ent->skinnum = state->skinnum;
ent->effects = state->effects;
ent->entity_frame = entity_frame;
@@ -645,8 +642,13 @@
// rotate binary objects locally
if (flags & EF_ROTATE) {
flags &= ~EF_ROTATE;
- VectorSet (ent->angles, 0, autorotate, 0);
- }
+ VectorSet (angles, 0, autorotate, 0);
+ } else
+ VectorCopy(state->angles, angles);
+
+ moved = CL_Update_OriginAngles (ent, state->origin, angles, cl.time);
+ CL_Lerp_OriginAngles (ent);
+ CL_Update_Frame (ent, state->frame, cl.time);
V_AddEntity ( ent );
Index: twilight/qw/cl_tent.c
diff -u twilight/qw/cl_tent.c:1.42 twilight/qw/cl_tent.c:1.43
--- twilight/qw/cl_tent.c:1.42 Thu Oct 17 16:56:04 2002
+++ twilight/qw/cl_tent.c Sat Nov 23 23:27:48 2002
@@ -23,7 +23,7 @@
*/
static const char rcsid[] =
- "$Id: cl_tent.c,v 1.42 2002/10/17 20:56:04 warp Exp $";
+ "$Id: cl_tent.c,v 1.43 2002/11/24 04:27:48 warp Exp $";
#include "twiconfig.h"
@@ -211,7 +211,7 @@
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
R_RunParticleEffect (pos, vec3_origin, 226, 20);
- R_Stain (pos, 32, 60, 60, 60, 32, 96, 96, 96, 32);
+ R_Stain (pos, 32, 64, 64, 64, 32, 192, 192, 192, 32);
S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1);
break;
@@ -220,7 +220,7 @@
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
R_RunParticleEffect (pos, vec3_origin, 0, 10);
- R_Stain (pos, 32, 60, 60, 60, 32, 96, 96, 96, 32);
+ R_Stain (pos, 32, 64, 64, 64, 32, 192, 192, 192, 32);
if (rand () % 5)
S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
@@ -240,7 +240,7 @@
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
R_RunParticleEffect (pos, vec3_origin, 0, 20);
- R_Stain (pos, 32, 60, 60, 60, 32, 96, 96, 96, 32);
+ R_Stain (pos, 32, 64, 64, 64, 32, 192, 192, 192, 32);
if (rand () % 5)
S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1);
@@ -271,7 +271,7 @@
dl->color[0] = 1.25f;
dl->color[1] = 1.0f;
dl->color[2] = 0.5f;
- R_Stain (pos, 96, 60, 60, 60, 128, 128, 128, 128, 128);
+ R_Stain (pos, 96, 64, 64, 64, 128, 192, 192, 192, 192);
// sound
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
@@ -283,7 +283,7 @@
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
R_BlobExplosion (pos);
- R_Stain (pos, 96, 60, 60, 60, 128, 128, 128, 128, 128);
+ R_Stain (pos, 96, 64, 64, 64, 128, 192, 192, 192, 192);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
break;
@@ -333,7 +333,7 @@
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
R_RunParticleEffect (pos, vec3_origin, 0, 20 * cnt);
- R_Stain (pos, 5 * cnt, 60, 60, 60, 72, 96, 96, 96, 72);
+ R_Stain (pos, 5 * cnt, 64, 64, 64, 72, 192, 192, 192, 72);
break;
case TE_BLOOD: // bullets hitting body
Index: twilight/qw/gl_rsurf.c
diff -u twilight/qw/gl_rsurf.c:1.125 twilight/qw/gl_rsurf.c:1.126
--- twilight/qw/gl_rsurf.c:1.125 Tue Nov 19 16:36:53 2002
+++ twilight/qw/gl_rsurf.c Sat Nov 23 23:27:48 2002
@@ -23,7 +23,7 @@
*/
static const char rcsid[] =
- "$Id: gl_rsurf.c,v 1.125 2002/11/19 21:36:53 warp Exp $";
+ "$Id: gl_rsurf.c,v 1.126 2002/11/24 04:27:48 warp Exp $";
#include "twiconfig.h"
@@ -174,14 +174,14 @@
}
inline qboolean
-R_StainBlendTexel (int k, int *icolor, Uint8 *bl)
+R_StainBlendTexel (Sint64 k, int *icolor, Uint8 *bl)
{
int ratio, a;
int cr, cg, cb, ca;
ratio = rand() & 255;
ca = (((icolor[7] - icolor[3]) * ratio) >> 8) + icolor[3];
- a = (ca * k);
+ a = (ca * k) >> 8;
if (a > 0)
{
@@ -212,10 +212,11 @@
int i, stained;
int s, t, td, smax, tmax, smax3;
int dist2, maxdist, maxdist2, maxdist3;
- int impacts, impactt, subtract, k;
+ int impacts, impactt, subtract;
int sdtable[256];
Uint8 *bl;
vec3_t impact;
+ Sint64 k;
// for comparisons to minimum acceptable light
// compensate for 4096 offset
@@ -304,7 +305,6 @@
{
k = dlightdivtable[(sdtable[s] + td) >> 7]
- subtract;
- k >>= 8;
if (k > 0)
if (R_StainBlendTexel (k, icolor, bl))
stained = true;
Index: twilight/qw/qw.vcproj
diff -u /dev/null twilight/qw/qw.vcproj:1.1
--- /dev/null Sat Nov 23 23:28:00 2002
+++ twilight/qw/qw.vcproj Sat Nov 23 23:27:48 2002
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="qw"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../include,../src/renderer,../SDL/include,../src/sound,../src/image"
+ PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Release/qw.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
+ OutputFile="tw-qw.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../SDL/lib"
+ IgnoreDefaultLibraryNames="libc.lib"
+ ProgramDatabaseFile=".\Release/tw-qw.pdb"
+ SubSystem="2"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Release/qw.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1049"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../include,../src/renderer,../SDL/include,../src/sound,../src/image"
+ PreprocessorDefinitions="_DEBUG,GLQUAKE,WIN32,_WINDOWS"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Debug/qw.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wsock32.lib sdl.lib sdlmain.lib"
+ OutputFile="tw-qw-debug.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../SDL/lib"
+ IgnoreDefaultLibraryNames="libc.lib,libcd.lib,msvcrt.lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\Debug/tw-qw-debug.pdb"
+ SubSystem="2"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Debug/qw.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath=".\cl_cam.c">
+ </File>
+ <File
+ RelativePath=".\cl_demo.c">
+ </File>
+ <File
+ RelativePath=".\cl_ents.c">
+ </File>
+ <File
+ RelativePath=".\cl_input.c">
+ </File>
+ <File
+ RelativePath=".\cl_main.c">
+ </File>
+ <File
+ RelativePath=".\cl_model.c">
+ </File>
+ <File
+ RelativePath=".\cl_parse.c">
+ </File>
+ <File
+ RelativePath=".\cl_pred.c">
+ </File>
+ <File
+ RelativePath=".\cl_tent.c">
+ </File>
+ <File
+ RelativePath=".\common.c">
+ </File>
+ <File
+ RelativePath=".\console.c">
+ </File>
+ <File
+ RelativePath=".\gl_alias.c">
+ </File>
+ <File
+ RelativePath=".\gl_draw.c">
+ </File>
+ <File
+ RelativePath=".\gl_ngraph.c">
+ </File>
+ <File
+ RelativePath=".\gl_rlight.c">
+ </File>
+ <File
+ RelativePath=".\gl_rmain.c">
+ </File>
+ <File
+ RelativePath=".\gl_rsurf.c">
+ </File>
+ <File
+ RelativePath=".\gl_screen.c">
+ </File>
+ <File
+ RelativePath=".\info.c">
+ </File>
+ <File
+ RelativePath=".\keys.c">
+ </File>
+ <File
+ RelativePath="..\src\base\locs.c">
+ </File>
+ <File
+ RelativePath=".\menu.c">
+ </File>
+ <File
+ RelativePath=".\net_chan.c">
+ </File>
+ <File
+ RelativePath=".\net_udp.c">
+ </File>
+ <File
+ RelativePath=".\pmove.c">
+ </File>
+ <File
+ RelativePath=".\pmovetst.c">
+ </File>
+ <File
+ RelativePath=".\r_explosion.c">
+ </File>
+ <File
+ RelativePath=".\r_part.c">
+ </File>
+ <File
+ RelativePath=".\sbar.c">
+ </File>
+ <File
+ RelativePath=".\skin.c">
+ </File>
+ <File
+ RelativePath=".\snd_dma.c">
+ </File>
+ <File
+ RelativePath=".\sv_null.c">
+ </File>
+ <File
+ RelativePath=".\sys.c">
+ </File>
+ <File
+ RelativePath=".\teamplay.c">
+ </File>
+ <File
+ RelativePath=".\vid_sdl.c">
+ </File>
+ <File
+ RelativePath=".\view.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath="..\include\TGL_defines.h">
+ </File>
+ <File
+ RelativePath="..\include\TGL_funcs.h">
+ </File>
+ <File
+ RelativePath="..\include\TGL_funcs_list.h">
+ </File>
+ <File
+ RelativePath="..\include\TGL_types.h">
+ </File>
+ <File
+ RelativePath="..\include\anorm_dots.h">
+ </File>
+ <File
+ RelativePath="..\include\anorms.h">
+ </File>
+ <File
+ RelativePath="..\include\bothdefs.h">
+ </File>
+ <File
+ RelativePath=".\bspfile.h">
+ </File>
+ <File
+ RelativePath=".\client.h">
+ </File>
+ <File
+ RelativePath="..\include\cmd.h">
+ </File>
+ <File
+ RelativePath="..\include\common.h">
+ </File>
+ <File
+ RelativePath="..\include\compat.h">
+ </File>
+ <File
+ RelativePath=".\console.h">
+ </File>
+ <File
+ RelativePath="..\include\crc.h">
+ </File>
+ <File
+ RelativePath="..\include\cvar.h">
+ </File>
+ <File
+ RelativePath="..\include\draw.h">
+ </File>
+ <File
+ RelativePath=".\gl_poly.h">
+ </File>
+ <File
+ RelativePath="..\include\gl_warp_sin.h">
+ </File>
+ <File
+ RelativePath=".\hash.h">
+ </File>
+ <File
+ RelativePath="..\include\host.h">
+ </File>
+ <File
+ RelativePath="..\include\input.h">
+ </File>
+ <File
+ RelativePath=".\keys.h">
+ </File>
+ <File
+ RelativePath="..\include\mathlib.h">
+ </File>
+ <File
+ RelativePath="..\include\mdfour.h">
+ </File>
+ <File
+ RelativePath="..\include\menu.h">
+ </File>
+ <File
+ RelativePath="..\include\modelgen.h">
+ </File>
+ <File
+ RelativePath=".\net.h">
+ </File>
+ <File
+ RelativePath="..\include\pcx.h">
+ </File>
+ <File
+ RelativePath="..\include\pmove.h">
+ </File>
+ <File
+ RelativePath="..\include\pr_comp.h">
+ </File>
+ <File
+ RelativePath=".\protocol.h">
+ </File>
+ <File
+ RelativePath="..\include\qtypes.h">
+ </File>
+ <File
+ RelativePath=".\r_explosion.h">
+ </File>
+ <File
+ RelativePath=".\render.h">
+ </File>
+ <File
+ RelativePath="..\include\sbar.h">
+ </File>
+ <File
+ RelativePath=".\screen.h">
+ </File>
+ <File
+ RelativePath="..\include\sound.h">
+ </File>
+ <File
+ RelativePath="..\include\spritegn.h">
+ </File>
+ <File
+ RelativePath="..\include\strlib.h">
+ </File>
+ <File
+ RelativePath="..\include\tga.h">
+ </File>
+ <File
+ RelativePath="..\include\vid.h">
+ </File>
+ <File
+ RelativePath="..\include\view.h">
+ </File>
+ <File
+ RelativePath="..\include\wad.h">
+ </File>
+ <File
+ RelativePath="..\include\win32config.h">
+ </File>
+ <File
+ RelativePath="..\include\zone.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Index: twilight/qw/qwsv.vcproj
diff -u /dev/null twilight/qw/qwsv.vcproj:1.1
--- /dev/null Sat Nov 23 23:28:00 2002
+++ twilight/qw/qwsv.vcproj Sat Nov 23 23:27:48 2002
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="qwsv"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../include,../SDL/include,../src/renderer"
+ PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Debug/qwsv.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wsock32.lib sdl.lib"
+ OutputFile="tw-qwsv-debug.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../SDL/lib"
+ IgnoreDefaultLibraryNames="libcd"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\Debug/tw-qwsv-debug.pdb"
+ SubSystem="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/qwsv.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1036"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../include,../SDL/include,../src/renderer"
+ PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Release/qwsv.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="wsock32.lib sdl.lib"
+ OutputFile="tw-qwsv.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../SDL/lib"
+ IgnoreDefaultLibraryNames="libc"
+ ProgramDatabaseFile=".\Release/tw-qwsv.pdb"
+ SubSystem="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/qwsv.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1036"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath=".\cl_null.c">
+ </File>
+ <File
+ RelativePath=".\common.c">
+ </File>
+ <File
+ RelativePath=".\info.c">
+ </File>
+ <File
+ RelativePath=".\net_chan.c">
+ </File>
+ <File
+ RelativePath=".\net_udp.c">
+ </File>
+ <File
+ RelativePath=".\pmove.c">
+ </File>
+ <File
+ RelativePath=".\pmovetst.c">
+ </File>
+ <File
+ RelativePath=".\pr_cmds.c">
+ </File>
+ <File
+ RelativePath=".\pr_edict.c">
+ </File>
+ <File
+ RelativePath=".\pr_exec.c">
+ </File>
+ <File
+ RelativePath=".\sv_ccmds.c">
+ </File>
+ <File
+ RelativePath=".\sv_ents.c">
+ </File>
+ <File
+ RelativePath=".\sv_init.c">
+ </File>
+ <File
+ RelativePath=".\sv_main.c">
+ </File>
+ <File
+ RelativePath=".\sv_model.c">
+ </File>
+ <File
+ RelativePath=".\sv_move.c">
+ </File>
+ <File
+ RelativePath=".\sv_nchan.c">
+ </File>
+ <File
+ RelativePath=".\sv_phys.c">
+ </File>
+ <File
+ RelativePath=".\sv_send.c">
+ </File>
+ <File
+ RelativePath=".\sv_sys.c">
+ </File>
+ <File
+ RelativePath=".\sv_user.c">
+ </File>
+ <File
+ RelativePath=".\world.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath=".\client.h">
+ </File>
+ <File
+ RelativePath=".\console.h">
+ </File>
+ <File
+ RelativePath=".\keys.h">
+ </File>
+ <File
+ RelativePath=".\net.h">
+ </File>
+ <File
+ RelativePath=".\progdefs.h">
+ </File>
+ <File
+ RelativePath=".\progs.h">
+ </File>
+ <File
+ RelativePath=".\protocol.h">
+ </File>
+ <File
+ RelativePath=".\r_explosion.h">
+ </File>
+ <File
+ RelativePath=".\render.h">
+ </File>
+ <File
+ RelativePath=".\screen.h">
+ </File>
+ <File
+ RelativePath=".\server.h">
+ </File>
+ <File
+ RelativePath=".\world.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Index: twilight/qw/r_part.c
diff -u twilight/qw/r_part.c:1.98 twilight/qw/r_part.c:1.99
--- twilight/qw/r_part.c:1.98 Thu Oct 17 16:56:04 2002
+++ twilight/qw/r_part.c Sat Nov 23 23:27:48 2002
@@ -23,7 +23,7 @@
*/
static const char rcsid[] =
- "$Id: r_part.c,v 1.98 2002/10/17 20:56:04 warp Exp $";
+ "$Id: r_part.c,v 1.99 2002/11/24 04:27:48 warp Exp $";
#include "twiconfig.h"
@@ -691,7 +691,7 @@
pcolor = 0x40 + (rand () & 3);
for (j = 0; j < 3; j++)
porg[j] = start[j] + ((rand () % 6) - 3);
- R_Stain (start, 32, 32, 16, 16, 32, 192, 48, 48, 32);
+ R_Stain (start, 32, 64, 32, 32, 32, 192, 64, 64, 32);
break;
case EF_TRACER:
Index: twilight/src/base/.cvsignore
diff -u twilight/src/base/.cvsignore:1.1 twilight/src/base/.cvsignore:1.2
--- twilight/src/base/.cvsignore:1.1 Sat Sep 29 00:48:01 2001
+++ twilight/src/base/.cvsignore Sat Nov 23 23:27:49 2002
@@ -1,4 +1,5 @@
Makefile
Makefile.in
*.o
+.*.swp
.deps
Index: twilight/src/base/twilight_base.vcproj
diff -u /dev/null twilight/src/base/twilight_base.vcproj:1.1
--- /dev/null Sat Nov 23 23:28:00 2002
+++ twilight/src/base/twilight_base.vcproj Sat Nov 23 23:27:49 2002
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="twilight_base"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../../include,../../SDL/include"
+ PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Debug/twilight_base.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\Debug\twilight_base.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1036"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../../include,../../SDL/include"
+ PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Release/twilight_base.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\Release\twilight_base.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1036"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath=".\buildnum.c">
+ </File>
+ <File
+ RelativePath=".\cmd.c">
+ </File>
+ <File
+ RelativePath=".\collision.c">
+ </File>
+ <File
+ RelativePath=".\crc.c">
+ </File>
+ <File
+ RelativePath=".\cvar.c">
+ </File>
+ <File
+ RelativePath=".\mathlib.c">
+ </File>
+ <File
+ RelativePath="matrixlib.c">
+ </File>
+ <File
+ RelativePath=".\mdfour.c">
+ </File>
+ <File
+ RelativePath=".\mod_brush.c">
+ </File>
+ <File
+ RelativePath=".\model.c">
+ </File>
+ <File
+ RelativePath=".\parm.c">
+ </File>
+ <File
+ RelativePath=".\strlib.c">
+ </File>
+ <File
+ RelativePath=".\wad.c">
+ </File>
+ <File
+ RelativePath=".\zone.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath="..\..\include\crc.h">
+ </File>
+ <File
+ RelativePath="..\..\include\mathlib.h">
+ </File>
+ <File
+ RelativePath="..\..\include\strlib.h">
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Index: twilight/src/image/.cvsignore
diff -u twilight/src/image/.cvsignore:1.1 twilight/src/image/.cvsignore:1.2
--- twilight/src/image/.cvsignore:1.1 Sat Jan 26 16:36:33 2002
+++ twilight/src/image/.cvsignore Sat Nov 23 23:27:49 2002
@@ -1,3 +1,4 @@
Makefile
Makefile.in
+.*.swp
.deps
Index: twilight/src/image/twilight_image.vcproj
diff -u /dev/null twilight/src/image/twilight_image.vcproj:1.1
--- /dev/null Sat Nov 23 23:28:00 2002
+++ twilight/src/image/twilight_image.vcproj Sat Nov 23 23:27:49 2002
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="twilight_image"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../../include,../../SDL/include"
+ PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+ StringPooling="TRUE"
+ RuntimeLibrary="4"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Release/twilight_image.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\Release\twilight_image.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1049"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../../include,../../SDL/include"
+ PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="5"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Debug/twilight_image.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\Debug\twilight_image.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath=".\image.c">
+ </File>
+ <File
+ RelativePath=".\jpeg.c">
+ </File>
+ <File
+ RelativePath=".\pcx.c">
+ </File>
+ <File
+ RelativePath=".\qlmp.c">
+ </File>
+ <File
+ RelativePath=".\tga.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath=".\image.h">
+ </File>
+ <File
+ RelativePath=".\jpeg.h">
+ </File>
+ <File
+ RelativePath=".\pcx.h">
+ </File>
+ <File
+ RelativePath=".\qlmp.h">
+ </File>
+ <File
+ RelativePath=".\tga.h">
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Index: twilight/src/renderer/.cvsignore
diff -u twilight/src/renderer/.cvsignore:1.1 twilight/src/renderer/.cvsignore:1.2
--- twilight/src/renderer/.cvsignore:1.1 Sat Sep 29 00:48:01 2001
+++ twilight/src/renderer/.cvsignore Sat Nov 23 23:27:49 2002
@@ -1,4 +1,5 @@
Makefile
Makefile.in
*.o
+.*.swp
.deps
Index: twilight/src/renderer/twilight_renderer.vcproj
diff -u /dev/null twilight/src/renderer/twilight_renderer.vcproj:1.1
--- /dev/null Sat Nov 23 23:28:00 2002
+++ twilight/src/renderer/twilight_renderer.vcproj Sat Nov 23 23:27:49 2002
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="twilight_renderer"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../../include,../image,../../SDL/include"
+ PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Debug/twilight_renderer.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\Debug\twilight_renderer.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1036"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../../include,../image,../../SDL/include"
+ PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Release/twilight_renderer.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\Release\twilight_renderer.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1036"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath=".\dyngl.c">
+ </File>
+ <File
+ RelativePath=".\gl_arrays.c">
+ </File>
+ <File
+ RelativePath=".\gl_info.c">
+ </File>
+ <File
+ RelativePath=".\gl_textures.c">
+ </File>
+ <File
+ RelativePath=".\liquid.c">
+ </File>
+ <File
+ RelativePath=".\mod_alias.c">
+ </File>
+ <File
+ RelativePath=".\mod_brush.c">
+ </File>
+ <File
+ RelativePath=".\mod_sprite.c">
+ </File>
+ <File
+ RelativePath=".\noise.c">
+ </File>
+ <File
+ RelativePath=".\noise_textures.c">
+ </File>
+ <File
+ RelativePath=".\pointers.c">
+ </File>
+ <File
+ RelativePath=".\sky.c">
+ </File>
+ <File
+ RelativePath=".\surface.c">
+ </File>
+ <File
+ RelativePath=".\vis.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath=".\dglfuncs.h">
+ </File>
+ <File
+ RelativePath=".\dyngl.h">
+ </File>
+ <File
+ RelativePath=".\gl_arrays.h">
+ </File>
+ <File
+ RelativePath=".\gl_info.h">
+ </File>
+ <File
+ RelativePath=".\gl_textures.h">
+ </File>
+ <File
+ RelativePath=".\glquake.h">
+ </File>
+ <File
+ RelativePath=".\light.h">
+ </File>
+ <File
+ RelativePath=".\liquid.h">
+ </File>
+ <File
+ RelativePath=".\mod_alias.h">
+ </File>
+ <File
+ RelativePath=".\mod_brush.h">
+ </File>
+ <File
+ RelativePath=".\mod_sprite.h">
+ </File>
+ <File
+ RelativePath=".\pointers.h">
+ </File>
+ <File
+ RelativePath=".\sky.h">
+ </File>
+ <File
+ RelativePath=".\surface.h">
+ </File>
+ <File
+ RelativePath=".\transform.h">
+ </File>
+ <File
+ RelativePath=".\vis.h">
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Index: twilight/src/sound/twilight_sound.vcproj
diff -u /dev/null twilight/src/sound/twilight_sound.vcproj:1.1
--- /dev/null Sat Nov 23 23:28:00 2002
+++ twilight/src/sound/twilight_sound.vcproj Sat Nov 23 23:27:50 2002
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="twilight_sound"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../../include,../../SDL/include"
+ PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+ StringPooling="TRUE"
+ RuntimeLibrary="4"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Release/twilight_sound.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\Release\twilight_sound.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1049"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../../include,../../SDL/include"
+ PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="5"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderFile=".\Debug/twilight_sound.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\Debug\twilight_sound.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1049"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath=".\cdmusic.c">
+ </File>
+ <File
+ RelativePath=".\mem.c">
+ </File>
+ <File
+ RelativePath=".\mix.c">
+ </File>
+ <File
+ RelativePath=".\target.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath=".\cdaudio.h">
+ </File>
+ <File
+ RelativePath=".\sound.h">
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Index: twilight/twilight.sln
diff -u /dev/null twilight/twilight.sln:1.1
--- /dev/null Sat Nov 23 23:28:00 2002
+++ twilight/twilight.sln Sat Nov 23 23:27:47 2002
@@ -0,0 +1,67 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq", "nq\nq.vcproj", "{FB5A69C4-9DD7-4BBE-A48D-FB0F48884C52}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw", "qw\qw.vcproj", "{E8FC2192-3B76-4189-AB24-EB54EFEA581C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qwsv", "qw\qwsv.vcproj", "{1AE5F481-535C-4209-A875-08ADBEEC1A62}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_base", "src\base\twilight_base.vcproj", "{402AA198-4FA0-4A96-9C40-2616895D978F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_image", "src\image\twilight_image.vcproj", "{F61F6042-CE6C-4C69-B035-863547896DE5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_renderer", "src\renderer\twilight_renderer.vcproj", "{D8A57E14-8312-42E2-99A0-9609B90FD2E9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twilight_sound", "src\sound\twilight_sound.vcproj", "{3A3E61C0-6B71-4D6B-8225-9637F1AAE5B2}"
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ ConfigName.0 = Debug
+ ConfigName.1 = Release
+ EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+ {FB5A69C4-9DD7-4BBE-A48D-FB0F48884C52}.0 = {F61F6042-CE6C-4C69-B035-863547896DE5}
+ {FB5A69C4-9DD7-4BBE-A48D-FB0F48884C52}.1 = {3A3E61C0-6B71-4D6B-8225-9637F1AAE5B2}
+ {FB5A69C4-9DD7-4BBE-A48D-FB0F48884C52}.2 = {D8A57E14-8312-42E2-99A0-9609B90FD2E9}
+ {FB5A69C4-9DD7-4BBE-A48D-FB0F48884C52}.3 = {402AA198-4FA0-4A96-9C40-2616895D978F}
+ {E8FC2192-3B76-4189-AB24-EB54EFEA581C}.0 = {F61F6042-CE6C-4C69-B035-863547896DE5}
+ {E8FC2192-3B76-4189-AB24-EB54EFEA581C}.1 = {3A3E61C0-6B71-4D6B-8225-9637F1AAE5B2}
+ {E8FC2192-3B76-4189-AB24-EB54EFEA581C}.2 = {D8A57E14-8312-42E2-99A0-9609B90FD2E9}
+ {E8FC2192-3B76-4189-AB24-EB54EFEA581C}.3 = {402AA198-4FA0-4A96-9C40-2616895D978F}
+ {1AE5F481-535C-4209-A875-08ADBEEC1A62}.0 = {D8A57E14-8312-42E2-99A0-9609B90FD2E9}
+ {1AE5F481-535C-4209-A875-08ADBEEC1A62}.1 = {402AA198-4FA0-4A96-9C40-2616895D978F}
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {FB5A69C4-9DD7-4BBE-A48D-FB0F48884C52}.Debug.ActiveCfg = Debug|Win32
+ {FB5A69C4-9DD7-4BBE-A48D-FB0F48884C52}.Debug.Build.0 = Debug|Win32
+ {FB5A69C4-9DD7-4BBE-A48D-FB0F48884C52}.Release.ActiveCfg = Release|Win32
+ {FB5A69C4-9DD7-4BBE-A48D-FB0F48884C52}.Release.Build.0 = Release|Win32
+ {E8FC2192-3B76-4189-AB24-EB54EFEA581C}.Debug.ActiveCfg = Debug|Win32
+ {E8FC2192-3B76-4189-AB24-EB54EFEA581C}.Debug.Build.0 = Debug|Win32
+ {E8FC2192-3B76-4189-AB24-EB54EFEA581C}.Release.ActiveCfg = Release|Win32
+ {E8FC2192-3B76-4189-AB24-EB54EFEA581C}.Release.Build.0 = Release|Win32
+ {1AE5F481-535C-4209-A875-08ADBEEC1A62}.Debug.ActiveCfg = Debug|Win32
+ {1AE5F481-535C-4209-A875-08ADBEEC1A62}.Debug.Build.0 = Debug|Win32
+ {1AE5F481-535C-4209-A875-08ADBEEC1A62}.Release.ActiveCfg = Release|Win32
+ {1AE5F481-535C-4209-A875-08ADBEEC1A62}.Release.Build.0 = Release|Win32
+ {402AA198-4FA0-4A96-9C40-2616895D978F}.Debug.ActiveCfg = Debug|Win32
+ {402AA198-4FA0-4A96-9C40-2616895D978F}.Debug.Build.0 = Debug|Win32
+ {402AA198-4FA0-4A96-9C40-2616895D978F}.Release.ActiveCfg = Release|Win32
+ {402AA198-4FA0-4A96-9C40-2616895D978F}.Release.Build.0 = Release|Win32
+ {F61F6042-CE6C-4C69-B035-863547896DE5}.Debug.ActiveCfg = Debug|Win32
+ {F61F6042-CE6C-4C69-B035-863547896DE5}.Debug.Build.0 = Debug|Win32
+ {F61F6042-CE6C-4C69-B035-863547896DE5}.Release.ActiveCfg = Release|Win32
+ {F61F6042-CE6C-4C69-B035-863547896DE5}.Release.Build.0 = Release|Win32
+ {D8A57E14-8312-42E2-99A0-9609B90FD2E9}.Debug.ActiveCfg = Debug|Win32
+ {D8A57E14-8312-42E2-99A0-9609B90FD2E9}.Debug.Build.0 = Debug|Win32
+ {D8A57E14-8312-42E2-99A0-9609B90FD2E9}.Release.ActiveCfg = Release|Win32
+ {D8A57E14-8312-42E2-99A0-9609B90FD2E9}.Release.Build.0 = Release|Win32
+ {3A3E61C0-6B71-4D6B-8225-9637F1AAE5B2}.Debug.ActiveCfg = Debug|Win32
+ {3A3E61C0-6B71-4D6B-8225-9637F1AAE5B2}.Debug.Build.0 = Debug|Win32
+ {3A3E61C0-6B71-4D6B-8225-9637F1AAE5B2}.Release.ActiveCfg = Release|Win32
+ {3A3E61C0-6B71-4D6B-8225-9637F1AAE5B2}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
More information about the twilight-commits
mailing list