From 929f9a6fe217e9c8ca40a68a5229b08400233946 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Tue, 21 May 2002 10:49:48 +0000 Subject: [PATCH] added collision.c, cl_collision.c. collision.h, cl_collision.h git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1862 d7cf8633-e32d-0410-b094-e92efae38249 --- darkplaces.dsp | 695 ++----------------------------------------------- 1 file changed, 20 insertions(+), 675 deletions(-) diff --git a/darkplaces.dsp b/darkplaces.dsp index 1ed841ca..5b6ee4ea 100644 --- a/darkplaces.dsp +++ b/darkplaces.dsp @@ -1,1342 +1,687 @@ # Microsoft Developer Studio Project File - Name="darkplaces" - Package Owner=<4> - # Microsoft Developer Studio Generated Build File, Format Version 6.00 - # ** DO NOT EDIT ** - - # TARGTYPE "Win32 (x86) Application" 0x0101 - - CFG=darkplaces - 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 !MESSAGE NMAKE /f "darkplaces.mak". - -!MESSAGE - +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE - !MESSAGE by defining the macro CFG on the command line. For example: - -!MESSAGE - +!MESSAGE !MESSAGE NMAKE /f "darkplaces.mak" CFG="darkplaces - Win32 Debug" - -!MESSAGE - +!MESSAGE !MESSAGE Possible choices for configuration are: - -!MESSAGE - +!MESSAGE !MESSAGE "darkplaces - Win32 Release" (based on "Win32 (x86) Application") - !MESSAGE "darkplaces - Win32 Debug" (based on "Win32 (x86) Application") - -!MESSAGE - - +!MESSAGE # Begin Project - # PROP AllowPerConfigDependencies 0 - # PROP Scc_ProjName "" - # PROP Scc_LocalPath "" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe - - !IF "$(CFG)" == "darkplaces - 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 /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 0x40c /d "NDEBUG" - # ADD RSC /l 0x40c /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 user32.lib gdi32.lib opengl32.lib wsock32.lib winmm.lib comctl32.lib dxguid.lib /nologo /subsystem:windows /machine:I386 - - !ELSEIF "$(CFG)" == "darkplaces - 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 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 /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 0x40c /d "_DEBUG" - # ADD RSC /l 0x40c /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 user32.lib gdi32.lib opengl32.lib wsock32.lib winmm.lib comctl32.lib dxguid.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - - -!ENDIF - - +!ENDIF # Begin Target - - # Name "darkplaces - Win32 Release" - # Name "darkplaces - Win32 Debug" - # Begin Group "Source Files" - - # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - # Begin Source File - - SOURCE=.\builddate.c - # End Source File - # Begin Source File - - SOURCE=.\cd_win.c - # End Source File - # Begin Source File - - SOURCE=.\cgame.c - # End Source File - # Begin Source File - - SOURCE=.\cgamevm.c - # End Source File - # Begin Source File - - SOURCE=.\chase.c - # End Source File - # Begin Source File - +SOURCE=.\cl_collision.c +# End Source File +# Begin Source File SOURCE=.\cl_demo.c - # End Source File - # Begin Source File - - SOURCE=.\cl_input.c - # End Source File - # Begin Source File - - SOURCE=.\cl_light.c - # End Source File - # Begin Source File - - SOURCE=.\cl_main.c - # End Source File - # Begin Source File - - SOURCE=.\cl_parse.c - # End Source File - # Begin Source File - - SOURCE=.\cl_particles.c - # End Source File - # Begin Source File - - SOURCE=.\cl_screen.c - # End Source File - # Begin Source File - - SOURCE=.\cl_tent.c - # End Source File - # Begin Source File - - SOURCE=.\cmd.c - # End Source File - # Begin Source File - +SOURCE=.\collision.c +# End Source File +# Begin Source File SOURCE=.\common.c - # End Source File - # Begin Source File - - SOURCE=.\conproc.c - # End Source File - # Begin Source File - - SOURCE=.\console.c - # End Source File - # Begin Source File - - SOURCE=.\crc.c - # End Source File - # Begin Source File - - SOURCE=.\cvar.c - # End Source File - # Begin Source File - - SOURCE=.\filematch.c - # End Source File - # Begin Source File - - SOURCE=.\fractalnoise.c - # End Source File - # Begin Source File - - SOURCE=.\gl_backend.c - # End Source File - # Begin Source File - - SOURCE=.\gl_draw.c - # End Source File - # Begin Source File - - SOURCE=.\gl_models.c - # End Source File - # Begin Source File - - SOURCE=.\gl_rmain.c - # End Source File - # Begin Source File - - SOURCE=.\gl_rsurf.c - # End Source File - # Begin Source File - - SOURCE=.\gl_textures.c - # End Source File - # Begin Source File - - SOURCE=.\host.c - # End Source File - # Begin Source File - - SOURCE=.\host_cmd.c - # End Source File - # Begin Source File - - SOURCE=.\image.c - # End Source File - # Begin Source File - - SOURCE=.\in_win.c - # End Source File - # Begin Source File - - SOURCE=.\keys.c - # End Source File - # Begin Source File - - SOURCE=.\mathlib.c - # End Source File - # Begin Source File - - SOURCE=.\menu.c - # End Source File - # Begin Source File - - SOURCE=.\model_alias.c - # End Source File - # Begin Source File - - SOURCE=.\model_brush.c - # End Source File - # Begin Source File - - SOURCE=.\model_shared.c - # End Source File - # Begin Source File - - SOURCE=.\model_sprite.c - # End Source File - # Begin Source File - - SOURCE=.\net_dgrm.c - # End Source File - # Begin Source File - - SOURCE=.\net_loop.c - # End Source File - # Begin Source File - - SOURCE=.\net_main.c - # End Source File - # Begin Source File - - SOURCE=.\net_win.c - # End Source File - # Begin Source File - - SOURCE=.\net_wins.c - # End Source File - # Begin Source File - - SOURCE=.\net_wipx.c - # End Source File - # Begin Source File - - SOURCE=.\palette.c - # End Source File - # Begin Source File - - SOURCE=.\portals.c - # End Source File - # Begin Source File - - SOURCE=.\pr_cmds.c - # End Source File - # Begin Source File - - SOURCE=.\pr_edict.c - # End Source File - # Begin Source File - - SOURCE=.\pr_exec.c - # End Source File - # Begin Source File - - SOURCE=.\protocol.c - # End Source File - # Begin Source File - - SOURCE=.\quakeio.c - # End Source File - # Begin Source File - - SOURCE=.\r_clip.c - # End Source File - # Begin Source File - - SOURCE=.\r_crosshairs.c - # End Source File - # Begin Source File - - SOURCE=.\r_explosion.c - # End Source File - # Begin Source File - - SOURCE=.\r_lerpanim.c - # End Source File - # Begin Source File - - SOURCE=.\r_light.c - # End Source File - # Begin Source File - - SOURCE=.\r_modules.c - # End Source File - # Begin Source File - - SOURCE=.\r_sky.c - # End Source File - # Begin Source File - - SOURCE=.\r_sprites.c - # End Source File - # Begin Source File - - SOURCE=.\sbar.c - # End Source File - # Begin Source File - - SOURCE=.\snd_dma.c - # End Source File - # Begin Source File - - SOURCE=.\snd_mem.c - # End Source File - # Begin Source File - - SOURCE=.\snd_mix.c - # End Source File - # Begin Source File - - SOURCE=.\snd_win.c - # End Source File - # Begin Source File - - SOURCE=.\sv_light.c - # End Source File - # Begin Source File - - SOURCE=.\sv_main.c - # End Source File - # Begin Source File - - SOURCE=.\sv_move.c - # End Source File - # Begin Source File - - SOURCE=.\sv_phys.c - # End Source File - # Begin Source File - - SOURCE=.\sv_user.c - # End Source File - # Begin Source File - - SOURCE=.\sys_shared.c - # End Source File - # Begin Source File - - SOURCE=.\sys_win.c - # End Source File - # Begin Source File - - SOURCE=.\transform.c - # End Source File - # Begin Source File - - SOURCE=.\ui.c - # End Source File - # Begin Source File - - SOURCE=.\vid_shared.c - # End Source File - # Begin Source File - - SOURCE=.\vid_wgl.c - # End Source File - # Begin Source File - - SOURCE=.\view.c - # End Source File - # Begin Source File - - SOURCE=.\wad.c - # End Source File - # Begin Source File - - SOURCE=.\world.c - # End Source File - # Begin Source File - - SOURCE=.\zone.c - # End Source File - # End Group - # Begin Group "Header Files" - - # PROP Default_Filter "h;hpp;hxx;hm;inl" - # Begin Source File - - SOURCE=.\bspfile.h - # End Source File - -# Begin Source File - - +# Begin Source File SOURCE=.\cdaudio.h - # End Source File - # Begin Source File - - SOURCE=.\cg_math.h - # End Source File - # Begin Source File - - SOURCE=.\cgame_api.h - # End Source File - # Begin Source File - - SOURCE=.\cgamevm.h - # End Source File - # Begin Source File - +SOURCE=.\cl_collision.h +# End Source File +# Begin Source File SOURCE=.\cl_light.h - # End Source File - # Begin Source File - - SOURCE=.\cl_screen.h - # End Source File - # Begin Source File - - SOURCE=.\client.h - # End Source File - # Begin Source File - - SOURCE=.\cmd.h - # End Source File - # Begin Source File - +SOURCE=.\collision.h +# End Source File +# Begin Source File SOURCE=.\common.h - # End Source File - # Begin Source File - - SOURCE=.\conproc.h - # End Source File - # Begin Source File - - SOURCE=.\console.h - # End Source File - # Begin Source File - - SOURCE=.\crc.h - # End Source File - # Begin Source File - - SOURCE=.\cvar.h - # End Source File - # Begin Source File - - SOURCE=.\draw.h - # End Source File - # Begin Source File - - SOURCE=.\gl_backend.h - # End Source File - # Begin Source File - - SOURCE=.\gl_warp_sin.h - # End Source File - # Begin Source File - - SOURCE=.\glquake.h - # End Source File - # Begin Source File - - SOURCE=.\image.h - # End Source File - # Begin Source File - - SOURCE=.\input.h - # End Source File - # Begin Source File - - SOURCE=.\keys.h - # End Source File - # Begin Source File - - SOURCE=.\mathlib.h - # End Source File - # Begin Source File - - SOURCE=.\menu.h - # End Source File - # Begin Source File - - SOURCE=.\model_alias.h - # End Source File - # Begin Source File - - SOURCE=.\model_brush.h - # End Source File - # Begin Source File - - SOURCE=.\model_shared.h - # End Source File - # Begin Source File - - SOURCE=.\model_sprite.h - # End Source File - # Begin Source File - - SOURCE=.\model_zymotic.h - # End Source File - # Begin Source File - - SOURCE=.\modelgen.h - # End Source File - # Begin Source File - - SOURCE=.\net.h - # End Source File - # Begin Source File - - SOURCE=.\net_dgrm.h - # End Source File - # Begin Source File - - SOURCE=.\net_loop.h - # End Source File - # Begin Source File - - SOURCE=.\net_wins.h - # End Source File - # Begin Source File - - SOURCE=.\net_wipx.h - # End Source File - # Begin Source File - - SOURCE=.\palette.h - # End Source File - # Begin Source File - - SOURCE=.\portals.h - # End Source File - # Begin Source File - - SOURCE=.\pr_comp.h - # End Source File - # Begin Source File - - SOURCE=.\pr_execprogram.h - # End Source File - # Begin Source File - - SOURCE=.\progdefs.h - # End Source File - # Begin Source File - - SOURCE=.\progs.h - # End Source File - # Begin Source File - - SOURCE=.\protocol.h - # End Source File - # Begin Source File - - SOURCE=.\quakedef.h - # End Source File - # Begin Source File - - SOURCE=.\quakeio.h - # End Source File - # Begin Source File - - SOURCE=.\r_clip.h - # End Source File - # Begin Source File - - SOURCE=.\r_lerpanim.h - # End Source File - # Begin Source File - - SOURCE=.\r_light.h - # End Source File - # Begin Source File - - SOURCE=.\r_modules.h - # End Source File - # Begin Source File - - SOURCE=.\r_textures.h - # End Source File - # Begin Source File - - SOURCE=.\render.h - # End Source File - # Begin Source File - - SOURCE=.\resource.h - # End Source File - # Begin Source File - - SOURCE=.\sbar.h - # End Source File - # Begin Source File - - SOURCE=.\screen.h - # End Source File - # Begin Source File - - SOURCE=.\server.h - # End Source File - # Begin Source File - - SOURCE=.\sound.h - # End Source File - # Begin Source File - - SOURCE=.\spritegn.h - # End Source File - # Begin Source File - - SOURCE=.\sys.h - # End Source File - # Begin Source File - - SOURCE=.\transform.h - # End Source File - # Begin Source File - - SOURCE=.\ui.h - # End Source File - # Begin Source File - - SOURCE=.\vid.h - # End Source File - # Begin Source File - - SOURCE=.\wad.h - # End Source File - # Begin Source File - - SOURCE=.\winquake.h - # End Source File - # Begin Source File - - SOURCE=.\world.h - # End Source File - # Begin Source File - - SOURCE=.\zone.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 - -- 2.39.2