diff --git a/.gitmodules b/.gitmodules index b401c43..6f76ab7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,4 @@ url = git://github.com/nlhans/ets2-sdk-plugin.git [submodule "src/vendor/json"] path = src/vendor/json - url = git://github.com/nlohmann/json.git -[submodule "src/vendor/jitasm"] - path = src/vendor/jitasm - url = git://github.com/hikaru-i/jitasm.git + url = git://github.com/nlohmann/json.git \ No newline at end of file diff --git a/src/Smooth Interior Camera/Common.cpp b/src/Smooth Interior Camera/Common.cpp index dc12c62..503022d 100644 --- a/src/Smooth Interior Camera/Common.cpp +++ b/src/Smooth Interior Camera/Common.cpp @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Common.cpp -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Common.cpp + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #include "Common.h" diff --git a/src/Smooth Interior Camera/Common.h b/src/Smooth Interior Camera/Common.h index 5947e8f..636c995 100644 --- a/src/Smooth Interior Camera/Common.h +++ b/src/Smooth Interior Camera/Common.h @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Common.h -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Common.h + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #pragma once diff --git a/src/Smooth Interior Camera/Game/Hooks.cpp b/src/Smooth Interior Camera/Game/Hooks.cpp index 3ee9243..f4e4ee3 100644 --- a/src/Smooth Interior Camera/Game/Hooks.cpp +++ b/src/Smooth Interior Camera/Game/Hooks.cpp @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Hooks.cpp -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Hooks.cpp + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #include "Hooks.h" @@ -14,8 +10,6 @@ #include #include -#include - #include "Memory/Hooking.Patterns.h" #include "Memory/MemMgr.h" #include "Mod/Mod.h" @@ -23,6 +17,7 @@ #include "Mod/Config.h" #include "Game/prism.h" #include "Common.h" +#include "Version.h" namespace Hooks { @@ -42,7 +37,7 @@ namespace Hooks pGameCam->m_ry = pGameCam->m_ry_predef; pGameCam->m_keyboardEv = false; } - else if (g_pMod->IsConfigurating()) + else if (g_pMod->IsConfiguring()) { if (pGameCam->m_keyboardEv) { @@ -72,9 +67,9 @@ namespace Hooks { rx = Config::Get()->GetValue((Config::CameraPos)i); -#ifdef TESTING + #ifdef TESTING std::cout << "New value for '" << pGameCam->m_rx_predef << "' is '" << rx << "'\n"; -#endif + #endif break; } @@ -88,88 +83,63 @@ namespace Hooks } } - struct : jitasm::Frontend - { - uintptr_t callAddr; - - void InternalMain() override - { - push(rax); - push(rcx); - push(rdx); - push(r8); - - { - mov(rax, callAddr); - call(rax); - } - - pop(r8); - pop(rdx); - pop(rcx); - pop(rax); + uintptr_t CameraEvent_addr; - add(rsp, 0x38); - ret(); - } - } Asm_CameraEvent; +#if defined(HOOK_V1) + auto CameraEvent_pattern = "8B 81 B0 02 00 00 89 81 48 03 00 00 8B 81 B4 02 00 00 89 81 4C 03 00 00 C7 81 AC 02 00 00 00 00 00 00"; +#elif defined(HOOK_V2) + auto CameraEvent_pattern = "8B 81 B8 02 00 00 89 81 50 03 00 00 8B 81 BC 02 00 00 89 81 54 03 00 00 C7 81 B4 02 00 00 00 00 00 00"; +#endif - uintptr_t CameraEvent_addr; - uint8_t CameraEvent_pattern[] = { 0x8B, 0x81, 0xB0, 0x02, 0x00, 0x00, 0x89, 0x81, 0x48, 0x03, 0x00, 0x00, 0x8B, 0x81, 0xB4, 0x02, 0x00, 0x00, 0x89, 0x81, 0x4C, 0x03, 0x00, 0x00, 0xC7, 0x81, 0xAC, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + extern "C" + { + ptrdiff_t CameraEvent_Address = 0; + void Asm_CameraEvent(); + } bool Hook_CameraEvent() { - std::stringstream patternStr; - - for (int i = 0; i < sizeof(CameraEvent_pattern); ++i) - { - patternStr << std::setfill('0') << std::setw(2) << std::hex << static_cast(CameraEvent_pattern[i]) << " "; - } - - auto pattern = hook::pattern(static_cast(patternStr.str().c_str())); + auto pattern = hook::pattern(CameraEvent_pattern); if (pattern.size() > 0) { CameraEvent_addr = reinterpret_cast(pattern.count(1).get(0).get(0)); -#ifdef TESTING + #ifdef TESTING std::cout << "CameraEvent addr: " << std::hex << CameraEvent_addr << "\n"; -#endif + #endif - Asm_CameraEvent.callAddr = (uintptr_t)CameraEvent; - MemMgr::LongJmpHook(CameraEvent_addr, (uintptr_t)Asm_CameraEvent.GetCode()); + CameraEvent_Address = (uintptr_t)CameraEvent; + MemMgr::LongJmpHook(CameraEvent_addr, (uintptr_t)Asm_CameraEvent); return true; } else { Mod::Get()->Log(SCS_LOG_TYPE_error, "Data structure is incorrect!"); -#ifdef TESTING + #ifdef TESTING std::cout << "Hook for CameraEvent not found!\n"; -#endif + #endif return false; } } bool Init() { -#ifdef TESTING + #ifdef TESTING std::cout << "Initializing hooks...\n"; -#endif - - bool inited = true; + #endif if (!Hook_CameraEvent()) - inited = false; + return false; -#ifdef TESTING - if (inited) - std::cout << "Hooks initialized!\n"; -#endif + #ifdef TESTING + std::cout << "Hooks initialized!\n"; + #endif g_pMod = Mod::Get(); - return inited; + return true; } void Unhook() @@ -183,4 +153,4 @@ namespace Hooks memcpy((uint8_t*)CameraEvent_addr, CameraEvent_pattern, sizeof(CameraEvent_pattern)); } } -} \ No newline at end of file +} diff --git a/src/Smooth Interior Camera/Game/Hooks.h b/src/Smooth Interior Camera/Game/Hooks.h index f503613..45278d7 100644 --- a/src/Smooth Interior Camera/Game/Hooks.h +++ b/src/Smooth Interior Camera/Game/Hooks.h @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Hooks.h -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Hooks.h + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #pragma once diff --git a/src/Smooth Interior Camera/Game/HooksASM.asm b/src/Smooth Interior Camera/Game/HooksASM.asm new file mode 100644 index 0000000..7e9f615 --- /dev/null +++ b/src/Smooth Interior Camera/Game/HooksASM.asm @@ -0,0 +1,33 @@ +; ** @file HooksASM.asm +; ** @author Piotr Krupa (piotrkrupa06@gmail.com) +; ** @license MIT License +; ** + +extern CameraEvent_Address: qword + +.code + +Asm_CameraEvent PROC + + ; backup registers + push rax + push rcx + push rdx + push r8 + + ; call library function + mov rax, CameraEvent_Address + call rax + + ; restore registers + pop r8 + pop rdx + pop rcx + pop rax + + add rsp, 38h + ret + +Asm_CameraEvent ENDP + +End diff --git a/src/Smooth Interior Camera/Game/prism.h b/src/Smooth Interior Camera/Game/prism.h index 1a116b8..d337556 100644 --- a/src/Smooth Interior Camera/Game/prism.h +++ b/src/Smooth Interior Camera/Game/prism.h @@ -1,25 +1,31 @@ -/* -********************************************************************* -* File : prism.h -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file prism.h + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #pragma once +#include "Version.h" + namespace prism { - class Camera + template + class CameraBase { public: - char pad1[684]; // +0 - unsigned m_keyboardEv; // +684 - float m_rx_predef; // +688 - float m_ry_predef; // +692 - char pad3[144]; // +696 - float m_rx; // +840 main camera - float m_ry; // +844 + char pad1[Offset1]; // +0 + unsigned m_keyboardEv; // +Offset1 + float m_rx_predef; // +Offset1 + 4 + float m_ry_predef; // +Offset1 + 8 + char pad2[Offset2]; // +Offset1 + 12 + float m_rx; // +Offset2 + float m_ry; // +Offset2 + 4 }; -} \ No newline at end of file + + +#if defined(HOOK_V1) + using Camera = CameraBase<684, 144>; +#elif defined(HOOK_V2) + using Camera = CameraBase<692, 144>; +#endif +} diff --git a/src/Smooth Interior Camera/Main.cpp b/src/Smooth Interior Camera/Main.cpp index aead38e..f16c61c 100644 --- a/src/Smooth Interior Camera/Main.cpp +++ b/src/Smooth Interior Camera/Main.cpp @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Main.cpp -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Main.cpp + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #include "Mod\Mod.h" @@ -41,4 +37,4 @@ int WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; -} \ No newline at end of file +} diff --git a/src/Smooth Interior Camera/Memory/MemMgr.cpp b/src/Smooth Interior Camera/Memory/MemMgr.cpp index 5cd2ed1..5f54367 100644 --- a/src/Smooth Interior Camera/Memory/MemMgr.cpp +++ b/src/Smooth Interior Camera/Memory/MemMgr.cpp @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : MemMgr.cpp -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file MemMgr.cpp + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #include "MemMgr.h" @@ -17,7 +13,7 @@ xchg qword ptr ss:[rsp], rax ret */ -BYTE g_jmpHook[] = { 0x50, 0x48, 0xB8, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x48, 0x87, 0x04, 0x24, 0xC3 }; +unsigned char g_jmpHook[] = { 0x50, 0x48, 0xB8, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x48, 0x87, 0x04, 0x24, 0xC3 }; void MemMgr::UnprotectMemory(uintptr_t addr, size_t size) { diff --git a/src/Smooth Interior Camera/Memory/MemMgr.h b/src/Smooth Interior Camera/Memory/MemMgr.h index c71e4e8..4b77da5 100644 --- a/src/Smooth Interior Camera/Memory/MemMgr.h +++ b/src/Smooth Interior Camera/Memory/MemMgr.h @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : MemMgr.h -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file MemMgr.h + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #pragma once diff --git a/src/Smooth Interior Camera/Mod/Camera.cpp b/src/Smooth Interior Camera/Mod/Camera.cpp index e0d5ec0..edd054f 100644 --- a/src/Smooth Interior Camera/Mod/Camera.cpp +++ b/src/Smooth Interior Camera/Mod/Camera.cpp @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Camera.cpp -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Camera.cpp + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #include "Camera.h" @@ -75,7 +71,7 @@ void Camera::Pulse() if (Config::Get()->m_rotationStyle == Config::SMOOTH) { - if (abs(m_rxCurr - m_rxEnd) > m_delta / 2 && m_movingStage == 1) + if (abs(m_rxCurr - m_rxEnd) >= m_delta / 2 && m_movingStage == 1) { m_speed += m_acceleration; } diff --git a/src/Smooth Interior Camera/Mod/Camera.h b/src/Smooth Interior Camera/Mod/Camera.h index dd33df9..c05371a 100644 --- a/src/Smooth Interior Camera/Mod/Camera.h +++ b/src/Smooth Interior Camera/Mod/Camera.h @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Camera.h -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Camera.h + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #pragma once @@ -56,4 +52,3 @@ class Camera bool IsAnimation() { return m_anim; } }; - diff --git a/src/Smooth Interior Camera/Mod/Config.cpp b/src/Smooth Interior Camera/Mod/Config.cpp index 7469626..804572a 100644 --- a/src/Smooth Interior Camera/Mod/Config.cpp +++ b/src/Smooth Interior Camera/Mod/Config.cpp @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Config.cpp -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Config.cpp + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #include "Config.h" @@ -15,7 +11,6 @@ #include -#include "resource.h" #include "Common.h" #include "Mod.h" @@ -164,4 +159,4 @@ void Config::CreateDefaultFile() } Save(); -} \ No newline at end of file +} diff --git a/src/Smooth Interior Camera/Mod/Config.h b/src/Smooth Interior Camera/Mod/Config.h index 3bdc0a5..30ff764 100644 --- a/src/Smooth Interior Camera/Mod/Config.h +++ b/src/Smooth Interior Camera/Mod/Config.h @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Config.h -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Config.h + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #pragma once diff --git a/src/Smooth Interior Camera/Mod/Mod.cpp b/src/Smooth Interior Camera/Mod/Mod.cpp index 21c33a9..734f5fd 100644 --- a/src/Smooth Interior Camera/Mod/Mod.cpp +++ b/src/Smooth Interior Camera/Mod/Mod.cpp @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Mod.cpp -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Mod.cpp + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #include "Mod.h" @@ -31,7 +27,7 @@ Mod::~Mod() Hooks::Unhook(); } -int Mod::Init(scs_telemetry_init_params_v100_t* scsTelemetry) +int Mod::Init(scs_telemetry_init_params_v100_t *scsTelemetry) { #ifdef TESTING AllocConsole(); @@ -41,11 +37,8 @@ int Mod::Init(scs_telemetry_init_params_v100_t* scsTelemetry) m_logFunc = scsTelemetry->common.log; -#ifdef ATS - std::string forumLink = "https://forum.scssoft.com/viewtopic.php?t=248870"; -#elif ETS2 - std::string forumLink = "https://forum.scssoft.com/viewtopic.php?t=223989"; -#endif + const char* forumLinkETS2 = "https://forum.scssoft.com/viewtopic.php?t=223989"; + const char* forumLinkATS = "https://forum.scssoft.com/viewtopic.php?t=248870"; #ifdef TESTING std::cout << "Base address = " << std::hex << std::uppercase << reinterpret_cast(GetModuleHandle(0) - 0x000140000000) << "\n"; @@ -53,7 +46,7 @@ int Mod::Init(scs_telemetry_init_params_v100_t* scsTelemetry) if (!Hooks::Init()) { - Mod::Log(SCS_LOG_TYPE_error, "This version isn't supported! Check (%s) for updates", forumLink.c_str()); + Mod::Log(SCS_LOG_TYPE_error, "This version isn't supported! Check %s or $s for updates", forumLinkETS2, forumLinkATS); return SCS_RESULT_unsupported; } @@ -98,7 +91,6 @@ void Mod::Pulse() if (IsActive()) m_pCam->Pulse(); - if (GetAsyncKeyState(VK_INSERT)) { if (m_config.m_disableShortcuts) diff --git a/src/Smooth Interior Camera/Mod/Mod.h b/src/Smooth Interior Camera/Mod/Mod.h index 5883548..2471c6b 100644 --- a/src/Smooth Interior Camera/Mod/Mod.h +++ b/src/Smooth Interior Camera/Mod/Mod.h @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : Mod.h -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file Mod.h + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ #pragma once @@ -20,19 +16,19 @@ class Mod { private: - std::unique_ptr m_pCam; - Config m_config; - bool m_active = true; + std::unique_ptr m_pCam; + Config m_config; + bool m_active = true; - bool m_configurating = false; + bool m_configurating = false; - bool m_playing = false; + bool m_playing = false; - unsigned m_tDelay; + unsigned m_tDelay; - scs_log_t m_logFunc; + scs_log_t m_logFunc; - static Mod *s_pInst; + static Mod *s_pInst; public: Mod(); @@ -45,7 +41,7 @@ class Mod void Log(scs_log_type_t logType, const char *str, ...); bool IsActive() { return m_active; } - bool IsConfigurating() { return m_configurating; } + bool IsConfiguring() { return m_configurating; } bool IsPlaying() { return m_playing; } void DisableConfigurating(); diff --git a/src/Smooth Interior Camera/Resource.aps b/src/Smooth Interior Camera/Resource.aps deleted file mode 100644 index 0c17ebc..0000000 Binary files a/src/Smooth Interior Camera/Resource.aps and /dev/null differ diff --git a/src/Smooth Interior Camera/Resource.rc b/src/Smooth Interior Camera/Resource.rc index a32f308..aaa9566 100644 Binary files a/src/Smooth Interior Camera/Resource.rc and b/src/Smooth Interior Camera/Resource.rc differ diff --git a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj index 914472c..adcbaf0 100644 --- a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj +++ b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj @@ -1,4 +1,4 @@ - + @@ -23,7 +23,7 @@ Win32Proj - 10.0.16299.0 + 10.0.17134.0 @@ -55,7 +55,9 @@ NotSet - + + + @@ -104,7 +106,7 @@ true NDEBUG;ETS2;_WINDOWS;_USRDLL;ETS2TEST_EXPORTS;%(PreprocessorDefinitions) true - ..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;..\vendor\jitasm;.\. + ..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\. 4996 MultiThreaded stdcpp17 @@ -130,7 +132,7 @@ true TESTING;ETS2;NDEBUG;_WINDOWS;_USRDLL;ETS2TEST_EXPORTS;%(PreprocessorDefinitions) true - ..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;..\vendor\jitasm;.\. + ..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\. 4996 MultiThreaded stdcpp17 @@ -160,7 +162,7 @@ true _AFXDLL;ATS;TESTING;NDEBUG;_WINDOWS;_USRDLL;ETS2TEST_EXPORTS;%(PreprocessorDefinitions) true - ..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;..\vendor\jitasm;.\. + ..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\. 4996 MultiThreaded stdcpp17 @@ -186,7 +188,7 @@ true _AFXDLL;ATS;NDEBUG;_WINDOWS;_USRDLL;ETS2TEST_EXPORTS;%(PreprocessorDefinitions) true - ..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;..\vendor\jitasm;.\. + ..\vendor\json\src;..\vendor\ets2-sdk\scs_sdk_1_5\include;.\. 4996 MultiThreaded stdcpp17 @@ -204,12 +206,12 @@ + - @@ -223,6 +225,7 @@ + @@ -231,6 +234,11 @@ + + + - + + + \ No newline at end of file diff --git a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.filters b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.filters index 8f9bd52..c5a3b0a 100644 --- a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.filters +++ b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -86,6 +86,9 @@ Header Files\Mod + + Header Files + @@ -96,4 +99,9 @@ + + + Source Files + + \ No newline at end of file diff --git a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.user b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.user index 12a5054..a11cd7f 100644 --- a/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.user +++ b/src/Smooth Interior Camera/Smooth Interior Camera.vcxproj.user @@ -1,6 +1,6 @@  - false + true \ No newline at end of file diff --git a/src/Smooth Interior Camera/Version.h b/src/Smooth Interior Camera/Version.h new file mode 100644 index 0000000..83f9a5b --- /dev/null +++ b/src/Smooth Interior Camera/Version.h @@ -0,0 +1,10 @@ +#pragma once + +#define CURRENT_VERSION "1.2.1.0" +#define CURRENT_VERSION_SHORT 1210 +#define CURRENT_VERSION_NUMBER 1,2,1,0 + +// Hook Version +#define HOOK_V1 // for ETS2 1.27 - 1.32 and ATS 1.6+ +// #define HOOK_V2 // for ETS 1.33+ +// ... diff --git a/src/Smooth Interior Camera/resource.h b/src/Smooth Interior Camera/resource.h index d44901b..875686b 100644 --- a/src/Smooth Interior Camera/resource.h +++ b/src/Smooth Interior Camera/resource.h @@ -1,11 +1,7 @@ -/* -********************************************************************* -* File : resource.h -* Project : Smooth Interior Camera -* Developers : Piotr Krupa (piotrkrupa06@gmail.com) -* License : MIT License -********************************************************************* -*/ +/** @file resource.h + ** @author Piotr Krupa (piotrkrupa06@gmail.com) + ** @license MIT License + **/ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. @@ -14,24 +10,7 @@ // Next default values for new objects // -// define ETS2_R if compiling for ETS 2 -//#define ETS2_R -// or define ATS_R if compiling for ATS -#define ATS_R - -#define CURRENT_VERSION "1.2.0.1" -#define CURRENT_VERSION_SHORT 1201 -#define CURRENT_VERSION_NUMBER 1,2,0,1 - -#ifdef ETS2_R -#define GAME_NAME "Euro Truck Simulator 2" -#define GAME_NAME_SHORT "ets2" -#define SUPPORTED_VERSION "1.27.xs and newer" -#elif defined(ATS_R) -#define GAME_NAME "American Truck Simulator" -#define GAME_NAME_SHORT "ats" -#define SUPPORTED_VERSION "1.6.xs and newer" -#endif +#include "Version.h" #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS diff --git a/src/vendor/jitasm b/src/vendor/jitasm deleted file mode 160000 index c1dbf82..0000000 --- a/src/vendor/jitasm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c1dbf8230c7fe65487225734c995e740cfd59285