V. 1.6.0

AMS21 · Jan 27, 2018 · de19218 · de19218
1 parent 8ab1857
commit de19218
Show file tree

Hide file tree

Showing 51 changed files with 2,735 additions and 1,634 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,16 +7,18 @@
 *.map
 *.obj
 *.opendb
-*.tlog
 *.rtf#
+*.ruleset
+*.tlog
 
+build/
 examples/
 src/.vs/
+src/CMakeFiles/
 src/ipch/
-build/
 
-Changelog.txt
-DevNotes.txt
 PreyRun.cppcheck
 ReadMe.rtf
+src/CMakeCache.txt
+src/CMakeLists.txt
 src/CodeMaid.config
diff --git a/Configs/PreyRun.cfg b/Configs/PreyRun.cfg
@@ -1,4 +1,4 @@
-// PreyRun V.1.0.5.1 Standard Config
+// PreyRun V1.6.0 Standard Config
 //
 
 // RTA - Real Time Attack settings

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2017 CppAndre
+Copyright (c) 2016-2018 AMS21
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -26,8 +26,8 @@ https://github.com/YaLTeR/BunnymodXT
 
 The MIT License (MIT)
 
-Copyright (c) 2014-2017 Ivan Molodetskikh
-Copyright (c) 2015-2017 Chong Jiang Wei
+Copyright (c) 2014-2018 Ivan Molodetskikh
+Copyright (c) 2015-2018 Chong Jiang Wei
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,15 +1,29 @@
-# How to install
+# PreyRun 1.6.0
+PreyRun is a speedrunning focused mod the video game Prey (2006) created by Human Head Studio.
+The mod can interact with [LiveSplit](https://livesplit.github.io/) using the [PreySplit](https://github.com/AMS21/LiveSplit.PreySplit) addon.
 
-## Installing as a mod
-- Download [PreyRun.rar](https://github.com/CppAndre/PreyRun/releases/download/V1.0.5.1/PreyRun.rar) or [PreyRun - without configs.rar](https://github.com/CppAndre/PreyRun/releases/download/V1.0.5.1/PreyRun.-.Without.Configs.rar)
-- Extract the file from the archive somewhere (game00.pk4, description.txt, ...)
+# Video of the mod in action
+[![Showcase video](http://img.youtube.com/vi/UsfWV4P1Dqc/0.jpg)](http://www.youtube.com/watch?v=UsfWV4P1Dqc)
+
+# Features
+* Automatic timing of runs without loading times
+* Timer recovery when the game should crash
+* In-game visualization of past runs called [Ghosting](https://youtu.be/Um7RdCR-3kI)
+* Extra hud elements like speedometer or the timer
+* Quality of life features like loading the most recent savegame or muting all jukeboxes
+* Utilities to make routing and testing easier
+
+For a list of all available commands and console variables have a look at the [wiki page](https://github.com/AMS21/PreyRun/wiki/Console-commands-and-variables)
+
+## Installation
+- Download [PreyRun](https://github.com/AMS21/PreyRun/releases/latest)
+- Extract the file from the archive somewhere
 - In your Prey root folder (where Prey.exe and PreyDed.exe are located) create a new folder called 'PreyRun'
 - Copy the files you have extracted previously to the newly created sub folder 'PreyRun'
 - Your folders shoud look something like [this](https://imgur.com/a/4SxWX)
 
-## Creating a shortcut
+### Creating a shortcut
 - Create a shortcut to "Prey.exe"
 - Right click on the shortcut -> Properties
 - at "Target" add "+set fs_game PreyRun" at the end
-- The "Target" field coud look like this : "D:\Prey\PREY.exe +set fs_game PreyRun"
-- Save
+- The "Target" field should look something like this : "D:\Prey\PREY.exe +set fs_game PreyRun"
diff --git a/src/2005game.vcxproj b/src/2005game.vcxproj
@@ -166,6 +166,7 @@
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <EnableCppCoreCheck>false</EnableCppCoreCheck>
+    <TargetName>gamex86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>Game\build\$(Configuration)\</OutDir>
@@ -174,14 +175,16 @@
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <EnableCppCoreCheck>false</EnableCppCoreCheck>
+    <TargetName>gamex86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug PreyRun|Win32'">
     <OutDir>Game\build\$(Configuration)\</OutDir>
     <IntDir>Game\build\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
-    <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\CustomRuleSet.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
-    <EnableCppCoreCheck>false</EnableCppCoreCheck>
+    <EnableCppCoreCheck>true</EnableCppCoreCheck>
+    <TargetName>gamex86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|Win32'">
     <OutDir>Game\build\$(Configuration)\</OutDir>
@@ -190,6 +193,7 @@
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <EnableCppCoreCheck>false</EnableCppCoreCheck>
+    <TargetName>gamex86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug with inlines and memory log|Win32'">
     <OutDir>Game\build\$(Configuration)\</OutDir>
@@ -198,6 +202,7 @@
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <EnableCppCoreCheck>false</EnableCppCoreCheck>
+    <TargetName>gamex86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Dedicated Debug with Inlines|Win32'">
     <OutDir>Game\build\$(Configuration)\</OutDir>
@@ -206,6 +211,7 @@
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <EnableCppCoreCheck>false</EnableCppCoreCheck>
+    <TargetName>gamex86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Dedicated Release|Win32'">
     <OutDir>Game\build\$(Configuration)\</OutDir>
@@ -214,6 +220,7 @@
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <EnableCppCoreCheck>false</EnableCppCoreCheck>
+    <TargetName>gamex86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug PreyRun|x64'">
     <OutDir>Game\build\$(Configuration)\x64\</OutDir>
@@ -266,11 +273,12 @@
       <UndefinePreprocessorDefinitions>NOMINMAX;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\Andre\Desktop\Dokumente\C++\Libraries\boost 32 bit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalOptions>/FIXED:no %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;..\build\$(Configuration)\idLib.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\build\$(Configuration)\gamex86.dll</OutputFile>
+      <OutputFile>$(TargetPath)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\game\game.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -317,11 +325,12 @@
       <UndefinePreprocessorDefinitions>NOMINMAX;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\Andre\Desktop\Dokumente\C++\Libraries\boost 32 bit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /fixed:no %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;..\build\$(Configuration)\idLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\build\$(Configuration)\gamex86.dll</OutputFile>
+      <OutputFile>$(TargetPath)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\game\game.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -337,12 +346,12 @@
       <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>C:\Users\Andre\Desktop\Dokumente\C++\Libraries\boost 32 bit\lib32-msvc-14.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <PostBuildEvent>
       <Message>
       </Message>
-      <Command>
-      </Command>
+      <Command>copy "$(TargetPath)" "$(ProjectDir)..\build\$(Configuration)\gamex86.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug PreyRun|Win32'">
@@ -355,7 +364,7 @@
       <PreprocessorDefinitions>_D3SDK;__DOOM__;GAME_DLL;WIN32;_WINDOWS;HUMANHEAD;_DOTNET_2005;PR_DEBUG;%(PreprocessorDefinitions);_XKEYCHECK_H</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -375,11 +384,20 @@
       <UndefinePreprocessorDefinitions>NOMINMAX;NDEBUG;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\Andre\Desktop\Dokumente\C++\Libraries\boost 32 bit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <ControlFlowGuard>false</ControlFlowGuard>
+      <FloatingPointExceptions>true</FloatingPointExceptions>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
+      <DisableSpecificWarnings>
+      </DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /fixed:no %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;..\build\$(Configuration)\idLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\build\$(Configuration)\gamex86.dll</OutputFile>
+      <OutputFile>$(TargetPath)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\game\game.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -401,7 +419,8 @@
     <PostBuildEvent>
       <Message>
       </Message>
-      <Command>copy "$(ProjectDir)..\build\$(Configuration)\gamex86.dll" "D:\Prey\base\gamex86.dll"</Command>
+      <Command>copy "$(TargetPath)" "$(ProjectDir)..\build\$(Configuration)\gamex86.dll"
+copy "$(ProjectDir)..\build\$(Configuration)\gamex86.dll" "D:\Prey\base\gamex86.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|Win32'">
@@ -429,13 +448,14 @@
       <UndefinePreprocessorDefinitions>NOMINMAX;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\Andre\Desktop\Dokumente\C++\Libraries\boost 32 bit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
       <ShowProgress>true</ShowProgress>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;..\build\$(Configuration)\idLib.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\build\$(Configuration)\gamex86.dll</OutputFile>
+      <OutputFile>$(TargetPath)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\game\game.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -483,11 +503,12 @@
       <UndefinePreprocessorDefinitions>NOMINMAX;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\Andre\Desktop\Dokumente\C++\Libraries\boost 32 bit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;..\build\$(Configuration)\idLib.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\build\$(Configuration)\gamex86.dll</OutputFile>
+      <OutputFile>$(TargetPath)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\game\game.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -534,13 +555,14 @@
       <UndefinePreprocessorDefinitions>NOMINMAX;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\Andre\Desktop\Dokumente\C++\Libraries\boost 32 bit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
       <ShowProgress>true</ShowProgress>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;..\build\$(Configuration)\idLib.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\build\$(Configuration)\gamex86.dll</OutputFile>
+      <OutputFile>$(TargetPath)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\game\game.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -587,11 +609,12 @@
       <UndefinePreprocessorDefinitions>NOMINMAX;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\Andre\Desktop\Dokumente\C++\Libraries\boost 32 bit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /fixed:no %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;..\build\$(Configuration)\idLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\build\$(Configuration)\gamex86.dll</OutputFile>
+      <OutputFile>$(TargetPath)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\game\game.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -773,18 +796,15 @@
     <ClCompile Include="game\WorldSpawn.cpp" />
     <ClCompile Include="PreyRun\AutoCmd.cpp" />
     <ClCompile Include="PreyRun\Backup.cpp" />
+    <ClCompile Include="PreyRun\Ghosting\GhostEntity.cpp" />
+    <ClCompile Include="PreyRun\Ghosting\GhostManager.cpp" />
+    <ClCompile Include="PreyRun\Ghosting\GhostRecord.cpp" />
     <ClCompile Include="PreyRun\Hooking.cpp" />
-    <ClCompile Include="PreyRun\interprocess.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with inlines|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug with inlines and memory log|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Dedicated Release|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Dedicated Debug with Inlines|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug PreyRun|Win32'">Use</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="PreyRun\GameTimer.cpp" />
+    <ClCompile Include="PreyRun\Interprocess.cpp" />
     <ClCompile Include="PreyRun\Logging.cpp" />
+    <ClCompile Include="PreyRun\Cvar.cpp" />
+    <ClCompile Include="PreyRun\Utility.cpp" />
     <ClCompile Include="Prey\ai_centurion.cpp" />
     <ClCompile Include="Prey\ai_crawler.cpp" />
     <ClCompile Include="Prey\ai_creaturex.cpp" />
@@ -2578,15 +2598,19 @@
     <ClInclude Include="PreyRun\AutoCmd.hpp" />
     <ClInclude Include="PreyRun\Backup.hpp" />
     <ClInclude Include="PreyRun\Constants.hpp" />
+    <ClInclude Include="PreyRun\Cvar.hpp" />
+    <ClInclude Include="PreyRun\Ghosting\GhostEntity.hpp" />
+    <ClInclude Include="PreyRun\Ghosting\GhostManager.hpp" />
+    <ClInclude Include="PreyRun\Ghosting\GhostRecord.hpp" />
     <ClInclude Include="PreyRun\Hooking.hpp" />
-    <ClInclude Include="PreyRun\interprocess.hpp" />
+    <ClInclude Include="PreyRun\Interprocess.hpp" />
     <ClInclude Include="PreyRun\Logging.hpp" />
     <ClInclude Include="PreyRun\Monitor.hpp" />
     <ClInclude Include="PreyRun\PreyRun.hpp" />
     <ClInclude Include="PreyRun\Random.hpp" />
-    <ClInclude Include="PreyRun\StdLib.hpp" />
     <ClInclude Include="PreyRun\GameTimer.hpp" />
     <ClInclude Include="PreyRun\Thread.hpp" />
+    <ClInclude Include="PreyRun\Utility.hpp" />
     <ClInclude Include="Prey\ai_centurion.h" />
     <ClInclude Include="Prey\ai_crawler.h" />
     <ClInclude Include="Prey\ai_creaturex.h" />