Migrated to SmSdk and 0.7.0.771 support

QuestionableM · Dec 6, 2024 · 0ba38a5 · 0ba38a5
1 parent 733837f
commit 0ba38a5
Show file tree

Hide file tree

Showing 103 changed files with 4,263 additions and 224 deletions.
diff --git a/Code/Hooks/fmod_hooks.cpp b/Code/Hooks/fmod_hooks.cpp
@@ -1,10 +1,9 @@
 #include "fmod_hooks.hpp"
 
-#include "SM/DirectoryManager.hpp"
-#include "SM/AudioManager.hpp"
-#include "SM/GameSettings.hpp"
-
-#include "win_include.hpp"
+#include <SmSdk/DirectoryManager.hpp>
+#include <SmSdk/AudioManager.hpp>
+#include <SmSdk/GameSettings.hpp>
+#include <SmSdk/win_include.hpp>
 
 #include "Utils/Console.hpp"
 #include "Utils/File.hpp"
@@ -26,7 +25,7 @@ FMOD_RESULT FakeEventDescription::setPosition(float new_position)
 
 FMOD_RESULT FakeEventDescription::updateVolume()
 {
-	return this->channel->setVolume(this->custom_volume * SM::GameSettings::GetEffectsVolume());
+	return this->channel->setVolume(this->custom_volume * GameSettings::GetEffectsVolume());
 }
 
 void FakeEventDescription::updateReverbData()
@@ -37,13 +36,13 @@ void FakeEventDescription::updateReverbData()
 
 void FakeEventDescription::playSound()
 {
-	SM::AudioManager* v_audio_mgr = SM::AudioManager::GetInstance();
-	if (!v_audio_mgr || this->isPlaying()) return;
+	AudioManager* v_pAudioMgr = AudioManager::GetInstance();
+	if (!v_pAudioMgr || this->isPlaying()) return;
 
-	if (v_audio_mgr->fmod_system->playSound(this->sound, nullptr, true, &this->channel) != FMOD_OK)
+	if (v_pAudioMgr->fmod_system->playSound(this->sound, nullptr, true, &this->channel) != FMOD_OK)
 		return;
 
-	this->channel->setVolume(SM::GameSettings::GetEffectsVolume());
+	this->channel->setVolume(GameSettings::GetEffectsVolume());
 	this->channel->set3DMinMaxDistance(this->min_distance, this->max_distance);
 	this->channel->set3DDistanceFilter(false, 1.0f, 10000.0f);
 
@@ -61,15 +60,15 @@ FMOD::Sound* SoundStorage::CreateSound(const std::string& path)
 	if (v_iter != SoundStorage::PathHashToSound.end())
 		return v_iter->second;
 
-	SM::AudioManager* v_audio_mgr = SM::AudioManager::GetInstance();
-	if (!v_audio_mgr)
+	AudioManager* v_pAudioMgr = AudioManager::GetInstance();
+	if (!v_pAudioMgr)
 	{
 		DebugErrorL("AudioManager is not initialized!");
 		return nullptr;
 	}
 
 	FMOD::Sound* v_custom_sound;
-	if (v_audio_mgr->fmod_system->createSound(path.c_str(), FMOD_ACCURATETIME, nullptr, &v_custom_sound) != FMOD_OK)
+	if (v_pAudioMgr->fmod_system->createSound(path.c_str(), FMOD_ACCURATETIME, nullptr, &v_custom_sound) != FMOD_OK)
 	{
 		DebugErrorL("Couldn't load the specified sound file: ", path);
 		return nullptr;
@@ -529,19 +528,19 @@ static FMODHookData g_fmodHookData[] =
 
 void FMODHooks::UpdateReverbProperties()
 {
-	SM::AudioManager* v_audio_mgr = SM::AudioManager::GetInstance();
-	if (!v_audio_mgr) return;
+	AudioManager* v_pAudioMgr = AudioManager::GetInstance();
+	if (!v_pAudioMgr) return;
 
 	DebugOutL("Injecting reverb properties");
 
 	FMOD_REVERB_PROPERTIES v_reverb_preset = FMOD_PRESET_MOUNTAINS;
-	v_audio_mgr->fmod_system->setReverbProperties(0, &v_reverb_preset);
+	v_pAudioMgr->fmod_system->setReverbProperties(0, &v_reverb_preset);
 	FMOD_REVERB_PROPERTIES v_reverb_preset2 = FMOD_PRESET_CAVE;
-	v_audio_mgr->fmod_system->setReverbProperties(1, &v_reverb_preset2);
+	v_pAudioMgr->fmod_system->setReverbProperties(1, &v_reverb_preset2);
 	FMOD_REVERB_PROPERTIES v_reverb_preset3 = FMOD_PRESET_GENERIC;
-	v_audio_mgr->fmod_system->setReverbProperties(2, &v_reverb_preset3);
+	v_pAudioMgr->fmod_system->setReverbProperties(2, &v_reverb_preset3);
 	FMOD_REVERB_PROPERTIES v_reverb_preset4 = FMOD_PRESET_UNDERWATER;
-	v_audio_mgr->fmod_system->setReverbProperties(3, &v_reverb_preset4);
+	v_pAudioMgr->fmod_system->setReverbProperties(3, &v_reverb_preset4);
 }
 
 void FMODHooks::Hook()

diff --git a/Code/Hooks/hooks.cpp b/Code/Hooks/hooks.cpp
@@ -2,8 +2,8 @@
 
 #include "fmod_hooks.hpp"
 
-#include "SM/DirectoryManager.hpp"
-#include "SM/AudioManager.hpp"
+#include <SmSdk/DirectoryManager.hpp>
+#include <SmSdk/AudioManager.hpp>
 
 #include "Utils/Console.hpp"
 #include "Utils/String.hpp"
@@ -145,7 +145,7 @@ void preload_sounds(const std::string& shape_set_path)
 	}
 
 	std::string v_replacement;
-	if (!SM::DirectoryManager::GetReplacement(v_key, v_replacement))
+	if (!DirectoryManager::GetReplacement(v_key, v_replacement))
 	{
 		DebugErrorL("Couldn't find a replacement for: ", shape_set_path);
 		return;

diff --git a/Code/Hooks/offsets.hpp b/Code/Hooks/offsets.hpp
@@ -1,23 +1,21 @@
 #pragma once
 
-#define GAME_VERSION 066
+#define GAME_VERSION 070771
 
 #if !defined(GAME_VERSION)
 #error GAME_VERSION must be defined!
 #endif
 
-#if GAME_VERSION == 066
+#if GAME_VERSION == 070771
+#define OFF_LOAD_SHAPESETS_FUNCTION 0x599180
+#define OFF_INIT_SHAPESET_MANAGER_FUNCTION 0x34DA90
+#define OFF_INIT_LUA_MANAGER_FUNCTION 0x54A850
+#elif GAME_VERSION == 066
 #define OFF_LOAD_SHAPESETS_FUNCTION 0x5A6A60
 #define OFF_INIT_SHAPESET_MANAGER_FUNCTION 0x359490
 #define OFF_INIT_LUA_MANAGER_FUNCTION 0x55A640
-#define OFF_AUDIO_MANAGER_PTR 0x128D720
-#define OFF_DIRECTORY_MANAGER_PTR 0x128D8F0
-#define OFF_GAME_SETTINGS_PTR 0x128D830
 #elif GAME_VERSION == 065
 #define OFF_LOAD_SHAPESETS_FUNCTION 0x5C4250
 #define OFF_INIT_SHAPESET_MANAGER_FUNCTION 0x378170
 #define OFF_INIT_LUA_MANAGER_FUNCTION 0x5784D0
-#define OFF_AUDIO_MANAGER_PTR 0x12A7710
-#define OFF_DIRECTORY_MANAGER_PTR 0x12A78F0
-#define OFF_GAME_SETTINGS_PTR 0x12A7840
 #endif
diff --git a/Code/SM/AudioManager.hpp b/Code/SM/AudioManager.hpp
diff --git a/Code/SM/DirectoryManager.hpp b/Code/SM/DirectoryManager.hpp
diff --git a/Code/SM/GameSettings.hpp b/Code/SM/GameSettings.hpp
diff --git a/Code/Utils/ConColors.hpp b/Code/Utils/ConColors.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "win_include.hpp"
+#include <SmSdk/win_include.hpp>
 
 class EngineConColor
 {

diff --git a/Code/Utils/Console.hpp b/Code/Utils/Console.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "win_include.hpp"
+#include <SmSdk/win_include.hpp>
 #include "ConColors.hpp"
 
 #include <sstream>

diff --git a/Code/Utils/String.hpp b/Code/Utils/String.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "win_include.hpp"
+#include <SmSdk/win_include.hpp>
 
 #include <cwctype>
 #include <string>

diff --git a/Code/main.cpp b/Code/main.cpp
@@ -1,11 +1,14 @@
-#include "win_include.hpp"
-#include <MinHook.h>
+#include <SmSdk/TimestampCheck.hpp>
+#include <SmSdk/win_include.hpp>
 
 #include "Hooks/fmod_hooks.hpp"
 #include "Hooks/hooks.hpp"
-
 #include "Utils/Console.hpp"
 
+#include <MinHook.h>
+
+#pragma comment(lib, "User32.lib")
+
 void dll_initialize()
 {
 	if (MH_Initialize() == MH_OK)
@@ -36,6 +39,16 @@ static bool g_mhAttached = false;
 
 void dll_attach()
 {
+	if (!SmSdk::CheckTimestamp(_SM_TIMESTAMP_070_771))
+	{
+		MessageBoxA(
+			NULL,
+			"Your game version is unsupposed by Custom Audio Extension. The current version of the mod has been built for Scrap Mechanic 0.7.0.771",
+			"Unsupported Version",
+			MB_ICONWARNING);
+		return;
+	}
+
 	if (MH_Initialize() == MH_OK)
 	{
 		g_mhInitialized = true;