diff --git a/GSChaos/CChaos.cpp b/GSChaos/CChaos.cpp index 66cc97ed..3eb4c836 100644 --- a/GSChaos/CChaos.cpp +++ b/GSChaos/CChaos.cpp @@ -202,7 +202,7 @@ void CChaos::FeatureInit() RegisterChaosFeature(); RegisterChaosFeature(); RegisterChaosFeature(); - RegisterChaosFeature(); + RegisterChaosFeature(); RegisterChaosFeature(); RegisterChaosFeature(); RegisterChaosFeature(); diff --git a/GSChaos/CFeatureFakeCrash.cpp b/GSChaos/CFeatureFakeCrash.cpp deleted file mode 100644 index 9e768db0..00000000 --- a/GSChaos/CFeatureFakeCrash.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "includes.h" - -void CFeatureFakeCrash::Init() -{ - CChaosFeature::Init(); - - m_crashMessages.push_back("NUM_FOR_EDICT: bad pointer"); - m_crashMessages.push_back("Z_Free: freed a pointer without ZONEID"); - m_crashMessages.push_back("EMIT_SOUND: volume = 6996"); - m_crashMessages.push_back("Spawned a NULL entity!"); - m_crashMessages.push_back("PF_MessageEnd_I: Refusing to send user message Xash2D of 273 bytes to client, user message size limit is 192 bytes"); -} - -void CFeatureFakeCrash::ActivateFeature() -{ - CChaosFeature::ActivateFeature(); - - MessageBoxA(NULL, m_crashMessages[gChaos.GetRandomValue(0, m_crashMessages.size() - 1)].c_str(), "Fatal Error", MB_OK); -} - -void CFeatureFakeCrash::DeactivateFeature() -{ - CChaosFeature::DeactivateFeature(); -} - -const char* CFeatureFakeCrash::GetFeatureName() -{ - return "Fake Crash"; -} \ No newline at end of file diff --git a/GSChaos/CFeatureFakeCrash.h b/GSChaos/CFeatureFakeCrash.h deleted file mode 100644 index af883265..00000000 --- a/GSChaos/CFeatureFakeCrash.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright - ScriptedSnark, 2024. - * CFeatureFakeCrash.h - * - * Project (GSChaos) header file - * Authors: ScriptedSnark. - * Do not delete this comment block. Respect others' work! - */ - -#ifdef CFEATUREFAKECRASH_H_RECURSE_GUARD -#error Recursive header files inclusion detected in CFeatureFakeCrash.h -#else //CFEATUREFAKECRASH_H_RECURSE_GUARD - -#define CFEATUREFAKECRASH_H_RECURSE_GUARD - -#ifndef CFEATUREFAKECRASH_H_GUARD -#define CFEATUREFAKECRASH_H_GUARD -#pragma once - -#ifdef __cplusplus - -class CFeatureFakeCrash : public CChaosFeature -{ - void Init() override; - void ActivateFeature() override; - void DeactivateFeature() override; - const char* GetFeatureName() override; -private: - std::vector m_crashMessages; -}; - -#else //!__cplusplus -#error C++ compiler required to compile CFeatureFakeCrash.h -#endif //__cplusplus - -#endif //CFEATUREFAKECRASH_H_GUARD - -#undef CFEATUREFAKECRASH_H_RECURSE_GUARD -#endif //CFEATUREFAKECRASH_H_RECURSE_GUARD \ No newline at end of file diff --git a/GSChaos/CFeatureNothing.cpp b/GSChaos/CFeatureNothing.cpp new file mode 100644 index 00000000..4f279fff --- /dev/null +++ b/GSChaos/CFeatureNothing.cpp @@ -0,0 +1,21 @@ +#include "includes.h" + +void CFeatureNothing::Init() +{ + CChaosFeature::Init(); +} + +void CFeatureNothing::ActivateFeature() +{ + CChaosFeature::ActivateFeature(); +} + +void CFeatureNothing::DeactivateFeature() +{ + CChaosFeature::DeactivateFeature(); +} + +const char* CFeatureNothing::GetFeatureName() +{ + return "Nothing"; +} \ No newline at end of file diff --git a/GSChaos/CFeatureNothing.h b/GSChaos/CFeatureNothing.h new file mode 100644 index 00000000..9b763a50 --- /dev/null +++ b/GSChaos/CFeatureNothing.h @@ -0,0 +1,37 @@ +/** + * Copyright - ScriptedSnark, 2024. + * CFeatureNothing.h - description + * + * Project (Project desc) header file + * Authors: ScriptedSnark. + * Do not delete this comment block. Respect others' work! + */ + +#ifdef CFEATURENOTHING_H_RECURSE_GUARD +#error Recursive header files inclusion detected in CFeatureNothing.h +#else //CFEATURENOTHING_H_RECURSE_GUARD + +#define CFEATURENOTHING_H_RECURSE_GUARD + +#ifndef CFEATURENOTHING_H_GUARD +#define CFEATURENOTHING_H_GUARD +#pragma once + +#ifdef __cplusplus + +class CFeatureNothing : public CChaosFeature +{ + void Init() override; + void ActivateFeature() override; + void DeactivateFeature() override; + const char* GetFeatureName() override; +}; + +#else //!__cplusplus +#error C++ compiler required to compile CFeatureNothing.h +#endif //__cplusplus + +#endif //CFEATURENOTHING_H_GUARD + +#undef CFEATURENOTHING_H_RECURSE_GUARD +#endif //CFEATURENOTHING_H_RECURSE_GUARD \ No newline at end of file diff --git a/GSChaos/GSChaos.vcxproj b/GSChaos/GSChaos.vcxproj index 1554d996..bcef754f 100644 --- a/GSChaos/GSChaos.vcxproj +++ b/GSChaos/GSChaos.vcxproj @@ -132,7 +132,7 @@ - + @@ -226,7 +226,7 @@ - + diff --git a/GSChaos/GSChaos.vcxproj.filters b/GSChaos/GSChaos.vcxproj.filters index 89392f60..3e2dc413 100644 --- a/GSChaos/GSChaos.vcxproj.filters +++ b/GSChaos/GSChaos.vcxproj.filters @@ -71,7 +71,7 @@ Effects - + Effects @@ -301,7 +301,7 @@ Effects - + Effects diff --git a/GSChaos/includes.h b/GSChaos/includes.h index c526e202..372277cb 100644 --- a/GSChaos/includes.h +++ b/GSChaos/includes.h @@ -100,7 +100,7 @@ extern bool g_bEncrypted; #include "CFeatureZeroGravity.h" #include "CFeatureInvisibleEntities.h" #include "CFeatureOhio.h" -#include "CFeatureFakeCrash.h" +#include "CFeatureNothing.h" #include "CFeatureDarkness.h" #include "CFeatureTotem.h" #include "CFeatureForgotCSS.h" diff --git a/README.md b/README.md index eeabbc56..bbb6ee74 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ If you don't want to play with this feature, rename `twitch.ini` to `twitch_DISA > Zero Gravity > Invisible entities > Ohio -> Fake Crash +> Nothing > Darkness > Totem of Undying > Forgot to install CS 1.6 :o