Skip to content

The Purge - Part 2 #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dcwatson wants to merge 16 commits into
base: main
Choose a base branch
from
Open

The Purge - Part 2 #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
618ddf1
Remove CBaseObject
dcwatson Jun 17, 2025
aceaeb5
Remove PascalStrings, update parser accordingly
dcwatson Jun 17, 2025
9b0ca9c
Fix double-quote parsing
dcwatson Jun 17, 2025
23fe255
Remove dead code
dcwatson Jun 17, 2025
dec13a7
Remove files from VS project
dcwatson Jun 17, 2025
6d0322a
Merge branch 'main' into purge2
dcwatson Jun 18, 2025
e86492d
Remove CDirectObject, use constructors/destructors
dcwatson Jun 18, 2025
6ee1d9b
Move hsnd2wav to a separate repo, remove huffman classes and AudioFil…
dcwatson Jun 18, 2025
959dba4
Fix tests
dcwatson Jun 18, 2025
26cb81c
attempt at getting tests to pass by fixing some ubsan warnings
assertivist Jun 19, 2025
9597ab0
fix a few more warnings, try explicit call of CWalkerActor AdaptableS…
assertivist Jun 19, 2025
667b3b4
use regular multiplication instead of FMul in CSmart
assertivist Jun 19, 2025
77d04a9
try casting to CAbstractPlayer instead of CWalkerActor to call Adapta…
assertivist Jun 19, 2025
902e6eb
try to fix bizzare inheritance problem again
assertivist Jun 19, 2025
765b184
revert change to ResumeLevel
assertivist Jun 19, 2025
f11bdff
merge with main
assertivist Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Avara.msvc/Avara.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;NANOGUI_GLAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\src\util\huffman;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ShowIncludes>false</ShowIncludes>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard_C>stdc17</LanguageStandard_C>
Expand Down Expand Up @@ -171,7 +171,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;NANOGUI_GLAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\src\util\huffman;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc17</LanguageStandard_C>
Expand Down Expand Up @@ -211,4 +211,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
14 changes: 3 additions & 11 deletions Avara.msvc/AvaraCore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_DEBUG;NANOGUI_GLAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\src\util\huffman;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ShowIncludes>false</ShowIncludes>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
Expand All @@ -148,7 +148,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;NDEBUG;NANOGUI_GLAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\src\util\huffman;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc17</LanguageStandard_C>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand Down Expand Up @@ -180,7 +180,6 @@
<ClInclude Include="..\src\audio\CSoundMixer.h" />
<ClInclude Include="..\src\audio\OggFile.h" />
<ClInclude Include="..\src\audio\SoundSystemDefines.h" />
<ClInclude Include="..\src\base\CDirectObject.h" />
<ClInclude Include="..\src\base\CTagBase.h" />
<ClInclude Include="..\src\bsp\CBSPPart.h" />
<ClInclude Include="..\src\bsp\CBSPWorld.h" />
Expand Down Expand Up @@ -315,9 +314,6 @@
<ClInclude Include="..\src\util\CStringDictionary.h" />
<ClInclude Include="..\src\util\Debug.h" />
<ClInclude Include="..\src\util\FastMat.h" />
<ClInclude Include="..\src\util\huffman\CAbstractHuffPipe.h" />
<ClInclude Include="..\src\util\huffman\CAbstractPipe.h" />
<ClInclude Include="..\src\util\huffman\CHuffProcessor.h" />
<ClInclude Include="..\src\util\JSONify.h" />
<ClInclude Include="..\src\util\Logging.h" />
<ClInclude Include="..\src\util\RamFiles.h" />
Expand Down Expand Up @@ -391,7 +387,6 @@
<ClCompile Include="..\src\audio\CSoundMixer.cpp" />
<ClCompile Include="..\src\audio\DopplerPlug.cpp" />
<ClCompile Include="..\src\audio\OggFile.cpp" />
<ClCompile Include="..\src\base\CDirectObject.cpp" />
<ClCompile Include="..\src\base\CTagBase.cpp" />
<ClCompile Include="..\src\bsp\CBSPPart.cpp" />
<ClCompile Include="..\src\bsp\CBSPWorld.cpp" />
Expand Down Expand Up @@ -507,9 +502,6 @@
<ClCompile Include="..\src\util\CStringDictionary.cpp" />
<ClCompile Include="..\src\util\Debug.cpp" />
<ClCompile Include="..\src\util\FastMat.cpp" />
<ClCompile Include="..\src\util\huffman\CAbstractHuffPipe.cpp" />
<ClCompile Include="..\src\util\huffman\CAbstractPipe.cpp" />
<ClCompile Include="..\src\util\huffman\CHuffProcessor.cpp" />
<ClCompile Include="..\src\util\Logging.cpp" />
<ClCompile Include="..\src\util\RamFiles.cpp" />
<ClCompile Include="..\vendor\csscolorparser.cpp" />
Expand Down Expand Up @@ -546,4 +538,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
26 changes: 1 addition & 25 deletions Avara.msvc/AvaraCore.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@
<ClInclude Include="..\src\base\CTagBase.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\base\CDirectObject.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\vendor\AudioFile.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -165,21 +162,12 @@
<ClInclude Include="..\src\util\Beeper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\util\huffman\CAbstractHuffPipe.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\util\huffman\CAbstractPipe.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\util\Logging.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\util\CharWordLongPointer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\util\huffman\CHuffProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\util\CRC.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -959,9 +947,6 @@
<ClCompile Include="..\src\bsp\CBSPPart.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\base\CDirectObject.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\base\CTagBase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -1007,15 +992,6 @@
<ClCompile Include="..\vendor\nanovg\nanovg.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\util\huffman\CAbstractPipe.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\util\huffman\CHuffProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\util\huffman\CAbstractHuffPipe.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\gui\ColorManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -1140,4 +1116,4 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions Avara.msvc/Tests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_DEBUG;NANOGUI_GLAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\src\util\huffman;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ShowIncludes>false</ShowIncludes>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
Expand All @@ -140,7 +140,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;NDEBUG;NANOGUI_GLAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\src\util\huffman;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\audio;..\src\assets;..\src\base;..\src\bsp;..\src\compat;..\src\game;..\src\gui;..\src\level;..\src\net;..\src\render;..\src\tui;..\src\util;..\vendor\;..\vendor\nanogui;..\vendor\nanovg;..\vendor\pugixml;..\vendor\utf8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc17</LanguageStandard_C>
Expand All @@ -167,4 +167,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Loading
Loading