From: bones_was_here Date: Sat, 28 Oct 2023 08:09:32 +0000 (+1000) Subject: Merge PR 'Small fixes (indices out of bounds)' X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=8993ae00c136bff3bd4fd7a873abbe2f744f20a8;hp=6715d712c4b7e2d1366359a99c8a6cbfa50f6262;p=xonotic%2Fdarkplaces.git Merge PR 'Small fixes (indices out of bounds)' See https://github.com/DarkPlacesEngine/darkplaces/pull/92 Signed-off-by: bones_was_here --- diff --git a/.gitignore b/.gitignore index 5ba9ca0f..a1bdf5c0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ obj/ *.o *.i *.s +*.obj +*.tlog ChangeLog darkplaces-agl darkplaces-glx diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/bih.obj b/Debug-darkplaces-sdl2-vs2019-Win32/bih.obj deleted file mode 100644 index 9e4b5c4a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/bih.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/builddate.obj b/Debug-darkplaces-sdl2-vs2019-Win32/builddate.obj deleted file mode 100644 index e6840967..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/builddate.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cap_avi.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cap_avi.obj deleted file mode 100644 index 27302412..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cap_avi.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cap_ogg.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cap_ogg.obj deleted file mode 100644 index 35fa1e11..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cap_ogg.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cd_shared.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cd_shared.obj deleted file mode 100644 index 1e95d562..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cd_shared.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_cmd.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_cmd.obj deleted file mode 100644 index f51daa9c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_cmd.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_collision.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_collision.obj deleted file mode 100644 index ab4a551c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_collision.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_demo.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_demo.obj deleted file mode 100644 index 4fba89f3..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_demo.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents.obj deleted file mode 100644 index 0f8f5467..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents4.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents4.obj deleted file mode 100644 index b6b09301..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents4.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents5.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents5.obj deleted file mode 100644 index a9ea1b23..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents5.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents_nq.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents_nq.obj deleted file mode 100644 index 3fc7c7c9..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents_nq.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents_qw.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents_qw.obj deleted file mode 100644 index b0f59b4f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_ents_qw.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_input.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_input.obj deleted file mode 100644 index 122f8859..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_input.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_main.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_main.obj deleted file mode 100644 index 7b5df75f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_main.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_parse.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_parse.obj deleted file mode 100644 index dda63d40..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_parse.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_particles.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_particles.obj deleted file mode 100644 index 4496ab16..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_particles.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_screen.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_screen.obj deleted file mode 100644 index 69690a1b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_screen.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_video.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_video.obj deleted file mode 100644 index d6a492c9..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_video.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cl_video_libavw.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cl_video_libavw.obj deleted file mode 100644 index f910374e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cl_video_libavw.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/clvm_cmds.obj b/Debug-darkplaces-sdl2-vs2019-Win32/clvm_cmds.obj deleted file mode 100644 index f41c4f29..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/clvm_cmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cmd.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cmd.obj deleted file mode 100644 index fbfa4c96..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cmd.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/collision.obj b/Debug-darkplaces-sdl2-vs2019-Win32/collision.obj deleted file mode 100644 index e1ab931c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/collision.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/com_crc16.obj b/Debug-darkplaces-sdl2-vs2019-Win32/com_crc16.obj deleted file mode 100644 index 3b8287d1..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/com_crc16.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/com_ents.obj b/Debug-darkplaces-sdl2-vs2019-Win32/com_ents.obj deleted file mode 100644 index abe1d25a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/com_ents.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/com_ents4.obj b/Debug-darkplaces-sdl2-vs2019-Win32/com_ents4.obj deleted file mode 100644 index 85f9308a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/com_ents4.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/com_game.obj b/Debug-darkplaces-sdl2-vs2019-Win32/com_game.obj deleted file mode 100644 index b6739948..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/com_game.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/com_infostring.obj b/Debug-darkplaces-sdl2-vs2019-Win32/com_infostring.obj deleted file mode 100644 index d8525794..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/com_infostring.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/com_msg.obj b/Debug-darkplaces-sdl2-vs2019-Win32/com_msg.obj deleted file mode 100644 index c5d05ccd..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/com_msg.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/common.obj b/Debug-darkplaces-sdl2-vs2019-Win32/common.obj deleted file mode 100644 index d52183ff..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/common.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/console.obj b/Debug-darkplaces-sdl2-vs2019-Win32/console.obj deleted file mode 100644 index 8ccfadf5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/console.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/crypto.obj b/Debug-darkplaces-sdl2-vs2019-Win32/crypto.obj deleted file mode 100644 index f3de2df5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/crypto.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/csprogs.obj b/Debug-darkplaces-sdl2-vs2019-Win32/csprogs.obj deleted file mode 100644 index 8e757ad8..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/csprogs.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/curves.obj b/Debug-darkplaces-sdl2-vs2019-Win32/curves.obj deleted file mode 100644 index cf3c3be7..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/curves.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/cvar.obj b/Debug-darkplaces-sdl2-vs2019-Win32/cvar.obj deleted file mode 100644 index 82b3236b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/cvar.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/CL.command.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/CL.command.1.tlog deleted file mode 100644 index 651617bd..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/CL.command.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/CL.read.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/CL.read.1.tlog deleted file mode 100644 index 5fb2e19c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/CL.read.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/CL.write.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/CL.write.1.tlog deleted file mode 100644 index 0d7daa37..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/CL.write.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.lastbuildstate b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.lastbuildstate deleted file mode 100644 index 98f50cd6..00000000 --- a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.lastbuildstate +++ /dev/null @@ -1,2 +0,0 @@ -PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30037:VCServicingVersionATL=14.29.30038:VCServicingVersionCrtHeaders=14.29.30040:VCServicingVersionCompilers=14.29.30040:TargetPlatformVersion=10.0.19041.0: -Debug|Win32|C:\Users\havoc\Source\Repos\darkplaces\| diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.write.1u.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.write.1u.tlog deleted file mode 100644 index 4423c087..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.write.1u.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.command.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.command.1.tlog deleted file mode 100644 index f8efc6f7..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.command.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.delete.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.delete.1.tlog deleted file mode 100644 index bd1f5215..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.delete.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.read.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.read.1.tlog deleted file mode 100644 index 17ad702a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.read.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.write.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.write.1.tlog deleted file mode 100644 index bf7540a8..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/link.write.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/rc.command.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/rc.command.1.tlog deleted file mode 100644 index acaa2ff7..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/rc.command.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/rc.read.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/rc.read.1.tlog deleted file mode 100644 index c884522c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/rc.read.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/rc.write.1.tlog b/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/rc.write.1.tlog deleted file mode 100644 index cd41146f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplac.72D93E63.tlog/rc.write.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces-sdl2-vs2019.exe.recipe b/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces-sdl2-vs2019.exe.recipe deleted file mode 100644 index ccf84198..00000000 --- a/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces-sdl2-vs2019.exe.recipe +++ /dev/null @@ -1,11 +0,0 @@ - - - - - C:\Users\havoc\Source\Repos\darkplaces\darkplaces-sdl2-vs2019.exe - - - - - - \ No newline at end of file diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces-sdl2-vs2019.ilk b/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces-sdl2-vs2019.ilk deleted file mode 100644 index c05c3e20..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces-sdl2-vs2019.ilk and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces-sdl2-vs2019.log b/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces-sdl2-vs2019.log deleted file mode 100644 index 5c352d8b..00000000 --- a/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces-sdl2-vs2019.log +++ /dev/null @@ -1 +0,0 @@ - darkplaces-sdl2-vs2019.vcxproj -> C:\Users\havoc\Source\Repos\darkplaces\darkplaces-sdl2-vs2019.exe diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces.res b/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces.res deleted file mode 100644 index 7acb942f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/darkplaces.res and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/dpvsimpledecode.obj b/Debug-darkplaces-sdl2-vs2019-Win32/dpvsimpledecode.obj deleted file mode 100644 index a27f97a6..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/dpvsimpledecode.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/filematch.obj b/Debug-darkplaces-sdl2-vs2019-Win32/filematch.obj deleted file mode 100644 index 21ebf3f0..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/filematch.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/fractalnoise.obj b/Debug-darkplaces-sdl2-vs2019-Win32/fractalnoise.obj deleted file mode 100644 index b910af0b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/fractalnoise.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/fs.obj b/Debug-darkplaces-sdl2-vs2019-Win32/fs.obj deleted file mode 100644 index 7ebfaf17..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/fs.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/ft2.obj b/Debug-darkplaces-sdl2-vs2019-Win32/ft2.obj deleted file mode 100644 index 68c6a19b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/ft2.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/gl_backend.obj b/Debug-darkplaces-sdl2-vs2019-Win32/gl_backend.obj deleted file mode 100644 index a1cfb571..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/gl_backend.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/gl_draw.obj b/Debug-darkplaces-sdl2-vs2019-Win32/gl_draw.obj deleted file mode 100644 index b612180a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/gl_draw.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/gl_rmain.obj b/Debug-darkplaces-sdl2-vs2019-Win32/gl_rmain.obj deleted file mode 100644 index d3a627ef..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/gl_rmain.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/gl_rsurf.obj b/Debug-darkplaces-sdl2-vs2019-Win32/gl_rsurf.obj deleted file mode 100644 index 38ad7da8..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/gl_rsurf.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/gl_textures.obj b/Debug-darkplaces-sdl2-vs2019-Win32/gl_textures.obj deleted file mode 100644 index 61466b2a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/gl_textures.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/hmac.obj b/Debug-darkplaces-sdl2-vs2019-Win32/hmac.obj deleted file mode 100644 index b169de8d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/hmac.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/host.obj b/Debug-darkplaces-sdl2-vs2019-Win32/host.obj deleted file mode 100644 index cd48d1ca..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/host.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/image.obj b/Debug-darkplaces-sdl2-vs2019-Win32/image.obj deleted file mode 100644 index ec30f830..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/image.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/image_png.obj b/Debug-darkplaces-sdl2-vs2019-Win32/image_png.obj deleted file mode 100644 index 3b864cc7..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/image_png.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/jpeg.obj b/Debug-darkplaces-sdl2-vs2019-Win32/jpeg.obj deleted file mode 100644 index 8b68194b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/jpeg.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/keys.obj b/Debug-darkplaces-sdl2-vs2019-Win32/keys.obj deleted file mode 100644 index dadbabec..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/keys.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/lhnet.obj b/Debug-darkplaces-sdl2-vs2019-Win32/lhnet.obj deleted file mode 100644 index c42b0afa..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/lhnet.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/libcurl.obj b/Debug-darkplaces-sdl2-vs2019-Win32/libcurl.obj deleted file mode 100644 index b057354a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/libcurl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/mathlib.obj b/Debug-darkplaces-sdl2-vs2019-Win32/mathlib.obj deleted file mode 100644 index 8a7ca920..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/mathlib.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/matrixlib.obj b/Debug-darkplaces-sdl2-vs2019-Win32/matrixlib.obj deleted file mode 100644 index 18bdeddf..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/matrixlib.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/mdfour.obj b/Debug-darkplaces-sdl2-vs2019-Win32/mdfour.obj deleted file mode 100644 index d1c1469a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/mdfour.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/menu.obj b/Debug-darkplaces-sdl2-vs2019-Win32/menu.obj deleted file mode 100644 index fd579903..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/menu.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/meshqueue.obj b/Debug-darkplaces-sdl2-vs2019-Win32/meshqueue.obj deleted file mode 100644 index 0b654d1f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/meshqueue.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/mod_skeletal_animatevertices_generic.obj b/Debug-darkplaces-sdl2-vs2019-Win32/mod_skeletal_animatevertices_generic.obj deleted file mode 100644 index 299bd3cf..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/mod_skeletal_animatevertices_generic.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/mod_skeletal_animatevertices_sse.obj b/Debug-darkplaces-sdl2-vs2019-Win32/mod_skeletal_animatevertices_sse.obj deleted file mode 100644 index 71cea4bb..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/mod_skeletal_animatevertices_sse.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/model_alias.obj b/Debug-darkplaces-sdl2-vs2019-Win32/model_alias.obj deleted file mode 100644 index 544c14d2..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/model_alias.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/model_brush.obj b/Debug-darkplaces-sdl2-vs2019-Win32/model_brush.obj deleted file mode 100644 index a1b73955..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/model_brush.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/model_shared.obj b/Debug-darkplaces-sdl2-vs2019-Win32/model_shared.obj deleted file mode 100644 index 03c0624d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/model_shared.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/model_sprite.obj b/Debug-darkplaces-sdl2-vs2019-Win32/model_sprite.obj deleted file mode 100644 index ef3e6492..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/model_sprite.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/mvm_cmds.obj b/Debug-darkplaces-sdl2-vs2019-Win32/mvm_cmds.obj deleted file mode 100644 index 5cc387dc..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/mvm_cmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/netconn.obj b/Debug-darkplaces-sdl2-vs2019-Win32/netconn.obj deleted file mode 100644 index 89e3db12..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/netconn.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/palette.obj b/Debug-darkplaces-sdl2-vs2019-Win32/palette.obj deleted file mode 100644 index 05cbc082..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/palette.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/polygon.obj b/Debug-darkplaces-sdl2-vs2019-Win32/polygon.obj deleted file mode 100644 index 921bfbc4..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/polygon.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/portals.obj b/Debug-darkplaces-sdl2-vs2019-Win32/portals.obj deleted file mode 100644 index 6db192e5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/portals.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/protocol.obj b/Debug-darkplaces-sdl2-vs2019-Win32/protocol.obj deleted file mode 100644 index 3ba23351..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/protocol.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/prvm_cmds.obj b/Debug-darkplaces-sdl2-vs2019-Win32/prvm_cmds.obj deleted file mode 100644 index 13956c01..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/prvm_cmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/prvm_edict.obj b/Debug-darkplaces-sdl2-vs2019-Win32/prvm_edict.obj deleted file mode 100644 index 869f461e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/prvm_edict.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/prvm_exec.obj b/Debug-darkplaces-sdl2-vs2019-Win32/prvm_exec.obj deleted file mode 100644 index adc53215..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/prvm_exec.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/r_explosion.obj b/Debug-darkplaces-sdl2-vs2019-Win32/r_explosion.obj deleted file mode 100644 index 55c2dda3..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/r_explosion.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/r_lightning.obj b/Debug-darkplaces-sdl2-vs2019-Win32/r_lightning.obj deleted file mode 100644 index 638fd942..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/r_lightning.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/r_modules.obj b/Debug-darkplaces-sdl2-vs2019-Win32/r_modules.obj deleted file mode 100644 index 0505644b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/r_modules.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/r_shadow.obj b/Debug-darkplaces-sdl2-vs2019-Win32/r_shadow.obj deleted file mode 100644 index 30d70b87..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/r_shadow.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/r_sky.obj b/Debug-darkplaces-sdl2-vs2019-Win32/r_sky.obj deleted file mode 100644 index 0a11c100..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/r_sky.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/r_sprites.obj b/Debug-darkplaces-sdl2-vs2019-Win32/r_sprites.obj deleted file mode 100644 index 47da32d4..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/r_sprites.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/r_stats.obj b/Debug-darkplaces-sdl2-vs2019-Win32/r_stats.obj deleted file mode 100644 index 659e948c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/r_stats.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sbar.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sbar.obj deleted file mode 100644 index 731886ac..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sbar.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/snd_main.obj b/Debug-darkplaces-sdl2-vs2019-Win32/snd_main.obj deleted file mode 100644 index 1ce0ba1e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/snd_main.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/snd_mem.obj b/Debug-darkplaces-sdl2-vs2019-Win32/snd_mem.obj deleted file mode 100644 index 4ab9fb98..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/snd_mem.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/snd_mix.obj b/Debug-darkplaces-sdl2-vs2019-Win32/snd_mix.obj deleted file mode 100644 index d66d2b8e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/snd_mix.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/snd_ogg.obj b/Debug-darkplaces-sdl2-vs2019-Win32/snd_ogg.obj deleted file mode 100644 index 9e9acc36..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/snd_ogg.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/snd_sdl.obj b/Debug-darkplaces-sdl2-vs2019-Win32/snd_sdl.obj deleted file mode 100644 index 80ed3137..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/snd_sdl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/snd_wav.obj b/Debug-darkplaces-sdl2-vs2019-Win32/snd_wav.obj deleted file mode 100644 index 0f3c7cc1..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/snd_wav.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/snd_xmp.obj b/Debug-darkplaces-sdl2-vs2019-Win32/snd_xmp.obj deleted file mode 100644 index d05200be..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/snd_xmp.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ccmds.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_ccmds.obj deleted file mode 100644 index 01020c40..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ccmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_demo.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_demo.obj deleted file mode 100644 index eef0c077..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_demo.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents.obj deleted file mode 100644 index 6e63e76d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents4.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents4.obj deleted file mode 100644 index 550ba35e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents4.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents5.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents5.obj deleted file mode 100644 index a067c9cb..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents5.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents_csqc.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents_csqc.obj deleted file mode 100644 index a2d407e6..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents_csqc.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents_nq.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents_nq.obj deleted file mode 100644 index dd677848..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_ents_nq.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_main.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_main.obj deleted file mode 100644 index 82e633a6..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_main.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_move.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_move.obj deleted file mode 100644 index 69b9ab0d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_move.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_phys.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_phys.obj deleted file mode 100644 index 12140a82..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_phys.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_save.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_save.obj deleted file mode 100644 index c0a891b5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_save.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_send.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_send.obj deleted file mode 100644 index 6eead26c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_send.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sv_user.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sv_user.obj deleted file mode 100644 index 617489d1..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sv_user.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/svbsp.obj b/Debug-darkplaces-sdl2-vs2019-Win32/svbsp.obj deleted file mode 100644 index 3acb1b80..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/svbsp.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/svvm_cmds.obj b/Debug-darkplaces-sdl2-vs2019-Win32/svvm_cmds.obj deleted file mode 100644 index 63685c21..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/svvm_cmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sys_sdl.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sys_sdl.obj deleted file mode 100644 index f3f4e99c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sys_sdl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/sys_shared.obj b/Debug-darkplaces-sdl2-vs2019-Win32/sys_shared.obj deleted file mode 100644 index 1a62db03..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/sys_shared.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/taskqueue.obj b/Debug-darkplaces-sdl2-vs2019-Win32/taskqueue.obj deleted file mode 100644 index 0c2fb2e0..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/taskqueue.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/thread_sdl.obj b/Debug-darkplaces-sdl2-vs2019-Win32/thread_sdl.obj deleted file mode 100644 index 8fa09250..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/thread_sdl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/utf8lib.obj b/Debug-darkplaces-sdl2-vs2019-Win32/utf8lib.obj deleted file mode 100644 index d85aa4b8..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/utf8lib.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/vc142.idb b/Debug-darkplaces-sdl2-vs2019-Win32/vc142.idb deleted file mode 100644 index f5a1038e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/vc142.idb and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/vid_sdl.obj b/Debug-darkplaces-sdl2-vs2019-Win32/vid_sdl.obj deleted file mode 100644 index 2bed0169..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/vid_sdl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/vid_shared.obj b/Debug-darkplaces-sdl2-vs2019-Win32/vid_shared.obj deleted file mode 100644 index d28ccb0b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/vid_shared.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/view.obj b/Debug-darkplaces-sdl2-vs2019-Win32/view.obj deleted file mode 100644 index 2d108c79..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/view.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/wad.obj b/Debug-darkplaces-sdl2-vs2019-Win32/wad.obj deleted file mode 100644 index fad3368e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/wad.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/world.obj b/Debug-darkplaces-sdl2-vs2019-Win32/world.obj deleted file mode 100644 index eecae09c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/world.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-Win32/zone.obj b/Debug-darkplaces-sdl2-vs2019-Win32/zone.obj deleted file mode 100644 index c49afab4..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-Win32/zone.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/bih.obj b/Debug-darkplaces-sdl2-vs2019-x64/bih.obj deleted file mode 100644 index 7186689e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/bih.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/builddate.obj b/Debug-darkplaces-sdl2-vs2019-x64/builddate.obj deleted file mode 100644 index 330d930e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/builddate.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cap_avi.obj b/Debug-darkplaces-sdl2-vs2019-x64/cap_avi.obj deleted file mode 100644 index 1e4d17d5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cap_avi.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cap_ogg.obj b/Debug-darkplaces-sdl2-vs2019-x64/cap_ogg.obj deleted file mode 100644 index 70259dcd..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cap_ogg.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cd_shared.obj b/Debug-darkplaces-sdl2-vs2019-x64/cd_shared.obj deleted file mode 100644 index 832fd96e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cd_shared.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_cmd.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_cmd.obj deleted file mode 100644 index fbacda84..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_cmd.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_collision.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_collision.obj deleted file mode 100644 index 38572b1e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_collision.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_demo.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_demo.obj deleted file mode 100644 index 571ca0b0..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_demo.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_ents.obj deleted file mode 100644 index ebbac5ee..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents4.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_ents4.obj deleted file mode 100644 index 7d8a6a81..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents4.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents5.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_ents5.obj deleted file mode 100644 index c5c39b21..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents5.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents_nq.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_ents_nq.obj deleted file mode 100644 index 99584cee..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents_nq.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents_qw.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_ents_qw.obj deleted file mode 100644 index 3af72d13..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_ents_qw.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_input.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_input.obj deleted file mode 100644 index 7c54cb60..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_input.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_main.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_main.obj deleted file mode 100644 index 4645a1eb..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_main.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_parse.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_parse.obj deleted file mode 100644 index 35661336..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_parse.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_particles.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_particles.obj deleted file mode 100644 index 243f091f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_particles.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_screen.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_screen.obj deleted file mode 100644 index d486cf8c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_screen.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_video.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_video.obj deleted file mode 100644 index d2251065..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_video.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cl_video_libavw.obj b/Debug-darkplaces-sdl2-vs2019-x64/cl_video_libavw.obj deleted file mode 100644 index 91c5dcfb..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cl_video_libavw.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/clvm_cmds.obj b/Debug-darkplaces-sdl2-vs2019-x64/clvm_cmds.obj deleted file mode 100644 index b607896e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/clvm_cmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cmd.obj b/Debug-darkplaces-sdl2-vs2019-x64/cmd.obj deleted file mode 100644 index 98819325..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cmd.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/collision.obj b/Debug-darkplaces-sdl2-vs2019-x64/collision.obj deleted file mode 100644 index c3620d9c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/collision.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/com_crc16.obj b/Debug-darkplaces-sdl2-vs2019-x64/com_crc16.obj deleted file mode 100644 index dda60e56..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/com_crc16.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/com_ents.obj b/Debug-darkplaces-sdl2-vs2019-x64/com_ents.obj deleted file mode 100644 index 6616e8d5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/com_ents.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/com_ents4.obj b/Debug-darkplaces-sdl2-vs2019-x64/com_ents4.obj deleted file mode 100644 index 210b816e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/com_ents4.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/com_game.obj b/Debug-darkplaces-sdl2-vs2019-x64/com_game.obj deleted file mode 100644 index b6436ebe..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/com_game.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/com_infostring.obj b/Debug-darkplaces-sdl2-vs2019-x64/com_infostring.obj deleted file mode 100644 index dffd1560..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/com_infostring.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/com_msg.obj b/Debug-darkplaces-sdl2-vs2019-x64/com_msg.obj deleted file mode 100644 index e0d54331..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/com_msg.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/common.obj b/Debug-darkplaces-sdl2-vs2019-x64/common.obj deleted file mode 100644 index 287766ea..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/common.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/console.obj b/Debug-darkplaces-sdl2-vs2019-x64/console.obj deleted file mode 100644 index acd991cc..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/console.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/convex.obj b/Debug-darkplaces-sdl2-vs2019-x64/convex.obj deleted file mode 100644 index 00e9fe23..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/convex.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/crypto.obj b/Debug-darkplaces-sdl2-vs2019-x64/crypto.obj deleted file mode 100644 index 5da19e94..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/crypto.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/csprogs.obj b/Debug-darkplaces-sdl2-vs2019-x64/csprogs.obj deleted file mode 100644 index 8f56d797..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/csprogs.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/curves.obj b/Debug-darkplaces-sdl2-vs2019-x64/curves.obj deleted file mode 100644 index fbd7ebeb..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/curves.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/cvar.obj b/Debug-darkplaces-sdl2-vs2019-x64/cvar.obj deleted file mode 100644 index 3af84004..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/cvar.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.command.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.command.1.tlog deleted file mode 100644 index 41d0569d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.command.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.read.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.read.1.tlog deleted file mode 100644 index d08af70f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.read.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.write.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.write.1.tlog deleted file mode 100644 index 36a48d60..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.write.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.lastbuildstate b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.lastbuildstate deleted file mode 100644 index e7aa3fac..00000000 --- a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.lastbuildstate +++ /dev/null @@ -1,2 +0,0 @@ -PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30037:VCServicingVersionATL=14.29.30038:VCServicingVersionCrtHeaders=14.29.30040:VCServicingVersionCompilers=14.29.30040:TargetPlatformVersion=10.0.19041.0: -Debug|x64|C:\Users\havoc\Source\Repos\darkplaces\| diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.write.1u.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.write.1u.tlog deleted file mode 100644 index a188496d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.write.1u.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.command.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.command.1.tlog deleted file mode 100644 index 57f0ef7a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.command.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.delete.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.delete.1.tlog deleted file mode 100644 index a0288926..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.delete.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.read.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.read.1.tlog deleted file mode 100644 index 0d87ae6a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.read.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.write.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.write.1.tlog deleted file mode 100644 index 6185f7b5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.write.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.command.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.command.1.tlog deleted file mode 100644 index 6bccddf2..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.command.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.read.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.read.1.tlog deleted file mode 100644 index c884522c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.read.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.write.1.tlog b/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.write.1.tlog deleted file mode 100644 index aa0d88aa..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.write.1.tlog and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.exe.recipe b/Debug-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.exe.recipe deleted file mode 100644 index ccf84198..00000000 --- a/Debug-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.exe.recipe +++ /dev/null @@ -1,11 +0,0 @@ - - - - - C:\Users\havoc\Source\Repos\darkplaces\darkplaces-sdl2-vs2019.exe - - - - - - \ No newline at end of file diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.ilk b/Debug-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.ilk deleted file mode 100644 index 72e16813..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.ilk and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.log b/Debug-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.log deleted file mode 100644 index 766d5cda..00000000 --- a/Debug-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.log +++ /dev/null @@ -1,3 +0,0 @@ -cl : command line warning D9035: option 'Gm' has been deprecated and will be removed in a future release - convex.c - darkplaces-sdl2-vs2019.vcxproj -> C:\Users\havoc\Source\Repos\darkplaces\darkplaces-sdl2-vs2019.exe diff --git a/Debug-darkplaces-sdl2-vs2019-x64/darkplaces.res b/Debug-darkplaces-sdl2-vs2019-x64/darkplaces.res deleted file mode 100644 index 7acb942f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/darkplaces.res and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/dpvsimpledecode.obj b/Debug-darkplaces-sdl2-vs2019-x64/dpvsimpledecode.obj deleted file mode 100644 index 5e9b5925..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/dpvsimpledecode.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/filematch.obj b/Debug-darkplaces-sdl2-vs2019-x64/filematch.obj deleted file mode 100644 index bdaf9f61..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/filematch.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/fractalnoise.obj b/Debug-darkplaces-sdl2-vs2019-x64/fractalnoise.obj deleted file mode 100644 index b804b8fd..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/fractalnoise.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/fs.obj b/Debug-darkplaces-sdl2-vs2019-x64/fs.obj deleted file mode 100644 index aa6eb731..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/fs.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/ft2.obj b/Debug-darkplaces-sdl2-vs2019-x64/ft2.obj deleted file mode 100644 index e6fb76ff..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/ft2.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/gl_backend.obj b/Debug-darkplaces-sdl2-vs2019-x64/gl_backend.obj deleted file mode 100644 index a379b102..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/gl_backend.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/gl_draw.obj b/Debug-darkplaces-sdl2-vs2019-x64/gl_draw.obj deleted file mode 100644 index 6fc5eabe..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/gl_draw.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/gl_rmain.obj b/Debug-darkplaces-sdl2-vs2019-x64/gl_rmain.obj deleted file mode 100644 index 9196638d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/gl_rmain.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/gl_rsurf.obj b/Debug-darkplaces-sdl2-vs2019-x64/gl_rsurf.obj deleted file mode 100644 index 83e6b58e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/gl_rsurf.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/gl_textures.obj b/Debug-darkplaces-sdl2-vs2019-x64/gl_textures.obj deleted file mode 100644 index 9a48935a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/gl_textures.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/hmac.obj b/Debug-darkplaces-sdl2-vs2019-x64/hmac.obj deleted file mode 100644 index 6747633f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/hmac.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/host.obj b/Debug-darkplaces-sdl2-vs2019-x64/host.obj deleted file mode 100644 index d18bf8a6..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/host.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/image.obj b/Debug-darkplaces-sdl2-vs2019-x64/image.obj deleted file mode 100644 index ec30cea2..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/image.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/image_png.obj b/Debug-darkplaces-sdl2-vs2019-x64/image_png.obj deleted file mode 100644 index 3cec3e7c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/image_png.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/jpeg.obj b/Debug-darkplaces-sdl2-vs2019-x64/jpeg.obj deleted file mode 100644 index 1f3ad4ce..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/jpeg.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/keys.obj b/Debug-darkplaces-sdl2-vs2019-x64/keys.obj deleted file mode 100644 index b5477609..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/keys.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/lhnet.obj b/Debug-darkplaces-sdl2-vs2019-x64/lhnet.obj deleted file mode 100644 index bc2b74d7..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/lhnet.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/libcurl.obj b/Debug-darkplaces-sdl2-vs2019-x64/libcurl.obj deleted file mode 100644 index 52b26f41..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/libcurl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/mathlib.obj b/Debug-darkplaces-sdl2-vs2019-x64/mathlib.obj deleted file mode 100644 index ac17fda9..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/mathlib.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/matrixlib.obj b/Debug-darkplaces-sdl2-vs2019-x64/matrixlib.obj deleted file mode 100644 index 9b868182..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/matrixlib.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/mdfour.obj b/Debug-darkplaces-sdl2-vs2019-x64/mdfour.obj deleted file mode 100644 index abfb3aba..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/mdfour.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/menu.obj b/Debug-darkplaces-sdl2-vs2019-x64/menu.obj deleted file mode 100644 index 2122e001..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/menu.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/meshqueue.obj b/Debug-darkplaces-sdl2-vs2019-x64/meshqueue.obj deleted file mode 100644 index 5bfeed6d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/meshqueue.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_generic.obj b/Debug-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_generic.obj deleted file mode 100644 index 878a0c0b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_generic.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_sse.obj b/Debug-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_sse.obj deleted file mode 100644 index f4457c2d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_sse.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/model_alias.obj b/Debug-darkplaces-sdl2-vs2019-x64/model_alias.obj deleted file mode 100644 index 823794bc..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/model_alias.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/model_brush.obj b/Debug-darkplaces-sdl2-vs2019-x64/model_brush.obj deleted file mode 100644 index 54268671..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/model_brush.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/model_shared.obj b/Debug-darkplaces-sdl2-vs2019-x64/model_shared.obj deleted file mode 100644 index 32b0b8f7..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/model_shared.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/model_sprite.obj b/Debug-darkplaces-sdl2-vs2019-x64/model_sprite.obj deleted file mode 100644 index 23c2e90a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/model_sprite.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/mvm_cmds.obj b/Debug-darkplaces-sdl2-vs2019-x64/mvm_cmds.obj deleted file mode 100644 index 0a9da69e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/mvm_cmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/netconn.obj b/Debug-darkplaces-sdl2-vs2019-x64/netconn.obj deleted file mode 100644 index 4e174674..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/netconn.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/palette.obj b/Debug-darkplaces-sdl2-vs2019-x64/palette.obj deleted file mode 100644 index d7a8b2f8..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/palette.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/polygon.obj b/Debug-darkplaces-sdl2-vs2019-x64/polygon.obj deleted file mode 100644 index 892f33a5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/polygon.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/portals.obj b/Debug-darkplaces-sdl2-vs2019-x64/portals.obj deleted file mode 100644 index a2dc036a..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/portals.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/protocol.obj b/Debug-darkplaces-sdl2-vs2019-x64/protocol.obj deleted file mode 100644 index d7993156..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/protocol.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/prvm_cmds.obj b/Debug-darkplaces-sdl2-vs2019-x64/prvm_cmds.obj deleted file mode 100644 index c76ba972..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/prvm_cmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/prvm_edict.obj b/Debug-darkplaces-sdl2-vs2019-x64/prvm_edict.obj deleted file mode 100644 index 1a180c5d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/prvm_edict.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/prvm_exec.obj b/Debug-darkplaces-sdl2-vs2019-x64/prvm_exec.obj deleted file mode 100644 index 4f41f272..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/prvm_exec.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/r_explosion.obj b/Debug-darkplaces-sdl2-vs2019-x64/r_explosion.obj deleted file mode 100644 index aaf07a2e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/r_explosion.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/r_lightning.obj b/Debug-darkplaces-sdl2-vs2019-x64/r_lightning.obj deleted file mode 100644 index fb557e27..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/r_lightning.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/r_modules.obj b/Debug-darkplaces-sdl2-vs2019-x64/r_modules.obj deleted file mode 100644 index 4051baeb..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/r_modules.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/r_shadow.obj b/Debug-darkplaces-sdl2-vs2019-x64/r_shadow.obj deleted file mode 100644 index 4746368e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/r_shadow.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/r_sky.obj b/Debug-darkplaces-sdl2-vs2019-x64/r_sky.obj deleted file mode 100644 index 2f3e5155..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/r_sky.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/r_sprites.obj b/Debug-darkplaces-sdl2-vs2019-x64/r_sprites.obj deleted file mode 100644 index d2865242..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/r_sprites.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/r_stats.obj b/Debug-darkplaces-sdl2-vs2019-x64/r_stats.obj deleted file mode 100644 index d0eb54e4..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/r_stats.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sbar.obj b/Debug-darkplaces-sdl2-vs2019-x64/sbar.obj deleted file mode 100644 index 6103f0be..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sbar.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/snd_main.obj b/Debug-darkplaces-sdl2-vs2019-x64/snd_main.obj deleted file mode 100644 index fb789c41..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/snd_main.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/snd_mem.obj b/Debug-darkplaces-sdl2-vs2019-x64/snd_mem.obj deleted file mode 100644 index e5163f9c..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/snd_mem.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/snd_mix.obj b/Debug-darkplaces-sdl2-vs2019-x64/snd_mix.obj deleted file mode 100644 index 5d9cb893..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/snd_mix.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/snd_ogg.obj b/Debug-darkplaces-sdl2-vs2019-x64/snd_ogg.obj deleted file mode 100644 index 07aabab2..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/snd_ogg.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/snd_sdl.obj b/Debug-darkplaces-sdl2-vs2019-x64/snd_sdl.obj deleted file mode 100644 index 69ff84ab..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/snd_sdl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/snd_wav.obj b/Debug-darkplaces-sdl2-vs2019-x64/snd_wav.obj deleted file mode 100644 index 067ada8b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/snd_wav.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/snd_xmp.obj b/Debug-darkplaces-sdl2-vs2019-x64/snd_xmp.obj deleted file mode 100644 index 1610b235..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/snd_xmp.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_ccmds.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_ccmds.obj deleted file mode 100644 index 7ded1bb9..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_ccmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_demo.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_demo.obj deleted file mode 100644 index ad5b602f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_demo.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_ents.obj deleted file mode 100644 index 210abd18..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents4.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_ents4.obj deleted file mode 100644 index fad4539d..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents4.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents5.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_ents5.obj deleted file mode 100644 index 9a98d5d5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents5.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents_csqc.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_ents_csqc.obj deleted file mode 100644 index f2ffa12b..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents_csqc.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents_nq.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_ents_nq.obj deleted file mode 100644 index 321a7715..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_ents_nq.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_main.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_main.obj deleted file mode 100644 index 0029348f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_main.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_move.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_move.obj deleted file mode 100644 index bc0b9ee5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_move.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_phys.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_phys.obj deleted file mode 100644 index c02dc580..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_phys.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_save.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_save.obj deleted file mode 100644 index e410a7da..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_save.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_send.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_send.obj deleted file mode 100644 index 18905e25..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_send.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sv_user.obj b/Debug-darkplaces-sdl2-vs2019-x64/sv_user.obj deleted file mode 100644 index 9e7a6168..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sv_user.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/svbsp.obj b/Debug-darkplaces-sdl2-vs2019-x64/svbsp.obj deleted file mode 100644 index e1b39734..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/svbsp.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/svvm_cmds.obj b/Debug-darkplaces-sdl2-vs2019-x64/svvm_cmds.obj deleted file mode 100644 index c1774621..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/svvm_cmds.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sys_sdl.obj b/Debug-darkplaces-sdl2-vs2019-x64/sys_sdl.obj deleted file mode 100644 index cf9e963e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sys_sdl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/sys_shared.obj b/Debug-darkplaces-sdl2-vs2019-x64/sys_shared.obj deleted file mode 100644 index 35f0d32e..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/sys_shared.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/taskqueue.obj b/Debug-darkplaces-sdl2-vs2019-x64/taskqueue.obj deleted file mode 100644 index e6abbaa2..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/taskqueue.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/thread_sdl.obj b/Debug-darkplaces-sdl2-vs2019-x64/thread_sdl.obj deleted file mode 100644 index 6e6a6cf5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/thread_sdl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/utf8lib.obj b/Debug-darkplaces-sdl2-vs2019-x64/utf8lib.obj deleted file mode 100644 index ac4f030f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/utf8lib.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/vc142.idb b/Debug-darkplaces-sdl2-vs2019-x64/vc142.idb deleted file mode 100644 index b2d29e8f..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/vc142.idb and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/vid_sdl.obj b/Debug-darkplaces-sdl2-vs2019-x64/vid_sdl.obj deleted file mode 100644 index 0203e5a3..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/vid_sdl.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/vid_shared.obj b/Debug-darkplaces-sdl2-vs2019-x64/vid_shared.obj deleted file mode 100644 index df73fe31..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/vid_shared.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/view.obj b/Debug-darkplaces-sdl2-vs2019-x64/view.obj deleted file mode 100644 index e5202d93..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/view.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/wad.obj b/Debug-darkplaces-sdl2-vs2019-x64/wad.obj deleted file mode 100644 index 5cddd1a5..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/wad.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/world.obj b/Debug-darkplaces-sdl2-vs2019-x64/world.obj deleted file mode 100644 index 6b4413b8..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/world.obj and /dev/null differ diff --git a/Debug-darkplaces-sdl2-vs2019-x64/zone.obj b/Debug-darkplaces-sdl2-vs2019-x64/zone.obj deleted file mode 100644 index 22a667b4..00000000 Binary files a/Debug-darkplaces-sdl2-vs2019-x64/zone.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/bih.obj b/Release-darkplaces-sdl2-vs2019-x64/bih.obj deleted file mode 100644 index 0a96a81e..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/bih.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/builddate.obj b/Release-darkplaces-sdl2-vs2019-x64/builddate.obj deleted file mode 100644 index 77bb7e45..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/builddate.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cap_avi.obj b/Release-darkplaces-sdl2-vs2019-x64/cap_avi.obj deleted file mode 100644 index 46c1b073..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cap_avi.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cap_ogg.obj b/Release-darkplaces-sdl2-vs2019-x64/cap_ogg.obj deleted file mode 100644 index 097a682d..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cap_ogg.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cd_shared.obj b/Release-darkplaces-sdl2-vs2019-x64/cd_shared.obj deleted file mode 100644 index f23ad600..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cd_shared.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_cmd.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_cmd.obj deleted file mode 100644 index d2cab89c..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_cmd.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_collision.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_collision.obj deleted file mode 100644 index 5d491218..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_collision.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_demo.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_demo.obj deleted file mode 100644 index c1ee7f9a..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_demo.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_ents.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_ents.obj deleted file mode 100644 index ab4885f4..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_ents.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_ents4.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_ents4.obj deleted file mode 100644 index c6821388..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_ents4.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_ents5.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_ents5.obj deleted file mode 100644 index 877c66ba..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_ents5.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_ents_nq.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_ents_nq.obj deleted file mode 100644 index adab19a5..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_ents_nq.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_ents_qw.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_ents_qw.obj deleted file mode 100644 index bfd91d09..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_ents_qw.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_input.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_input.obj deleted file mode 100644 index d0934c60..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_input.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_main.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_main.obj deleted file mode 100644 index ff4cfadf..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_main.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_parse.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_parse.obj deleted file mode 100644 index bede44a6..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_parse.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_particles.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_particles.obj deleted file mode 100644 index fe1fbd3b..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_particles.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_screen.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_screen.obj deleted file mode 100644 index 95519aa3..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_screen.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_video.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_video.obj deleted file mode 100644 index 14928b86..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_video.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cl_video_libavw.obj b/Release-darkplaces-sdl2-vs2019-x64/cl_video_libavw.obj deleted file mode 100644 index c405a45a..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cl_video_libavw.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/clvm_cmds.obj b/Release-darkplaces-sdl2-vs2019-x64/clvm_cmds.obj deleted file mode 100644 index c8a203b4..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/clvm_cmds.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cmd.obj b/Release-darkplaces-sdl2-vs2019-x64/cmd.obj deleted file mode 100644 index 5a854872..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cmd.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/collision.obj b/Release-darkplaces-sdl2-vs2019-x64/collision.obj deleted file mode 100644 index 80dcf45e..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/collision.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/com_crc16.obj b/Release-darkplaces-sdl2-vs2019-x64/com_crc16.obj deleted file mode 100644 index 41dd5025..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/com_crc16.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/com_ents.obj b/Release-darkplaces-sdl2-vs2019-x64/com_ents.obj deleted file mode 100644 index 9404043f..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/com_ents.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/com_ents4.obj b/Release-darkplaces-sdl2-vs2019-x64/com_ents4.obj deleted file mode 100644 index a5bfd9b0..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/com_ents4.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/com_game.obj b/Release-darkplaces-sdl2-vs2019-x64/com_game.obj deleted file mode 100644 index b34625ce..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/com_game.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/com_infostring.obj b/Release-darkplaces-sdl2-vs2019-x64/com_infostring.obj deleted file mode 100644 index bb2e10eb..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/com_infostring.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/com_msg.obj b/Release-darkplaces-sdl2-vs2019-x64/com_msg.obj deleted file mode 100644 index d3189fb9..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/com_msg.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/common.obj b/Release-darkplaces-sdl2-vs2019-x64/common.obj deleted file mode 100644 index b996d513..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/common.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/console.obj b/Release-darkplaces-sdl2-vs2019-x64/console.obj deleted file mode 100644 index 30781a60..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/console.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/crypto.obj b/Release-darkplaces-sdl2-vs2019-x64/crypto.obj deleted file mode 100644 index d326df4f..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/crypto.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/csprogs.obj b/Release-darkplaces-sdl2-vs2019-x64/csprogs.obj deleted file mode 100644 index 9dd04ea7..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/csprogs.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/curves.obj b/Release-darkplaces-sdl2-vs2019-x64/curves.obj deleted file mode 100644 index 9a988cec..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/curves.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/cvar.obj b/Release-darkplaces-sdl2-vs2019-x64/cvar.obj deleted file mode 100644 index c48ce3c1..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/cvar.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.command.1.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.command.1.tlog deleted file mode 100644 index 5e611ef0..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.command.1.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.read.1.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.read.1.tlog deleted file mode 100644 index b19043aa..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.read.1.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.write.1.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.write.1.tlog deleted file mode 100644 index 8e63adda..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/CL.write.1.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.lastbuildstate b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.lastbuildstate deleted file mode 100644 index 619767bb..00000000 --- a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.lastbuildstate +++ /dev/null @@ -1,2 +0,0 @@ -PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30037:VCServicingVersionATL=14.29.30038:VCServicingVersionCrtHeaders=14.29.30040:VCServicingVersionCompilers=14.29.30040:TargetPlatformVersion=10.0.19041.0: -Release|x64|C:\Users\havoc\Source\Repos\darkplaces\| diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.write.1u.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.write.1u.tlog deleted file mode 100644 index 85af4721..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/darkplaces-sdl2-vs2019.write.1u.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.command.1.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.command.1.tlog deleted file mode 100644 index e4393979..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.command.1.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.read.1.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.read.1.tlog deleted file mode 100644 index 61c05fd4..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.read.1.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.write.1.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.write.1.tlog deleted file mode 100644 index 8ffa36b0..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/link.write.1.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.command.1.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.command.1.tlog deleted file mode 100644 index 5b771758..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.command.1.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.read.1.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.read.1.tlog deleted file mode 100644 index c884522c..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.read.1.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.write.1.tlog b/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.write.1.tlog deleted file mode 100644 index 17e6962c..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplac.72D93E63.tlog/rc.write.1.tlog and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.exe.recipe b/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.exe.recipe deleted file mode 100644 index ccf84198..00000000 --- a/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.exe.recipe +++ /dev/null @@ -1,11 +0,0 @@ - - - - - C:\Users\havoc\Source\Repos\darkplaces\darkplaces-sdl2-vs2019.exe - - - - - - \ No newline at end of file diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.iobj b/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.iobj deleted file mode 100644 index d912d008..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.iobj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.ipdb b/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.ipdb deleted file mode 100644 index 6f878efb..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.ipdb and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.log b/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.log deleted file mode 100644 index 931d450a..00000000 --- a/Release-darkplaces-sdl2-vs2019-x64/darkplaces-sdl2-vs2019.log +++ /dev/null @@ -1,120 +0,0 @@ - bih.c - builddate.c - cap_avi.c - cap_ogg.c - cd_shared.c - cl_cmd.c - cl_collision.c - cl_demo.c - cl_ents.c - cl_ents4.c - cl_ents5.c - cl_ents_nq.c - cl_ents_qw.c - cl_input.c - cl_main.c - cl_parse.c - cl_particles.c - cl_screen.c - cl_video.c - cl_video_libavw.c - clvm_cmds.c - cmd.c - collision.c - com_crc16.c - com_ents.c - com_ents4.c - com_game.c - com_infostring.c - com_msg.c - common.c - console.c - csprogs.c - curves.c - cvar.c - dpvsimpledecode.c - filematch.c - fractalnoise.c - fs.c - ft2.c - gl_backend.c - gl_draw.c - gl_rmain.c - gl_rsurf.c - gl_textures.c - hmac.c - host.c - image.c - image_png.c - jpeg.c - keys.c - lhnet.c - libcurl.c - mathlib.c - matrixlib.c - mdfour.c - menu.c - meshqueue.c - mod_skeletal_animatevertices_generic.c - mod_skeletal_animatevertices_sse.c - model_alias.c - model_brush.c - model_shared.c - model_sprite.c - mvm_cmds.c - netconn.c - palette.c - polygon.c - portals.c - protocol.c - prvm_cmds.c - prvm_edict.c - prvm_exec.c - r_explosion.c - r_lightning.c - r_modules.c - r_shadow.c - r_stats.c - r_sky.c - r_sprites.c - sbar.c - snd_main.c - snd_mem.c - snd_mix.c - snd_ogg.c - snd_sdl.c - snd_wav.c - snd_xmp.c - sv_ccmds.c - sv_demo.c - sv_ents.c - sv_ents4.c - sv_ents5.c - sv_ents_nq.c - sv_ents_csqc.c - sv_main.c - sv_move.c - sv_phys.c - sv_save.c - sv_send.c - sv_user.c - svbsp.c - svvm_cmds.c - sys_sdl.c - sys_shared.c - taskqueue.c - thread_sdl.c - utf8lib.c - vid_sdl.c - vid_shared.c - view.c - wad.c - world.c - zone.c - crypto.c - Creating library C:\Users\havoc\Source\Repos\darkplaces\\darkplaces-sdl2-vs2019.lib and object C:\Users\havoc\Source\Repos\darkplaces\\darkplaces-sdl2-vs2019.exp - Generating code - Previous IPDB not found, fall back to full compilation. - All 3374 functions were compiled because no usable IPDB/IOBJ from previous compilation was found. - Finished generating code - darkplaces-sdl2-vs2019.vcxproj -> C:\Users\havoc\Source\Repos\darkplaces\darkplaces-sdl2-vs2019.exe diff --git a/Release-darkplaces-sdl2-vs2019-x64/darkplaces.res b/Release-darkplaces-sdl2-vs2019-x64/darkplaces.res deleted file mode 100644 index 7acb942f..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/darkplaces.res and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/dpvsimpledecode.obj b/Release-darkplaces-sdl2-vs2019-x64/dpvsimpledecode.obj deleted file mode 100644 index 1ffbfbe0..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/dpvsimpledecode.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/filematch.obj b/Release-darkplaces-sdl2-vs2019-x64/filematch.obj deleted file mode 100644 index 21e8d278..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/filematch.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/fractalnoise.obj b/Release-darkplaces-sdl2-vs2019-x64/fractalnoise.obj deleted file mode 100644 index 1d7205f8..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/fractalnoise.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/fs.obj b/Release-darkplaces-sdl2-vs2019-x64/fs.obj deleted file mode 100644 index a1109654..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/fs.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/ft2.obj b/Release-darkplaces-sdl2-vs2019-x64/ft2.obj deleted file mode 100644 index 0e8cd271..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/ft2.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/gl_backend.obj b/Release-darkplaces-sdl2-vs2019-x64/gl_backend.obj deleted file mode 100644 index c11bc338..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/gl_backend.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/gl_draw.obj b/Release-darkplaces-sdl2-vs2019-x64/gl_draw.obj deleted file mode 100644 index 0a7066d5..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/gl_draw.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/gl_rmain.obj b/Release-darkplaces-sdl2-vs2019-x64/gl_rmain.obj deleted file mode 100644 index 18ad4709..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/gl_rmain.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/gl_rsurf.obj b/Release-darkplaces-sdl2-vs2019-x64/gl_rsurf.obj deleted file mode 100644 index f4809782..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/gl_rsurf.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/gl_textures.obj b/Release-darkplaces-sdl2-vs2019-x64/gl_textures.obj deleted file mode 100644 index e325d952..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/gl_textures.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/hmac.obj b/Release-darkplaces-sdl2-vs2019-x64/hmac.obj deleted file mode 100644 index e5858b50..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/hmac.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/host.obj b/Release-darkplaces-sdl2-vs2019-x64/host.obj deleted file mode 100644 index 18858ad1..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/host.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/image.obj b/Release-darkplaces-sdl2-vs2019-x64/image.obj deleted file mode 100644 index c64a35ce..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/image.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/image_png.obj b/Release-darkplaces-sdl2-vs2019-x64/image_png.obj deleted file mode 100644 index 2e626a42..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/image_png.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/jpeg.obj b/Release-darkplaces-sdl2-vs2019-x64/jpeg.obj deleted file mode 100644 index 2818314e..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/jpeg.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/keys.obj b/Release-darkplaces-sdl2-vs2019-x64/keys.obj deleted file mode 100644 index 2da8e630..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/keys.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/lhnet.obj b/Release-darkplaces-sdl2-vs2019-x64/lhnet.obj deleted file mode 100644 index b743aaeb..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/lhnet.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/libcurl.obj b/Release-darkplaces-sdl2-vs2019-x64/libcurl.obj deleted file mode 100644 index 95410cee..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/libcurl.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/mathlib.obj b/Release-darkplaces-sdl2-vs2019-x64/mathlib.obj deleted file mode 100644 index 96580bfc..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/mathlib.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/matrixlib.obj b/Release-darkplaces-sdl2-vs2019-x64/matrixlib.obj deleted file mode 100644 index 649fc100..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/matrixlib.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/mdfour.obj b/Release-darkplaces-sdl2-vs2019-x64/mdfour.obj deleted file mode 100644 index 5a61de81..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/mdfour.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/menu.obj b/Release-darkplaces-sdl2-vs2019-x64/menu.obj deleted file mode 100644 index 1db09455..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/menu.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/meshqueue.obj b/Release-darkplaces-sdl2-vs2019-x64/meshqueue.obj deleted file mode 100644 index ebe4299b..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/meshqueue.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_generic.obj b/Release-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_generic.obj deleted file mode 100644 index 57814a77..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_generic.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_sse.obj b/Release-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_sse.obj deleted file mode 100644 index ccd9a2a6..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/mod_skeletal_animatevertices_sse.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/model_alias.obj b/Release-darkplaces-sdl2-vs2019-x64/model_alias.obj deleted file mode 100644 index 4d9acb29..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/model_alias.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/model_brush.obj b/Release-darkplaces-sdl2-vs2019-x64/model_brush.obj deleted file mode 100644 index 29d8ef18..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/model_brush.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/model_shared.obj b/Release-darkplaces-sdl2-vs2019-x64/model_shared.obj deleted file mode 100644 index 91379f6d..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/model_shared.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/model_sprite.obj b/Release-darkplaces-sdl2-vs2019-x64/model_sprite.obj deleted file mode 100644 index 71932d9f..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/model_sprite.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/mvm_cmds.obj b/Release-darkplaces-sdl2-vs2019-x64/mvm_cmds.obj deleted file mode 100644 index 825ea587..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/mvm_cmds.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/netconn.obj b/Release-darkplaces-sdl2-vs2019-x64/netconn.obj deleted file mode 100644 index 8be7577b..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/netconn.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/palette.obj b/Release-darkplaces-sdl2-vs2019-x64/palette.obj deleted file mode 100644 index 44cf7160..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/palette.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/polygon.obj b/Release-darkplaces-sdl2-vs2019-x64/polygon.obj deleted file mode 100644 index 48507da4..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/polygon.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/portals.obj b/Release-darkplaces-sdl2-vs2019-x64/portals.obj deleted file mode 100644 index 918c399c..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/portals.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/protocol.obj b/Release-darkplaces-sdl2-vs2019-x64/protocol.obj deleted file mode 100644 index 93ff11a5..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/protocol.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/prvm_cmds.obj b/Release-darkplaces-sdl2-vs2019-x64/prvm_cmds.obj deleted file mode 100644 index 55a4a0d4..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/prvm_cmds.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/prvm_edict.obj b/Release-darkplaces-sdl2-vs2019-x64/prvm_edict.obj deleted file mode 100644 index 4922f4a8..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/prvm_edict.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/prvm_exec.obj b/Release-darkplaces-sdl2-vs2019-x64/prvm_exec.obj deleted file mode 100644 index 6d14b4b9..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/prvm_exec.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/r_explosion.obj b/Release-darkplaces-sdl2-vs2019-x64/r_explosion.obj deleted file mode 100644 index 50ae0bcb..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/r_explosion.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/r_lightning.obj b/Release-darkplaces-sdl2-vs2019-x64/r_lightning.obj deleted file mode 100644 index 09202ee1..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/r_lightning.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/r_modules.obj b/Release-darkplaces-sdl2-vs2019-x64/r_modules.obj deleted file mode 100644 index af8a9323..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/r_modules.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/r_shadow.obj b/Release-darkplaces-sdl2-vs2019-x64/r_shadow.obj deleted file mode 100644 index 18f05920..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/r_shadow.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/r_sky.obj b/Release-darkplaces-sdl2-vs2019-x64/r_sky.obj deleted file mode 100644 index 840de094..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/r_sky.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/r_sprites.obj b/Release-darkplaces-sdl2-vs2019-x64/r_sprites.obj deleted file mode 100644 index 62b83d47..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/r_sprites.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/r_stats.obj b/Release-darkplaces-sdl2-vs2019-x64/r_stats.obj deleted file mode 100644 index bcde0b91..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/r_stats.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sbar.obj b/Release-darkplaces-sdl2-vs2019-x64/sbar.obj deleted file mode 100644 index 01a68a56..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sbar.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/snd_main.obj b/Release-darkplaces-sdl2-vs2019-x64/snd_main.obj deleted file mode 100644 index 2c9321fd..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/snd_main.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/snd_mem.obj b/Release-darkplaces-sdl2-vs2019-x64/snd_mem.obj deleted file mode 100644 index 9b2d8219..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/snd_mem.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/snd_mix.obj b/Release-darkplaces-sdl2-vs2019-x64/snd_mix.obj deleted file mode 100644 index 447576c6..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/snd_mix.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/snd_ogg.obj b/Release-darkplaces-sdl2-vs2019-x64/snd_ogg.obj deleted file mode 100644 index 0aa99c85..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/snd_ogg.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/snd_sdl.obj b/Release-darkplaces-sdl2-vs2019-x64/snd_sdl.obj deleted file mode 100644 index 15407b2c..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/snd_sdl.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/snd_wav.obj b/Release-darkplaces-sdl2-vs2019-x64/snd_wav.obj deleted file mode 100644 index ad2bd45e..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/snd_wav.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/snd_xmp.obj b/Release-darkplaces-sdl2-vs2019-x64/snd_xmp.obj deleted file mode 100644 index fee0b2fe..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/snd_xmp.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_ccmds.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_ccmds.obj deleted file mode 100644 index c44e6f91..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_ccmds.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_demo.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_demo.obj deleted file mode 100644 index f1914e93..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_demo.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_ents.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_ents.obj deleted file mode 100644 index 44465c52..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_ents.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_ents4.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_ents4.obj deleted file mode 100644 index 9a7c6cf6..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_ents4.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_ents5.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_ents5.obj deleted file mode 100644 index 0ec918b5..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_ents5.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_ents_csqc.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_ents_csqc.obj deleted file mode 100644 index 826d553b..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_ents_csqc.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_ents_nq.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_ents_nq.obj deleted file mode 100644 index dac548fc..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_ents_nq.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_main.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_main.obj deleted file mode 100644 index 0388707c..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_main.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_move.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_move.obj deleted file mode 100644 index 98d52880..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_move.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_phys.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_phys.obj deleted file mode 100644 index 934f0517..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_phys.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_save.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_save.obj deleted file mode 100644 index ee7574ac..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_save.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_send.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_send.obj deleted file mode 100644 index 3339e521..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_send.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sv_user.obj b/Release-darkplaces-sdl2-vs2019-x64/sv_user.obj deleted file mode 100644 index d14c2756..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sv_user.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/svbsp.obj b/Release-darkplaces-sdl2-vs2019-x64/svbsp.obj deleted file mode 100644 index 0abecdf4..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/svbsp.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/svvm_cmds.obj b/Release-darkplaces-sdl2-vs2019-x64/svvm_cmds.obj deleted file mode 100644 index 6660e5d1..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/svvm_cmds.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sys_sdl.obj b/Release-darkplaces-sdl2-vs2019-x64/sys_sdl.obj deleted file mode 100644 index a9769626..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sys_sdl.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/sys_shared.obj b/Release-darkplaces-sdl2-vs2019-x64/sys_shared.obj deleted file mode 100644 index 9e7a064f..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/sys_shared.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/taskqueue.obj b/Release-darkplaces-sdl2-vs2019-x64/taskqueue.obj deleted file mode 100644 index 1085428b..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/taskqueue.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/thread_sdl.obj b/Release-darkplaces-sdl2-vs2019-x64/thread_sdl.obj deleted file mode 100644 index b78e4730..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/thread_sdl.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/utf8lib.obj b/Release-darkplaces-sdl2-vs2019-x64/utf8lib.obj deleted file mode 100644 index 6fdc450a..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/utf8lib.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/vid_sdl.obj b/Release-darkplaces-sdl2-vs2019-x64/vid_sdl.obj deleted file mode 100644 index f2b0fafa..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/vid_sdl.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/vid_shared.obj b/Release-darkplaces-sdl2-vs2019-x64/vid_shared.obj deleted file mode 100644 index 97188a7f..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/vid_shared.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/view.obj b/Release-darkplaces-sdl2-vs2019-x64/view.obj deleted file mode 100644 index 98ba8542..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/view.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/wad.obj b/Release-darkplaces-sdl2-vs2019-x64/wad.obj deleted file mode 100644 index cb9636e7..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/wad.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/world.obj b/Release-darkplaces-sdl2-vs2019-x64/world.obj deleted file mode 100644 index e071d678..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/world.obj and /dev/null differ diff --git a/Release-darkplaces-sdl2-vs2019-x64/zone.obj b/Release-darkplaces-sdl2-vs2019-x64/zone.obj deleted file mode 100644 index ebac603c..00000000 Binary files a/Release-darkplaces-sdl2-vs2019-x64/zone.obj and /dev/null differ diff --git a/cl_cmd.c b/cl_cmd.c index 9277ad50..4bbd8ea9 100644 --- a/cl_cmd.c +++ b/cl_cmd.c @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "cl_collision.h" -cvar_t cl_name = {CF_CLIENT | CF_ARCHIVE | CF_USERINFO, "name", "player", "player name"}; +cvar_t cl_name = {CF_CLIENT | CF_ARCHIVE | CF_USERINFO, "_cl_name", "player", "player name"}; cvar_t cl_rate = {CF_CLIENT | CF_ARCHIVE | CF_USERINFO, "rate", "20000", "connection speed"}; cvar_t cl_rate_burstsize = {CF_CLIENT | CF_ARCHIVE | CF_USERINFO, "rate_burstsize", "1024", "rate control burst size"}; cvar_t cl_topcolor = {CF_CLIENT | CF_ARCHIVE | CF_USERINFO, "topcolor", "0", "color of your shirt"}; @@ -216,6 +216,32 @@ static void CL_SendCvar_f(cmd_state_t *cmd) } } +/* +================== +CL_Name_f + +The logic from div0-stable's Host_Name_f() is now in SV_Name_f(). +================== +*/ +static void CL_Name_f(cmd_state_t *cmd) +{ + char *newNameSource; + + if (Cmd_Argc(cmd) == 1) + { + Con_Printf("name: \"%s^7\"\n", cl_name.string); + return; + } + + // in the single-arg case any enclosing quotes shall be stripped + newNameSource = (char *)(Cmd_Argc(cmd) == 2 ? Cmd_Argv(cmd, 1) : Cmd_Args(cmd)); + + if (strlen(newNameSource) >= MAX_SCOREBOARDNAME) // may as well truncate before networking + newNameSource[MAX_SCOREBOARDNAME - 1] = '\0'; // this is fine (cbuf stores length) + + Cvar_SetQuick(&cl_name, newNameSource); +} + /* ================== CL_Color_f @@ -715,8 +741,16 @@ void CL_InitCommands(void) { dpsnprintf(cls.userinfo, sizeof(cls.userinfo), "\\name\\player\\team\\none\\topcolor\\0\\bottomcolor\\0\\rate\\10000\\msg\\1\\noaim\\1\\*ver\\dp"); + /* In Quake `name` is a command that concatenates its arguments (quotes unnecessary) + * which is expected in most DP-based games. + * In QuakeWorld it's a cvar which requires quotes if spaces are used. + */ Cvar_RegisterVariable(&cl_name); - Cvar_RegisterVirtual(&cl_name, "_cl_name"); + if ((0)) // TODO: if (gamemode == GAME_QUAKEWORLD) + Cvar_RegisterVirtual(&cl_name, "name"); + else + Cmd_AddCommand(CF_CLIENT, "name", CL_Name_f, "change your player name"); + Cvar_RegisterVariable(&cl_rate); Cvar_RegisterVirtual(&cl_rate, "_cl_rate"); Cvar_RegisterVariable(&cl_rate_burstsize); diff --git a/cl_main.c b/cl_main.c index fe1840af..01ce5e6d 100644 --- a/cl_main.c +++ b/cl_main.c @@ -2813,11 +2813,6 @@ double CL_Frame (double time) CL_VM_PreventInformationLeaks(); - // get new key events - Key_EventQueue_Unblock(); - SndSys_SendKeyEvents(); - Sys_SendKeyEvents(); - /* * If the accumulator hasn't become positive, don't * run the frame. Everything that happens before this @@ -3112,7 +3107,8 @@ void CL_Init (void) // for QW connections Cvar_RegisterVariable(&qport); - Cvar_SetValueQuick(&qport, (rand() * RAND_MAX + rand()) & 0xffff); + // multiplying by RAND_MAX necessary for Windows, for which RAND_MAX is only 32767. + Cvar_SetValueQuick(&qport, ((unsigned int)rand() * RAND_MAX + (unsigned int)rand()) & 0xffff); Cmd_AddCommand(CF_CLIENT, "timerefresh", CL_TimeRefresh_f, "turn quickly and print rendering statistcs"); diff --git a/cmd.c b/cmd.c index 0fd60018..6230fa02 100644 --- a/cmd.c +++ b/cmd.c @@ -74,11 +74,13 @@ Cmd_Defer_f Cause a command to be executed after a delay. ============ */ -static cmd_input_t *Cbuf_LinkGet(cmd_buf_t *cbuf, cmd_input_t *existing); +static void Cbuf_ParseText(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool allowpending); +static void Cbuf_LinkString(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool leavepending, unsigned int cmdsize); static void Cmd_Defer_f (cmd_state_t *cmd) { cmd_input_t *current; cmd_buf_t *cbuf = cmd->cbuf; + unsigned int cmdsize; if(Cmd_Argc(cmd) == 1) { @@ -93,25 +95,19 @@ static void Cmd_Defer_f (cmd_state_t *cmd) else if(Cmd_Argc(cmd) == 2 && !strcasecmp("clear", Cmd_Argv(cmd, 1))) { while(!List_Is_Empty(&cbuf->deferred)) + { + cbuf->size -= List_Entry(cbuf->deferred.next, cmd_input_t, list)->length; List_Move_Tail(cbuf->deferred.next, &cbuf->free); + } } - else if(Cmd_Argc(cmd) == 3) + else if(Cmd_Argc(cmd) == 3 && (cmdsize = strlen(Cmd_Argv(cmd, 2))) ) { - const char *text = Cmd_Argv(cmd, 2); - current = Cbuf_LinkGet(cbuf, NULL); - current->length = strlen(text); - current->source = cmd; - current->delay = atof(Cmd_Argv(cmd, 1)); - - if(current->size < current->length) - { - current->text = (char *)Mem_Realloc(cbuf_mempool, current->text, current->length + 1); - current->size = current->length; - } + Cbuf_Lock(cbuf); - strlcpy(current->text, text, current->length + 1); + Cbuf_LinkString(cmd, &cbuf->deferred, NULL, Cmd_Argv(cmd, 2), false, cmdsize); + List_Entry(cbuf->deferred.prev, cmd_input_t, list)->delay = atof(Cmd_Argv(cmd, 1)); - List_Move_Tail(¤t->list, &cbuf->deferred); + Cbuf_Unlock(cbuf); } else { @@ -169,182 +165,135 @@ static void Cmd_Centerprint_f (cmd_state_t *cmd) COMMAND BUFFER + * The Quake command-line is super basic. It can be entered in the console + * or in config files. A semicolon is used to terminate a command and chain + * them together. Otherwise, a newline delineates command input. + * + * In most engines, the Quake command-line is a simple linear text buffer that + * is parsed when it executes. In Darkplaces, we use a linked list of command + * input and parse the input on the spot. + * + * This was done because Darkplaces allows multiple command interpreters on the + * same thread. Previously, each interpreter maintained its own buffer and this + * caused problems related to execution order, and maintaining a single simple + * buffer for all interpreters makes it non-trivial to keep track of which + * command should execute on which interpreter. + ============================================================================= */ -static cmd_input_t *Cbuf_LinkGet(cmd_buf_t *cbuf, cmd_input_t *existing) +/* +============ +Cbuf_NodeGet + +Returns an existing buffer node for appending or reuse, or allocates a new one +============ +*/ +static cmd_input_t *Cbuf_NodeGet(cmd_buf_t *cbuf, cmd_input_t *existing) { - cmd_input_t *ret = NULL; + cmd_input_t *node; if(existing && existing->pending) - ret = existing; + node = existing; else if(!List_Is_Empty(&cbuf->free)) { - ret = List_Entry(cbuf->free.next, cmd_input_t, list); - ret->length = 0; - ret->pending = false; + node = List_Entry(cbuf->free.next, cmd_input_t, list); + node->length = node->pending = 0; + } + else + { + node = (cmd_input_t *)Mem_Alloc(cbuf_mempool, sizeof(cmd_input_t)); + node->list.prev = node->list.next = &node->list; + node->size = node->length = node->pending = 0; } - return ret; -} - -static cmd_input_t *Cmd_AllocInputNode(void) -{ - cmd_input_t *node = (cmd_input_t *)Mem_Alloc(cbuf_mempool, sizeof(cmd_input_t)); - node->list.prev = node->list.next = &node->list; - node->size = node->length = node->pending = 0; return node; } +/* +============ +Cbuf_LinkString -// Cloudwalk FIXME: The entire design of this thing is overly complicated. -// We could very much safely have one input node per line whether or not -// the command was terminated. We don't need to split up input nodes per command -// executed. -static size_t Cmd_ParseInput (cmd_input_t **output, char **input) +Copies a command string into a buffer node +============ +*/ +static void Cbuf_LinkString(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool leavepending, unsigned int cmdsize) { - size_t pos, cmdsize = 0, start = 0; - qbool command = false, lookahead = false; - qbool quotes = false, comment = false; - qbool escaped = false; - - /* - * The Quake command-line is super basic. It can be entered in the console - * or in config files. A semicolon is used to terminate a command and chain - * them together. Otherwise, a newline delineates command input. - * - * In most engines, the Quake command-line is a simple linear text buffer that - * is parsed when it executes. In Darkplaces, we use a linked list of command - * input and parse the input on the spot. - * - * This was done because Darkplaces allows multiple command interpreters on the - * same thread. Previously, each interpreter maintained its own buffer and this - * caused problems related to execution order, and maintaining a single simple - * buffer for all interpreters makes it non-trivial to keep track of which - * command should execute on which interpreter. - */ - - // Run until command and lookahead are both true, or until we run out of input. - for (pos = 0; (*input)[pos]; pos++) - { - // Look for newlines and semicolons. Ignore semicolons in quotes. - switch((*input)[pos]) - { - case '\r': - case '\n': - command = false; - comment = false; - break; - default: - if(!comment) // Not a newline so far. Still not a valid command yet. - { - if(!quotes && (*input)[pos] == ';') // Ignore semicolons in quotes. - command = false; - else if (ISCOMMENT((*input), pos)) // Comments - { - comment = true; - command = false; - } - else - { - command = true; - if(!lookahead) - { - if(!cmdsize) - start = pos; - cmdsize++; - } - - switch((*input)[pos]) - { - case '"': - if (!escaped) - quotes = !quotes; - else - escaped = false; - break; - case '\\': - if (!escaped && quotes) - escaped = true; - else if (escaped) - escaped = false; - break; - } - } - } - } - if(cmdsize && !command) - lookahead = true; + cmd_buf_t *cbuf = cmd->cbuf; + cmd_input_t *node = Cbuf_NodeGet(cbuf, existing); + unsigned int offset = node->length; // > 0 if(pending) - if(command && lookahead) - break; + // node will match existing if its text was pending continuation + if(node != existing) + { + node->source = cmd; + List_Move_Tail(&node->list, head); } - if(cmdsize) + node->length += cmdsize; + if(node->size < node->length) { - size_t offset = 0; - - if(!*output) - *output = Cmd_AllocInputNode(); - - // Append, since this input line hasn't closed yet. - if((*output)->pending) - offset = (*output)->length; - - (*output)->length += cmdsize; - - if((*output)->size < (*output)->length) - { - (*output)->text = (char *)Mem_Realloc(cbuf_mempool, (*output)->text, (*output)->length + 1); - (*output)->size = (*output)->length; - } - - strlcpy(&(*output)->text[offset], &(*input)[start], cmdsize + 1); - - /* - * If we were still looking ahead by the time we broke from the loop, the command input - * hasn't terminated yet and we're still expecting more, so keep this node open for appending later. - */ - (*output)->pending = !lookahead; + node->text = (char *)Mem_Realloc(cbuf_mempool, node->text, node->length + 1); + node->size = node->length; } + cbuf->size += cmdsize; - // Set input to its new position. Can be NULL. - *input = &(*input)[pos]; - - return cmdsize; + strlcpy(&node->text[offset], text, cmdsize + 1); // always sets the last char to \0 + //Con_Printf("^5Cbuf_LinkString(): %s `^7%s^5`\n", node->pending ? "append" : "new", &node->text[offset]); + node->pending = leavepending; } -// Cloudwalk: Not happy with this, but it works. -static void Cbuf_LinkCreate(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text) +/* +============ +Cbuf_ParseText + +Parses text to isolate command strings for linking into the buffer +separators: \n \r or unquoted and uncommented ';' +============ +*/ +static void Cbuf_ParseText(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool allowpending) { - char *in = (char *)&text[0]; - cmd_buf_t *cbuf = cmd->cbuf; - size_t totalsize = 0, newsize = 0; - cmd_input_t *current = NULL; + unsigned int cmdsize = 0, start = 0, pos; + qbool quotes = false, comment = false; - // Slide the pointer down until we reach the end - while(*in) + for (pos = 0; text[pos]; ++pos) { - // Check if the current node is still accepting input (input line hasn't terminated) - current = Cbuf_LinkGet(cbuf, existing); - newsize = Cmd_ParseInput(¤t, &in); - - // Valid command - if(newsize) + switch(text[pos]) { - // current will match existing if the input line hasn't terminated yet - if(current != existing) - { - current->source = cmd; - List_Move_Tail(¤t->list, head); - } + case ';': + if (comment || quotes) + break; + case '\r': + case '\n': + comment = false; + quotes = false; // matches div0-stable + if (cmdsize) + { + Cbuf_LinkString(cmd, head, existing, &text[start], false, cmdsize); + cmdsize = 0; + } + else if (existing && existing->pending) // all I got was this lousy \n + existing->pending = false; + continue; // don't increment cmdsize + + case '/': + if (!quotes && text[pos + 1] == '/' && (pos == 0 || ISWHITESPACE(text[pos - 1]))) + comment = true; + break; + case '"': + if (!comment && (pos == 0 || text[pos - 1] != '\\')) + quotes = !quotes; + break; + } - totalsize += newsize; + if (!comment) + { + if (!cmdsize) + start = pos; + ++cmdsize; } - else if (current == existing && !totalsize) - current->pending = false; - current = NULL; } - cbuf->size += totalsize; + if (cmdsize) // the line didn't end yet but we do have a string + Cbuf_LinkString(cmd, head, existing, &text[start], allowpending, cmdsize); } /* @@ -366,9 +315,9 @@ void Cbuf_AddText (cmd_state_t *cmd, const char *text) Con_Print("Cbuf_AddText: overflow\n"); else { - Cbuf_LinkCreate(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.prev, cmd_input_t, list)), text); - if(!List_Is_Empty(&llist)) - List_Splice_Tail(&llist, &cbuf->start); + // If the string terminates but the (last) line doesn't, the node will be left in the pending state (to be continued). + Cbuf_ParseText(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.prev, cmd_input_t, list)), text, true); + List_Splice_Tail(&llist, &cbuf->start); } Cbuf_Unlock(cbuf); } @@ -378,7 +327,6 @@ void Cbuf_AddText (cmd_state_t *cmd, const char *text) Cbuf_InsertText Adds command text immediately after the current command -FIXME: actually change the command buffer to do less copying ============ */ void Cbuf_InsertText (cmd_state_t *cmd, const char *text) @@ -389,14 +337,15 @@ void Cbuf_InsertText (cmd_state_t *cmd, const char *text) Cbuf_Lock(cbuf); - // we need to memmove the existing text and stuff this in before it... if (cbuf->size + l >= cbuf->maxsize) Con_Print("Cbuf_InsertText: overflow\n"); else { - Cbuf_LinkCreate(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.next, cmd_input_t, list)), text); - if(!List_Is_Empty(&llist)) - List_Splice(&llist, &cbuf->start); + // bones_was_here assertion: when prepending to the buffer it never makes sense to leave node(s) in the `pending` state, + // it would have been impossible to append to such text later in the old raw text buffer, + // and allowing it causes bugs when .cfg files lack \n at EOF (see: https://gitlab.com/xonotic/darkplaces/-/issues/378). + Cbuf_ParseText(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.next, cmd_input_t, list)), text, false); + List_Splice(&llist, &cbuf->start); } Cbuf_Unlock(cbuf); @@ -409,25 +358,25 @@ Cbuf_Execute_Deferred --blub */ static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf) { - cmd_input_t *current; - double eat; + cmd_input_t *current, *n; + vec_t eat; if (host.realtime - cbuf->deferred_oldtime < 0 || host.realtime - cbuf->deferred_oldtime > 1800) cbuf->deferred_oldtime = host.realtime; eat = host.realtime - cbuf->deferred_oldtime; - if (eat < (1.0 / 120.0)) + if (eat < 1/128) return; cbuf->deferred_oldtime = host.realtime; - List_For_Each_Entry(current, &cbuf->deferred, cmd_input_t, list) + List_For_Each_Entry_Safe(current, n, &cbuf->deferred, cmd_input_t, list) { current->delay -= eat; if(current->delay <= 0) { - cbuf->size += current->length; - List_Move(¤t->list, &cbuf->start); - // We must return and come back next frame or the engine will freeze. Fragile... like glass :3 - return; + Cbuf_AddText(current->source, current->text); // parse deferred string and append its cmdstring(s) + List_Entry(cbuf->start.prev, cmd_input_t, list)->pending = false; // faster than div0-stable's Cbuf_AddText(";\n"); + List_Move_Tail(¤t->list, &cbuf->free); // make deferred string memory available for reuse + cbuf->size -= current->length; } } } @@ -437,12 +386,14 @@ static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf) Cbuf_Execute ============ */ +extern qbool prvm_runawaycheck; static qbool Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmd_alias_t *alias ); void Cbuf_Execute (cmd_buf_t *cbuf) { cmd_input_t *current; char preprocessed[MAX_INPUTLINE]; char *firstchar; + unsigned int i = 0; // LadyHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes cbuf->tokenizebufferpos = 0; @@ -494,6 +445,16 @@ void Cbuf_Execute (cmd_buf_t *cbuf) cbuf->wait = false; break; } + + if (++i == 1000000 && prvm_runawaycheck) + { + Con_Printf(CON_WARN "Cbuf_Execute: runaway loop counter hit limit of %d commands, clearing command buffers!\n", i); + while (!List_Is_Empty(&cbuf->start)) + List_Move_Tail(cbuf->start.next, &cbuf->free); + while (!List_Is_Empty(&cbuf->deferred)) + List_Move_Tail(cbuf->deferred.next, &cbuf->free); + cbuf->size = 0; + } } } @@ -1654,7 +1615,7 @@ void Cmd_Init(void) cmd_buf_t *cbuf; cbuf_mempool = Mem_AllocPool("Command buffer", 0, NULL); cbuf = (cmd_buf_t *)Mem_Alloc(cbuf_mempool, sizeof(cmd_buf_t)); - cbuf->maxsize = 655360; + cbuf->maxsize = CMDBUFSIZE; cbuf->lock = Thread_CreateMutex(); cbuf->wait = false; host.cbuf = cbuf; @@ -1745,7 +1706,7 @@ void Cmd_Shutdown(void) Cmd_Argc ============ */ -int Cmd_Argc (cmd_state_t *cmd) +inline int Cmd_Argc (cmd_state_t *cmd) { return cmd->argc; } @@ -1755,7 +1716,7 @@ int Cmd_Argc (cmd_state_t *cmd) Cmd_Argv ============ */ -const char *Cmd_Argv(cmd_state_t *cmd, int arg) +inline const char *Cmd_Argv(cmd_state_t *cmd, int arg) { if (arg >= cmd->argc ) return cmd->null_string; @@ -1767,7 +1728,7 @@ const char *Cmd_Argv(cmd_state_t *cmd, int arg) Cmd_Args ============ */ -const char *Cmd_Args (cmd_state_t *cmd) +inline const char *Cmd_Args (cmd_state_t *cmd) { return cmd->args; } diff --git a/cmd.h b/cmd.h index fddd2a08..99241fcf 100644 --- a/cmd.h +++ b/cmd.h @@ -158,7 +158,7 @@ typedef struct cmd_input_s { llist_t list; cmd_state_t *source; - double delay; + vec_t delay; size_t size; size_t length; char *text; diff --git a/com_msg.c b/com_msg.c index f2110d17..80503b62 100644 --- a/com_msg.c +++ b/com_msg.c @@ -30,6 +30,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ============================================================================ */ +/* Casting to unsigned when shifting by 24 bits here is necessary to prevent UB + * caused by shifting outside the range of int on platforms where int is 32 bits. + */ float BuffBigFloat (const unsigned char *buffer) { @@ -39,13 +42,13 @@ float BuffBigFloat (const unsigned char *buffer) unsigned int i; } u; - u.i = (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]; + u.i = ((unsigned)buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]; return u.f; } int BuffBigLong (const unsigned char *buffer) { - return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]; + return ((unsigned)buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]; } short BuffBigShort (const unsigned char *buffer) @@ -61,13 +64,13 @@ float BuffLittleFloat (const unsigned char *buffer) unsigned int i; } u; - u.i = (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0]; + u.i = ((unsigned)buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0]; return u.f; } int BuffLittleLong (const unsigned char *buffer) { - return (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0]; + return ((unsigned)buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0]; } short BuffLittleShort (const unsigned char *buffer) @@ -287,7 +290,7 @@ int MSG_ReadLittleLong (sizebuf_t *sb) return -1; } sb->readcount += 4; - return sb->data[sb->readcount-4] | (sb->data[sb->readcount-3]<<8) | (sb->data[sb->readcount-2]<<16) | (sb->data[sb->readcount-1]<<24); + return sb->data[sb->readcount-4] | (sb->data[sb->readcount-3]<<8) | (sb->data[sb->readcount-2]<<16) | ((unsigned)sb->data[sb->readcount-1]<<24); } int MSG_ReadBigLong (sizebuf_t *sb) @@ -298,7 +301,7 @@ int MSG_ReadBigLong (sizebuf_t *sb) return -1; } sb->readcount += 4; - return (sb->data[sb->readcount-4]<<24) + (sb->data[sb->readcount-3]<<16) + (sb->data[sb->readcount-2]<<8) + sb->data[sb->readcount-1]; + return ((unsigned)sb->data[sb->readcount-4]<<24) + (sb->data[sb->readcount-3]<<16) + (sb->data[sb->readcount-2]<<8) + sb->data[sb->readcount-1]; } float MSG_ReadLittleFloat (sizebuf_t *sb) @@ -314,7 +317,7 @@ float MSG_ReadLittleFloat (sizebuf_t *sb) return -1; } sb->readcount += 4; - dat.l = sb->data[sb->readcount-4] | (sb->data[sb->readcount-3]<<8) | (sb->data[sb->readcount-2]<<16) | (sb->data[sb->readcount-1]<<24); + dat.l = sb->data[sb->readcount-4] | (sb->data[sb->readcount-3]<<8) | (sb->data[sb->readcount-2]<<16) | ((unsigned)sb->data[sb->readcount-1]<<24); return dat.f; } @@ -331,7 +334,7 @@ float MSG_ReadBigFloat (sizebuf_t *sb) return -1; } sb->readcount += 4; - dat.l = (sb->data[sb->readcount-4]<<24) | (sb->data[sb->readcount-3]<<16) | (sb->data[sb->readcount-2]<<8) | sb->data[sb->readcount-1]; + dat.l = ((unsigned)sb->data[sb->readcount-4]<<24) | (sb->data[sb->readcount-3]<<16) | (sb->data[sb->readcount-2]<<8) | sb->data[sb->readcount-1]; return dat.f; } diff --git a/cvar.c b/cvar.c index 98f11e39..e95344b5 100644 --- a/cvar.c +++ b/cvar.c @@ -271,15 +271,13 @@ void Cvar_PrintHelp(cvar_t *cvar, const char *name, qbool full) { // Aliases are purple, cvars are yellow if (strcmp(cvar->name, name)) - Con_Printf("^6"); + Con_Printf("^6%s^7 (alias of ^3%s^7)", name, cvar->name); else - Con_Printf("^3"); - Con_Printf("%s^7 is \"%s\" [\"%s\"]", name, ((cvar->flags & CF_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring); - if (strcmp(cvar->name, name)) - Con_Printf(" (also ^3%s^7)", cvar->name); + Con_Printf("^3%s^7", name); + Con_Printf(" is \"%s^7\" [\"%s^7\"]", ((cvar->flags & CF_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring); if (full) Con_Printf(" %s", cvar->description); - Con_Printf("\n"); + Con_Print("\n"); } // written by LadyHavoc diff --git a/darkplaces.h b/darkplaces.h index 512de65f..0d04dd45 100644 --- a/darkplaces.h +++ b/darkplaces.h @@ -58,13 +58,4 @@ extern char engineversion[128]; #include "mathlib.h" #include "matrixlib.h" -extern cvar_t developer; -extern cvar_t developer_entityparsing; -extern cvar_t developer_extra; -extern cvar_t developer_insane; -extern cvar_t developer_loadfile; -extern cvar_t developer_loading; -extern cvar_t host_isclient; -extern cvar_t sessionid; - #endif diff --git a/dpdefs/csprogsdefs.qc b/dpdefs/csprogsdefs.qc index d78e6b0b..39d70246 100644 --- a/dpdefs/csprogsdefs.qc +++ b/dpdefs/csprogsdefs.qc @@ -1443,6 +1443,13 @@ void(float fh, entity e) writetofile = #606; float(string s) isfunction = #607; void(entity e, string s) parseentitydata = #608; +//DP_QC_FINDCHAIN_TOFIELD +//see: dpextensions.qc +entity(vector org, float rad, .entity tofield) findradius_tofield = #22; +entity(.string fld, string match, .entity tofield) findchain_tofield = #402; +entity(.float fld, float match, .entity tofield) findchainflags_tofield = #450; +entity(.float fld, float match, .entity tofield) findchainfloat_tofield = #403; + //DP_COVERAGE //idea: divVerent //darkplaces implementation: divVerent diff --git a/fs.c b/fs.c index e7a001bf..af62b898 100644 --- a/fs.c +++ b/fs.c @@ -109,6 +109,66 @@ static filedesc_t FILEDESC_DUP(const char *filename, filedesc_t fd) { } #endif + +/* This code seems to have originally been written with the assumption that + * read(..., n) returns n on success. This is not the case (refer to + * ). + * Ditto for write. + */ + +/* +==================== +ReadAll + +Read exactly length bytes from fd into buf. If end of file is reached, +the number of bytes read is returned. If an error occurred, that error +is returned. Note that if an error is returned, any previously read +data is lost. +==================== +*/ +static fs_offset_t ReadAll(const filedesc_t fd, void *const buf, const size_t length) +{ + char *const p = (char *)buf; + size_t cursor = 0; + do + { + const fs_offset_t result = FILEDESC_READ(fd, p + cursor, length - cursor); + if (result < 0) // Error + return result; + if (result == 0) // EOF + break; + cursor += result; + } while (cursor < length); + return cursor; +} + +/* +==================== +WriteAll + +Write exactly length bytes to fd from buf. +If an error occurred, that error is returned. +==================== +*/ +static fs_offset_t WriteAll(const filedesc_t fd, const void *const buf, const size_t length) +{ + const char *const p = (const char *)buf; + size_t cursor = 0; + do + { + const fs_offset_t result = FILEDESC_WRITE(fd, p + cursor, length - cursor); + if (result < 0) // Error + return result; + cursor += result; + } while (cursor < length); + return cursor; +} + +#undef FILEDESC_READ +#define FILEDESC_READ ReadAll +#undef FILEDESC_WRITE +#define FILEDESC_WRITE WriteAll + /** \page fs File System All of Quake's data access is through a hierchal file system, but the contents @@ -455,7 +515,7 @@ static const char* shfolderdllnames [] = }; static dllhandle_t shfolder_dll = NULL; -const GUID qFOLDERID_SavedGames = {0x4C5C32FF, 0xBB9D, 0x43b0, {0xB5, 0xB4, 0x2D, 0x72, 0xE5, 0x4E, 0xAA, 0xA4}}; +const GUID qFOLDERID_SavedGames = {0x4C5C32FF, 0xBB9D, 0x43b0, {0xB5, 0xB4, 0x2D, 0x72, 0xE5, 0x4E, 0xAA, 0xA4}}; #define qREFKNOWNFOLDERID const GUID * #define qKF_FLAG_CREATE 0x8000 #define qKF_FLAG_NO_ALIAS 0x1000 @@ -1762,7 +1822,7 @@ const char *FS_CheckGameDir(const char *gamedir) ret = FS_SysCheckGameDir(va(vabuf, sizeof(vabuf), "%s%s/", fs_basedir, gamedir), buf, sizeof(buf)); if(ret) return ret; - + return fs_checkgamedir_missing; } @@ -1795,7 +1855,7 @@ static void FS_ListGameDirs(void) continue; if(!*info) continue; - stringlistappend(&list2, list.strings[i]); + stringlistappend(&list2, list.strings[i]); } stringlistfreecontents(&list); @@ -2583,7 +2643,7 @@ int FS_CheckNastyPath (const char *path, qbool isgamedir) ==================== FS_SanitizePath -Sanitize path (replace non-portable characters +Sanitize path (replace non-portable characters with portable ones in-place, etc) ==================== */ @@ -2740,7 +2800,7 @@ static qfile_t *FS_OpenReadFile (const char *filename, qbool quiet, qbool nonblo if(count < 0) return NULL; linkbuf[count] = 0; - + // Now combine the paths... mergeslash = strrchr(filename, '/'); mergestart = linkbuf; @@ -3974,7 +4034,7 @@ void FS_Which_f(cmd_state_t *cmd) { Con_Printf("usage:\n%s \n", Cmd_Argv(cmd, 0)); return; - } + } filename = Cmd_Argv(cmd, 1); sp = FS_FindFile(filename, &index, true); if (!sp) { @@ -4127,7 +4187,7 @@ unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflat Mem_Free(tmp); return NULL; } - + if(qz_deflateEnd(&strm) != Z_OK) { Con_Printf("FS_Deflate: deflateEnd failed\n"); @@ -4154,7 +4214,7 @@ unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflat memcpy(out, tmp, strm.total_out); Mem_Free(tmp); - + return out; } @@ -4221,7 +4281,7 @@ unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflat case Z_STREAM_END: case Z_OK: break; - + case Z_STREAM_ERROR: Con_Print("FS_Inflate: stream error!\n"); break; @@ -4237,7 +4297,7 @@ unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflat default: Con_Print("FS_Inflate: unknown error!\n"); break; - + } if(ret != Z_OK && ret != Z_STREAM_END) { @@ -4265,6 +4325,6 @@ unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflat Mem_Free(outbuf.data); *inflated_size = (size_t)outbuf.cursize; - + return out; } diff --git a/host.c b/host.c index 09571024..a20903a9 100644 --- a/host.c +++ b/host.c @@ -643,6 +643,9 @@ static double Host_Frame(double time) // Run any downloads Curl_Frame(); + // get new SDL events and add commands from keybindings to the cbuf + Sys_SendKeyEvents(); + // process console commands Cbuf_Frame(host.cbuf); diff --git a/host.h b/host.h index 6c4f5f60..61182b52 100644 --- a/host.h +++ b/host.h @@ -5,6 +5,16 @@ #include "qtypes.h" #include "qdefs.h" #include "cmd.h" +#include "cvar.h" + +extern cvar_t developer; +extern cvar_t developer_entityparsing; +extern cvar_t developer_extra; +extern cvar_t developer_insane; +extern cvar_t developer_loadfile; +extern cvar_t developer_loading; +extern cvar_t host_isclient; +extern cvar_t sessionid; struct cmd_state_s; diff --git a/keys.c b/keys.c index 8049bb3b..9ff48533 100644 --- a/keys.c +++ b/keys.c @@ -1972,14 +1972,12 @@ Key_Event (int key, int ascii, qbool down) { // button commands add keynum as a parm if (bind[0] == '+') - Cbuf_AddText (cmd, va(vabuf, sizeof(vabuf), "%s %i\n", bind, key)); + Cbuf_InsertText(cmd, va(vabuf, sizeof(vabuf), "%s %i\n", bind, key)); else - { - Cbuf_AddText (cmd, bind); - Cbuf_AddText (cmd, "\n"); - } - } else if(bind[0] == '+' && !down && keydown[key] == 0) - Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key)); + Cbuf_InsertText(cmd, bind); + } + else if(bind[0] == '+' && !down && keydown[key] == 0) + Cbuf_InsertText(cmd, va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key)); } return; } @@ -2010,7 +2008,7 @@ Key_Event (int key, int ascii, qbool down) { if (down && con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && ascii != STRING_COLOR_TAG) { - Cbuf_AddText(cmd, "toggleconsole\n"); // Deferred to next frame so we're not sending the text event to the console. + Cbuf_InsertText(cmd, "toggleconsole\n"); // Deferred to next frame so we're not sending the text event to the console. tbl_keydest[key] = key_void; // key release should go nowhere (especially not to key_menu or key_game) return; } @@ -2053,14 +2051,12 @@ Key_Event (int key, int ascii, qbool down) { // button commands add keynum as a parm if (bind[0] == '+') - Cbuf_AddText (cmd, va(vabuf, sizeof(vabuf), "%s %i\n", bind, key)); + Cbuf_InsertText(cmd, va(vabuf, sizeof(vabuf), "%s %i\n", bind, key)); else - { - Cbuf_AddText (cmd, bind); - Cbuf_AddText (cmd, "\n"); - } - } else if(bind[0] == '+' && !down && keydown[key] == 0) - Cbuf_AddText(cmd, va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key)); + Cbuf_InsertText(cmd, bind); + } + else if(bind[0] == '+' && !down && keydown[key] == 0) + Cbuf_InsertText(cmd, va(vabuf, sizeof(vabuf), "-%s %i\n", bind + 1, key)); } break; default: diff --git a/prvm_edict.c b/prvm_edict.c index ea839275..858ab357 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -297,7 +297,11 @@ prvm_edict_t *PRVM_ED_Alloc(prvm_prog_t *prog) PRVM_ED_Free Marks the edict as free + FIXME: walk all entities and NULL out references to this entity +bones_was_here: do not want, that would break chains immediately! +Currently chains aren't broken by removing an entity, at least with prvm_reuseedicts_neverinsameframe 1 +which is very handy and some QC code will depend on it. ================= */ void PRVM_ED_Free(prvm_prog_t *prog, prvm_edict_t *ed) diff --git a/r_shadow.c b/r_shadow.c index 7363602a..c80f0d7d 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -1226,7 +1226,7 @@ static unsigned int R_Shadow_MakeTextures_SamplePoint(float x, float y, float z) float dist = sqrt(x*x+y*y+z*z); float intensity = dist < 1 ? ((1.0f - dist) * r_shadow_lightattenuationlinearscale.value / (r_shadow_lightattenuationdividebias.value + dist*dist)) : 0; // note this code could suffer byte order issues except that it is multiplying by an integer that reads the same both ways - return (unsigned char)bound(0, intensity * 256.0f, 255) * 0x01010101; + return bound(0, (unsigned int)(intensity * 256.0f), 255) * 0x01010101U; } static void R_Shadow_MakeTextures(void) diff --git a/sv_main.c b/sv_main.c index 5b7c4989..c4168d2e 100644 --- a/sv_main.c +++ b/sv_main.c @@ -113,7 +113,7 @@ cvar_t sv_gameplayfix_grenadebouncedownslopes = {CF_SERVER, "sv_gameplayfix_gren cvar_t sv_gameplayfix_multiplethinksperframe = {CF_SERVER, "sv_gameplayfix_multiplethinksperframe", "1", "allows entities to think more often than the server framerate, primarily useful for very high fire rate weapons"}; cvar_t sv_gameplayfix_noairborncorpse = {CF_SERVER, "sv_gameplayfix_noairborncorpse", "1", "causes entities (corpses, items, etc) sitting ontop of moving entities (players) to fall when the moving entity (player) is no longer supporting them"}; cvar_t sv_gameplayfix_noairborncorpse_allowsuspendeditems = {CF_SERVER, "sv_gameplayfix_noairborncorpse_allowsuspendeditems", "1", "causes entities sitting ontop of objects that are instantaneously remove to float in midair (special hack to allow a common level design trick for floating items)"}; -cvar_t sv_gameplayfix_nudgeoutofsolid = {CF_SERVER, "sv_gameplayfix_nudgeoutofsolid", "0", "attempts to fix physics errors (where an object ended up in solid for some reason)"}; +cvar_t sv_gameplayfix_nudgeoutofsolid = {CF_SERVER, "sv_gameplayfix_nudgeoutofsolid", "1", "attempts to fix physics errors where an object ended up in solid for some reason, supersedes sv_gameplayfix_unstickentities"}; cvar_t sv_gameplayfix_nudgeoutofsolid_separation = {CF_SERVER, "sv_gameplayfix_nudgeoutofsolid_separation", "0.03125", "keep objects this distance apart to prevent collision issues on seams"}; cvar_t sv_gameplayfix_q2airaccelerate = {CF_SERVER, "sv_gameplayfix_q2airaccelerate", "0", "Quake2-style air acceleration"}; cvar_t sv_gameplayfix_nogravityonground = {CF_SERVER, "sv_gameplayfix_nogravityonground", "0", "turn off gravity when on ground (to get rid of sliding)"}; @@ -126,8 +126,8 @@ cvar_t sv_gameplayfix_swiminbmodels = {CF_SERVER, "sv_gameplayfix_swiminbmodels" cvar_t sv_gameplayfix_upwardvelocityclearsongroundflag = {CF_SERVER, "sv_gameplayfix_upwardvelocityclearsongroundflag", "1", "prevents monsters, items, and most other objects from being stuck to the floor when pushed around by damage, and other situations in mods"}; cvar_t sv_gameplayfix_downtracesupportsongroundflag = {CF_SERVER, "sv_gameplayfix_downtracesupportsongroundflag", "1", "prevents very short moves from clearing onground (which may make the player stick to the floor at high netfps), fixes groundentity not being set when walking onto a mover with sv_gameplayfix_nogravityonground"}; cvar_t sv_gameplayfix_q1bsptracelinereportstexture = {CF_SERVER, "sv_gameplayfix_q1bsptracelinereportstexture", "1", "enables mods to get accurate trace_texture results on q1bsp by using a surface-hitting traceline implementation rather than the standard solidbsp method, q3bsp always reports texture accurately"}; -cvar_t sv_gameplayfix_unstickplayers = {CF_SERVER, "sv_gameplayfix_unstickplayers", "1", "big hack to try and fix the rare case of MOVETYPE_WALK entities getting stuck in the world clipping hull."}; -cvar_t sv_gameplayfix_unstickentities = {CF_SERVER, "sv_gameplayfix_unstickentities", "1", "hack to check if entities are crossing world collision hull and try to move them to the right position"}; +cvar_t sv_gameplayfix_unstickplayers = {CF_SERVER, "sv_gameplayfix_unstickplayers", "0", "big hack to try and fix the rare case of MOVETYPE_WALK entities getting stuck in the world clipping hull."}; +cvar_t sv_gameplayfix_unstickentities = {CF_SERVER, "sv_gameplayfix_unstickentities", "1", "hack to check if entities are crossing world collision hull and try to move them to the right position, superseded by sv_gameplayfix_nudgeoutofsolid"}; cvar_t sv_gameplayfix_fixedcheckwatertransition = {CF_SERVER, "sv_gameplayfix_fixedcheckwatertransition", "1", "fix two very stupid bugs in SV_CheckWaterTransition when watertype is CONTENTS_EMPTY (the bugs causes waterlevel to be 1 on first frame, -1 on second frame - the fix makes it 0 on both frames)"}; cvar_t sv_gameplayfix_customstats = {CF_SERVER, "sv_gameplayfix_customstats", "0", "Disable stats higher than 220, for use by certain games such as Xonotic"}; cvar_t sv_gravity = {CF_SERVER | CF_NOTIFY, "sv_gravity","800", "how fast you fall (512 = roughly earth gravity)"}; @@ -2561,7 +2561,8 @@ double SV_Frame(double time) { sv.perf_offset_max = sv.perf_acc_offset_max; sv.perf_offset_avg = sv.perf_acc_offset / sv.perf_acc_offset_samples; - sv.perf_offset_sdev = sqrt(sv.perf_acc_offset_squared / sv.perf_acc_offset_samples - sv.perf_offset_avg * sv.perf_offset_avg); + sv.perf_offset_sdev = sv.perf_acc_offset_squared / sv.perf_acc_offset_samples - sv.perf_offset_avg * sv.perf_offset_avg; + sv.perf_offset_sdev = sv.perf_offset_sdev > 0 ? sqrt(sv.perf_offset_sdev) : 0; } if (sv.perf_lost > 0 && reporting) diff --git a/sv_phys.c b/sv_phys.c index 35bc3410..77c3bacf 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -1194,7 +1194,7 @@ If stepnormal is not NULL, the plane normal of any vertical wall hit will be sto ============ */ static float SV_Gravity (prvm_edict_t *ent); -static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink); +static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink, qbool checkstuck); #define MAX_CLIP_PLANES 5 static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float *stepnormal, int hitsupercontentsmask, int skipsupercontentsmask, int skipmaterialflagsmask, float stepheight) { @@ -1238,7 +1238,7 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float break; VectorScale(PRVM_serveredictvector(ent, velocity), time_left, push); - if(!SV_PushEntity(&trace, ent, push, false)) + if(!SV_PushEntity(&trace, ent, push, false, true)) { // we got teleported by a touch function // let's abort the move @@ -1248,7 +1248,7 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float // this code is used by MOVETYPE_WALK and MOVETYPE_STEP and SV_UnstickEntity // abort move if we're stuck in the world (and didn't make it out) - if (trace.worldstartsolid && trace.allsolid) + if (trace.worldstartsolid && trace.allsolid && trace.startdepth < 0) { VectorCopy(restore_velocity, PRVM_serveredictvector(ent, velocity)); return 3; @@ -1288,20 +1288,20 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float VectorSet(steppush, 0, 0, stepheight); VectorScale(PRVM_serveredictvector(ent, velocity), time_left, push); VectorCopy(PRVM_serveredictvector(ent, origin), org); - if(!SV_PushEntity(&steptrace, ent, steppush, false)) + if(!SV_PushEntity(&steptrace, ent, steppush, false, true)) { blocked |= 8; break; } //Con_Printf("%f %f %f : ", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2]); - if(!SV_PushEntity(&steptrace2, ent, push, false)) + if(!SV_PushEntity(&steptrace2, ent, push, false, true)) { blocked |= 8; break; } //Con_Printf("%f %f %f : ", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2]); VectorSet(steppush, 0, 0, org[2] - PRVM_serveredictvector(ent, origin)[2]); - if(!SV_PushEntity(&steptrace3, ent, steppush, false)) + if(!SV_PushEntity(&steptrace3, ent, steppush, false, true)) { blocked |= 8; break; @@ -1332,6 +1332,14 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float if (stepnormal) VectorCopy(trace.plane.normal, stepnormal); } + + // Unlike some other movetypes Quake's SV_FlyMove calls SV_Impact only after setting ONGROUND which id1 fiends rely on. + // If we stepped up (sv_gameplayfix_stepmultipletimes) this will impact the steptrace2 plane instead of the original. + if (PRVM_serveredictfloat(ent, solid) >= SOLID_TRIGGER && trace.ent) + SV_Impact(ent, &trace); + if (ent->free) + return blocked; // removed by the impact function + if (trace.fraction >= 0.001) { // actually covered some distance @@ -1552,7 +1560,7 @@ The trace struct is filled with the trace that has been done. Returns true if the push did not result in the entity being teleported by QC code. ============ */ -static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink) +static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink, qbool checkstuck) { prvm_prog_t *prog = SVVM_prog; int solid; @@ -1567,12 +1575,6 @@ static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboo VectorCopy(PRVM_serveredictvector(ent, mins), mins); VectorCopy(PRVM_serveredictvector(ent, maxs), maxs); - // move start position out of solids - if (sv_gameplayfix_nudgeoutofsolid.integer && sv_gameplayfix_nudgeoutofsolid_separation.value >= 0) - { - PHYS_NudgeOutOfSolid(prog, ent); - } - VectorCopy(PRVM_serveredictvector(ent, origin), start); VectorAdd(start, push, end); @@ -1586,9 +1588,37 @@ static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboo type = MOVE_NORMAL; *trace = SV_TraceBox(start, mins, maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent), 0, 0, collision_extendmovelength.value); - // fail the move if stuck in world - if (trace->worldstartsolid) - return true; + // abort move if we're stuck in the world (and didn't make it out) + if (trace->worldstartsolid && trace->allsolid && trace->startdepth < 0 && checkstuck) + { + // checking startdepth eliminates many false positives on Q1BSP with mod_q1bsp_polygoncollisions 0 + // but it's still not guaranteed that we're stuck in a bmodel at this point + if (sv_gameplayfix_nudgeoutofsolid.integer && sv_gameplayfix_nudgeoutofsolid_separation.value >= 0) + { + switch (PHYS_NudgeOutOfSolid(prog, ent)) + { + case 0: + Con_Printf(CON_WARN "NudgeOutOfSolid couldn't fix stuck entity %i (classname \"%s\").\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname))); + return true; // definitely stuck in a bmodel + case 1: + Con_DPrintf("NudgeOutOfSolid fixed stuck entity %i (classname \"%s\") with offset %f %f %f.\n", (int)PRVM_EDICT_TO_PROG(ent), PRVM_GetString(prog, PRVM_serveredictstring(ent, classname)), PRVM_serveredictvector(ent, origin)[0] - start[0], PRVM_serveredictvector(ent, origin)[1] - start[1], PRVM_serveredictvector(ent, origin)[2] - start[2]); + VectorCopy(PRVM_serveredictvector(ent, origin), start); + VectorAdd(start, push, end); + *trace = SV_TraceBox(start, mins, maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent), 0, 0, collision_extendmovelength.value); + + // definitely not stuck in a bmodel, move may proceed + } + } + else if (sv_gameplayfix_unstickentities.integer && SV_UnstickEntity(ent)) + { + // bones_was_here: pretty sure we can deprecate sv_gameplayfix_unstickentities, sv_gameplayfix_nudgeoutofsolid is much nicer + VectorCopy(PRVM_serveredictvector(ent, origin), start); + VectorAdd(start, push, end); + *trace = SV_TraceBox(start, mins, maxs, end, type, ent, SV_GenericHitSuperContentsMask(ent), 0, 0, collision_extendmovelength.value); + } + else + return true; // assuming stuck, bones_was_here TODO: always use PHYS_NudgeOutOfSolid (remove sv_gameplayfix_nudgeoutofsolid)? + } VectorCopy(trace->endpos, PRVM_serveredictvector(ent, origin)); @@ -1605,10 +1635,12 @@ static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboo #endif if (dolink) + { SV_LinkEdict_TouchAreaGrid(ent); - if((PRVM_serveredictfloat(ent, solid) >= SOLID_TRIGGER && trace->ent && (!((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND) || PRVM_serveredictedict(ent, groundentity) != PRVM_EDICT_TO_PROG(trace->ent)))) - SV_Impact (ent, trace); + if((PRVM_serveredictfloat(ent, solid) >= SOLID_TRIGGER && trace->ent && (!((int)PRVM_serveredictfloat(ent, flags) & FL_ONGROUND) || PRVM_serveredictedict(ent, groundentity) != PRVM_EDICT_TO_PROG(trace->ent)))) + SV_Impact (ent, trace); + } if(ent->priv.required->mark == PRVM_EDICT_MARK_SETORIGIN_CAUGHT) { @@ -1854,7 +1886,7 @@ static void SV_PushMove (prvm_edict_t *pusher, float movetime) // try moving the contacted entity PRVM_serveredictfloat(pusher, solid) = SOLID_NOT; - if(!SV_PushEntity (&trace, check, move, true)) + if(!SV_PushEntity(&trace, check, move, true, true)) { // entity "check" got teleported PRVM_serveredictvector(check, angles)[1] += trace.fraction * moveangle[1]; @@ -1886,7 +1918,7 @@ static void SV_PushMove (prvm_edict_t *pusher, float movetime) { // hack to invoke all necessary movement triggers VectorClear(move2); - if(!SV_PushEntity(&trace2, check, move2, true)) + if(!SV_PushEntity(&trace2, check, move2, true, true)) { // entity "check" got teleported continue; @@ -2371,7 +2403,7 @@ static void SV_WalkMove (prvm_edict_t *ent) // move up VectorClear (upmove); upmove[2] = sv_stepheight.value; - if(!SV_PushEntity(&trace, ent, upmove, true)) + if(!SV_PushEntity(&trace, ent, upmove, true, true)) { // we got teleported when upstepping... must abort the move return; @@ -2423,7 +2455,7 @@ static void SV_WalkMove (prvm_edict_t *ent) // move down VectorClear (downmove); downmove[2] = -sv_stepheight.value + start_velocity[2]*sv.frametime; - if(!SV_PushEntity (&downtrace, ent, downmove, true)) + if(!SV_PushEntity(&downtrace, ent, downmove, true, true)) { // we got teleported when downstepping... must abort the move return; @@ -2625,19 +2657,12 @@ void SV_Physics_Toss (prvm_edict_t *ent) { // move origin VectorScale(PRVM_serveredictvector(ent, velocity), movetime, move); - if(!SV_PushEntity(&trace, ent, move, true)) + // The buzzsaw traps in r2m6 and r2m7 use MOVETYPE_FLY and rely on moving while stuck in the world. + // Quake movetypes checked allsolid only in SV_FlyMove(). + if(!SV_PushEntity(&trace, ent, move, true, PRVM_serveredictfloat(ent, movetype) != MOVETYPE_FLY)) return; // teleported if (ent->free) return; - if (trace.bmodelstartsolid && sv_gameplayfix_unstickentities.integer) - { - // try to unstick the entity - SV_UnstickEntity(ent); - if(!SV_PushEntity(&trace, ent, move, true)) - return; // teleported - if (ent->free) - return; - } if (trace.fraction == 1) break; movetime *= 1 - min(1, trace.fraction); @@ -2925,6 +2950,7 @@ static void SV_Physics_ClientEntity_NoThink (prvm_edict_t *ent) } } +// asynchronous path void SV_Physics_ClientMove(void) { prvm_prog_t *prog = SVVM_prog; diff --git a/todo b/todo index 28e8cb6c..19c25c34 100644 --- a/todo +++ b/todo @@ -265,7 +265,6 @@ 0 optimize darkplaces renderer: get rid of attenuation texture on lights because math is faster, add fastpath for no normalmap (Lava_Croft) 1 bug darkplaces WGL client: figure out why for some people GDI input has stuttering problems with gl_finish 0 mode (Kinn, Urre, romi, Spike, Black) 1 bug darkplaces WGL/GLX/SDL client bug: if sound is unavailable (causing a freeze waiting for it to become available), the config is reset (SavageX) -1 bug darkplaces bsd filesystem: read() is failing (not returning the requested amount) on freebsd when reading files, whether actual files or in a pk3 - somehow it is still able to read the pk3 zip directory though (suminigashi, Elric) 1 bug darkplaces collisions: curve collisions sometimes catch on the lip of the edge, pushing into the curved back wall around certain jumppads in Nexuiz for example consistently gets stuck just below the ledge (HReaper) 1 bug darkplaces command: "rate", "playermodel", "playerskin", "pmodel" commands can spam server console with usage statements (Spike) 1 bug darkplaces console: when logging using log_file and log_sync 0, setting log_file back to "" does not close the file until another message is posted? @@ -1356,6 +1355,7 @@ d revelation: fix lingering glow on lightning deaths (romi) d revelation: reduce damage from weapons (romi) d sv_user.qc: figure out why looking up/down slows movement and fix it (Vermeulen) d zmodel: fix scale and origin commands (Vermeulen) +-d bug darkplaces bsd filesystem: read() is failing (not returning the requested amount) on freebsd when reading files, whether actual files or in a pk3 - somehow it is still able to read the pk3 zip directory though (suminigashi, Elric) f LordHavoc: examine .mb (Maya Binary) file from Electro and learn its format (Electro) f bug darkplaces capturevideo: cl_capturevideo 1 with sound off is not locking the framerate of a server (Vermeulen) f bug darkplaces client: decals are not sticking to submodels