fix: something idfk im tired dude

4J_Input/4J_Input.vcxproj

@@ -239,9 +239,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);$(ProjectDir)Windows64\vendor\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -249,6 +249,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <CompileAs>CompileAsCpp</CompileAs>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

4J_Profile/4J_Profile.vcxproj

@@ -121,7 +121,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
@@ -153,15 +153,16 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

4J_Profile/Windows64/4J_Profile.cpp

@@ -23,6 +23,46 @@ SOFTWARE.
 */
 
 #include "4J_Profile.h"
+#include <Windows.h>
+#include <stdio.h>
 
 C_4JProfile ProfileManager;
 
+//str1k3r - GetSettings is basically snatched from smartCMD
+void GetSettings(wchar_t *outPath, DWORD size)
+{
+    GetModuleFileNameW(NULL, outPath, size); //str1k3r - unlike smartCMD we use wide so we can handle non english characters
+    wchar_t *lastSlash = wcsrchr(outPath, '\\');
+    if (lastSlash) *(lastSlash + 1) = '\0';
+    wcsncat_s(outPath, size, L"settings.dat", _TRUNCATE);
+}
+
+void C_4JProfile::LoadSettings(void* gs, size_t gsSize)
+{
+	if (!gs || gsSize == 0) return;
+
+	wchar_t settingsPath[MAX_PATH] = {};
+	GetSettings(settingsPath, MAX_PATH);
+
+	FILE *file = NULL;
+	if (_wfopen_s(&file, settingsPath, L"rb") == 0 && file) //str1k3r - fun fact theres a version of fopen_s but for wide :3
+	{
+		fread(gs, 1, gsSize, file);
+		fclose(file);
+	}
+}
+
+void C_4JProfile::SaveSettings(void* gs, size_t gsSize)
+{
+	if (!gs || gsSize == 0) return;
+
+	wchar_t settingsPath[MAX_PATH] = {};
+	GetSettings(settingsPath, MAX_PATH);
+
+	FILE *file = NULL;
+	if (_wfopen_s(&file, settingsPath, L"wb") == 0 && file)
+	{
+		fwrite(gs, 1, gsSize, file);
+		fclose(file);
+	}
+}

4J_Render/4J_Render.vcxproj

@@ -187,9 +187,9 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -197,6 +197,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

4J_Render/Windows64/4J_Render.cpp

@@ -28,6 +28,9 @@ SOFTWARE.
 
 C4JRender RenderManager;
 
+//str1k3r - set VSync to true by default
+bool C4JRender::m_VSyncState = true;
+
 void C4JRender::Tick()
 {
 	InternalRenderManager.CBuffTick();
@@ -38,6 +41,16 @@ void C4JRender::UpdateGamma(unsigned short usGamma)
 	InternalRenderManager.UpdateGamma(usGamma);
 }
 
+void C4JRender::SetVSync(bool vs)
+{
+	m_VSyncState = vs;
+}
+
+int C4JRender::GetVSync()
+{
+	return m_VSyncState ? 1 : 0;
+}
+
 void C4JRender::MatrixMode(int type)
 {
 	InternalRenderManager.MatrixMode(type);
@@ -133,6 +146,11 @@ void C4JRender::SetClearColour(const float colourRGBA[4])
 	InternalRenderManager.SetClearColour(colourRGBA);
 }
 
+void C4JRender::setResolution(int ScreenWidth, int ScreenHeight)
+{
+	InternalRenderManager.setResolution(ScreenWidth, ScreenHeight);
+}
+
 bool C4JRender::IsWidescreen()
 {
 	return InternalRenderManager.IsWidescreen();

4J_Render/Windows64/Renderer.h

@@ -75,6 +75,7 @@ public:
     void Present();
     void Clear(int flags, D3D11_RECT *pRect);
     void SetClearColour(const float colourRGBA[4]);
+	void setResolution(int ScreenWidth, int ScreenHeight);
     bool IsWidescreen();
     bool IsHiDef();
     void CaptureThumbnail(ImageFileBuffer *pngOut);

4J_Render/Windows64/RendererCore.cpp

@@ -55,8 +55,8 @@ D3D11_PRIMITIVE_TOPOLOGY Renderer::g_topologies[C4JRender::PRIMITIVE_TYPE_COUNT]
 };
 
 static const unsigned int kVertexBufferSize = 0x100000;
-static const unsigned int kScreenGrabWidth = 1920;
+static unsigned int kScreenWidth = 1920;
-static const unsigned int kScreenGrabHeight = 1080;
+static unsigned int kScreenHeight = 1080;
 static const unsigned int kThumbnailSize = 64;
 
 static const unsigned int g_vertexStrides[C4JRender::VERTEX_TYPE_COUNT] = { 32, 16, 32, 32 };
@@ -854,14 +854,27 @@ ID3D11DeviceContext *Renderer::InitialiseContext(bool fromPresent)
     return deviceContext;
 }
 
+//str1k3r - yo fuck you 4J and your hardcoded ass game
+void Renderer::setResolution(int ScreenWidth, int ScreenHeight)
+{
+	if(kScreenHeight != ScreenHeight || kScreenWidth != ScreenWidth)
+	{
+		kScreenHeight = ScreenHeight;
+		kScreenWidth = ScreenWidth;
+	}
+}
+
 bool Renderer::IsHiDef()
 {
-    return true;
+	return (kScreenHeight >= 720 && kScreenWidth >= 1280);
 }
 
 bool Renderer::IsWidescreen()
 {
-    return true;
+    if (kScreenHeight == 0) return false;
+
+    float aspectRatio = static_cast<float>(kScreenWidth) / kScreenHeight;
+    return (aspectRatio >= 1.56f); 
 }
 
 void Renderer::Present()
@@ -872,7 +885,7 @@ void Renderer::Present()
     {
         PROFILER_SCOPE("Renderer::Present", "ScreenGrab", MP_MAGENTA);
 
-        unsigned char *linearData = new unsigned char[kScreenGrabWidth * kScreenGrabHeight * 4];
+        unsigned char *linearData = new unsigned char[kScreenWidth * kScreenHeight * 4];
 
         ID3D11Resource *backBufferResource = NULL;
         ID3D11Texture2D *backBuffer = NULL;
@@ -898,13 +911,13 @@ void Renderer::Present()
             m_pDeviceContext->Map(stagingTexture, 0, D3D11_MAP_READ_WRITE, 0, &mapped);
             const unsigned char* src = reinterpret_cast<const unsigned char*>(mapped.pData);
 
-            for (UINT y = 0; y < kScreenGrabHeight; ++y)
+            for (UINT y = 0; y < kScreenHeight; ++y)
             {
-                unsigned char *dstRow = linearData + y * kScreenGrabWidth * 4;
+                unsigned char *dstRow = linearData + y * kScreenWidth * 4;
                 const unsigned char *srcRow = src + y * mapped.RowPitch;
-                std::memcpy(dstRow, srcRow, kScreenGrabWidth * 4);
+                std::memcpy(dstRow, srcRow, kScreenWidth * 4);
 
-                for (UINT x = 0; x < kScreenGrabWidth; ++x)
+                for (UINT x = 0; x < kScreenWidth; ++x)
                     dstRow[x * 4 + 3] = 0xFF;
             }
 
@@ -926,8 +939,8 @@ void Renderer::Present()
                 UTCSysTime.wSecond);
 
         D3DXIMAGE_INFO info;
-        info.Width = kScreenGrabWidth;
+        info.Width = kScreenWidth;
-        info.Height = kScreenGrabHeight;
+        info.Height = kScreenHeight;
         SaveTextureData(fileName, &info, reinterpret_cast<int*>(linearData));
 
         delete[] linearData;
@@ -935,7 +948,7 @@ void Renderer::Present()
         m_bShouldScreenGrabNextFrame = false;
     }
 
-    m_pSwapChain->Present(1, 0);
+    m_pSwapChain->Present(C4JRender::GetVSync(), 0);
     ++presentCount;
 }
 
@@ -1046,4 +1059,3 @@ Renderer::Context &Renderer::getContext()
 {
     return *reinterpret_cast<Renderer::Context*>(TlsGetValue(Renderer::tlsIdx));
 }
-

4J_Storage/4J_Storage.vcxproj

@@ -149,15 +149,16 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

4J_XTMS/4J_XTMS.vcxproj

@@ -96,7 +96,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -126,14 +126,15 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

Headers/Windows64/4J_Profile.h

@@ -97,6 +97,10 @@ public:
 	void				ResetProfileProcessState(); // after a sign out from the primary player, call this
 	void				Tick( void );
 
+	// SETTINGS
+	void LoadSettings(void* gs, size_t gsSize);
+	void SaveSettings(void* gs, size_t gsSize);
+
 	// ACHIEVEMENTS & AWARDS
 
 	void				RegisterAward(int iAwardNumber,int iGamerconfigID, eAwardType eType, bool bLeaderboardAffected=false, 

Headers/Windows64/4J_Render.h

@@ -57,6 +57,11 @@ public:
     void Tick();
     void UpdateGamma(unsigned short usGamma);
 
+	// VSync
+	static bool m_VSyncState;
+	static void SetVSync(bool vs);
+	static int  GetVSync();
+
     // Matrix stack
     void MatrixMode(int type);
     void MatrixSetIdentity();
@@ -79,6 +84,7 @@ public:
     void Present();
     void Clear(int flags, D3D11_RECT *pRect = NULL);
     void SetClearColour(const float colourRGBA[4]);
+	void setResolution(int ScreenWidth, int ScreenHeight);
     bool IsWidescreen();
     bool IsHiDef();
     void CaptureThumbnail(ImageFileBuffer *pngOut);

README.md

@@ -1,5 +1,8 @@
 # 4JLibs-VS2012
 
+## WARNING
+This needs the [Windows 10 SDK](https://learn.microsoft.com/en-us/windows/apps/windows-sdk/downloads#windows-10) to build `4J_Render`.
+
 ## Implementation
 
 For implementation details, please look at the [IMPLEMENTATION_GUIDE.md](.gitea/IMPLEMENTATION_GUIDE.md) file