Remove tweaks, update Site Rayman2 check with other languages

GliFixVf/GliFixVf.vcxproj

@@ -165,7 +165,6 @@
     <ClInclude Include="imports.h" />
     <ClInclude Include="r2fn.h" />
     <ClInclude Include="shared.h" />
-    <ClInclude Include="tweaks.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="config.c" />
@@ -175,7 +174,6 @@
     <ClCompile Include="fix.c" />
     <ClCompile Include="imports.c" />
     <ClCompile Include="r2fn.c" />
-    <ClCompile Include="tweaks.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

GliFixVf/GliFixVf.vcxproj.filters

@@ -33,9 +33,6 @@
     <ClInclude Include="config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="tweaks.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="shared.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -65,9 +62,6 @@
     <ClCompile Include="config.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="tweaks.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="fix.c">
       <Filter>Source Files</Filter>
     </ClCompile>

GliFixVf/config.c

@@ -34,9 +34,6 @@ BOOL CFG_bHalfRefRate = FALSE;
 BOOL CFG_bIsMainModuleR2 = FALSE;
 BOOL CFG_bIsFixEnabled = TRUE;
 
-BOOL CFG_bTainted = FALSE;
-tdeTweaks CFG_eTweaks = e_TWK_NoTweaks;
-
 
 /*
  * Functions
@@ -124,12 +121,6 @@ void fn_vReadFixConfig( void )
 	{
 		CFG_bHalfRefRate = TRUE;
 	}
-
-	// Tweaks
-	GetPrivateProfileString("Ray2Fix", "Tweaks", "0", szBuffer, sizeof(szBuffer), szUbiPath);
-
-	CFG_eTweaks = strtol(szBuffer, NULL, 10);
-	CFG_bTainted = CFG_eTweaks > 0;
 }
 
 void CFG_fn_vInitGlobals( void )

GliFixVf/config.h

@@ -22,9 +22,6 @@ extern BOOL CFG_bHalfRefRate;
 extern BOOL CFG_bIsMainModuleR2;
 extern BOOL CFG_bIsFixEnabled;
 
-extern BOOL CFG_bTainted;
-extern tdeTweaks CFG_eTweaks;
-
 
 /*
  * Functions

GliFixVf/dllmain.c

@@ -2,7 +2,6 @@
 #include "imports.h"
 #include "fix.h"
 #include "config.h"
-#include "tweaks.h"
 
 
 void fn_vInitDll( void )
@@ -14,9 +13,6 @@ void fn_vInitDll( void )
 	{
 		/* Loaded in the game, patch all */
 		FIX_fn_vAttachHooks();
-
-		if ( CFG_eTweaks )
-			TWK_fn_vInitTweaks();
 	}
 	else
 	{

GliFixVf/fix.c

@@ -7,13 +7,7 @@
 
 
 char *szConfigMenu = "/C:Ray2Fix Config";
-
 char szVersionString[50];
-tdstJFFTXT txtVersion = {
-	NULL,
-	5, 980, 7, 160,
-	0, 0, 0, 0, 0
-};
 
 
 /*
@@ -49,9 +43,13 @@ char * FIX_fn_szGetStringFromTextOrStringParam( void *param )
 	if ( !_stricmp(R2_fn_p_szGetLevelName(), "menu") )
 	{
 		// Part 1: Replace menu text.
-		if ( !strcmp(result, "/C:Site Rayman2") )
+		if ( !strcmp(result, "/C:Site Rayman2")
+			|| !strcmp(result, "/C:Web de Rayman2")
+			|| !strcmp(result, "/C:Sito di Rayman2")
+			|| !strcmp(result, "/C:Rayman2 - Webseite") )
 		{
-			return szConfigMenu;
+			//return szConfigMenu;
+			return szVersionString;
 		}
 
 		// Part 2: Open R2FixCfg with ShellExecute.
@@ -65,26 +63,15 @@ char * FIX_fn_szGetStringFromTextOrStringParam( void *param )
 	return result;
 }
 
-void FIX_JFFTXT_vAffiche( void *lpContext )
-{
-	R2_JFFTXT_vDrawString(lpContext, &txtVersion);
-
-	// Call original function
-	R2_JFFTXT_vAffiche(lpContext);
-}
-
 
 /*
  * Functions
  */
 
 void fn_vPreAttachHooks( void )
 {
-	if ( CFG_bTainted )
-	{
-		sprintf_s(szVersionString, sizeof(szVersionString), "/O200:%s v%s", GLI_szName, GLI_szVersion);
-		txtVersion.lpText = szVersionString;
-	}
+	//sprintf_s(szVersionString, sizeof(szVersionString), "/O200:%s v%s", GLI_szName, GLI_szVersion);
+	snprintf(szVersionString, sizeof(szVersionString), "/C:%s v%s", GLI_szName, GLI_szVersion);
 }
 
 void FIX_fn_vAttachHooks( void )
@@ -97,11 +84,6 @@ void FIX_fn_vAttachHooks( void )
 	DetourAttach((PVOID*)&R2_fn_InputEnum, (PVOID)FIX_fn_InputEnum);
 	DetourAttach((PVOID*)&R2_fn_SuspendGame, (PVOID)FIX_fn_SuspendGame);
 	DetourAttach((PVOID*)&R2_fn_szGetStringFromTextOrStringParam, (PVOID)FIX_fn_szGetStringFromTextOrStringParam);
-
-	if ( CFG_bTainted )
-	{
-		DetourAttach((PVOID*)&R2_JFFTXT_vAffiche, (PVOID)FIX_JFFTXT_vAffiche);
-	}
 
 	DetourTransactionCommit();
 }
@@ -115,11 +97,6 @@ void FIX_fn_vDetachHooks( void )
 	DetourDetach((PVOID*)&R2_fn_SuspendGame, (PVOID)FIX_fn_SuspendGame);
 	DetourDetach((PVOID*)&R2_fn_szGetStringFromTextOrStringParam, (PVOID)FIX_fn_szGetStringFromTextOrStringParam);
 
-	if ( CFG_bTainted )
-	{
-		DetourDetach((PVOID*)&R2_JFFTXT_vAffiche, (PVOID)FIX_JFFTXT_vAffiche);
-	}
-
 	DetourTransactionCommit();
 }
 

GliFixVf/r2fn.c

@@ -2,26 +2,15 @@
 #include "r2fn.h"
 
 
-/*
- * Variables
- */
-
-void *R2_lpGlobalContext = 0x5004D4;
-
-
 /*
  * Function pointers
  */
 
 DIEnumDevicesCallback R2_fn_InputEnum = 0x495170;
 BOOL (*R2_fn_SuspendGame)() = 0x4016E0;
 
-char* (*R2_fn_p_szGetLevelName)( void ) = 0x404DA0;
+char * (*R2_fn_p_szGetLevelName)( void ) = 0x404DA0;
 void (*R2_fn_vEngine)( void ) = 0x40ADA0;
-void (*R2_JFFTXT_vAffiche)( void *lpContext ) = 0x465C10;
-
-void (*R2_JFFTXT_vDrawString)( void *lpContext, tdstJFFTXT *lpTextStruct ) = 0x4660B0;
-void (*R2_GLI_vDraw2DSpriteWithPercent)(void *lpContext, float x, float y, float u, float v, void *lpTextureData) = 0x429670;
 
 char* (*R2_fn_szGetStringFromTextOrStringParam)( void *param ) = 0x4829D0;
 

GliFixVf/r2fn.h

@@ -4,50 +4,15 @@
 #include "fix.h"
 
 
-typedef struct tdstJFFTXT_
-{
-	char *lpText;
-	float X;
-	float Y;
-	float size;
-	BYTE crAlpha;
-	BYTE _byte11;
-	BYTE highlight;
-	BYTE options;
-	DWORD _dword14;
-	BYTE crHighlight;
-}
-tdstJFFTXT;
-
-typedef struct tdstVector3D_
-{
-	float X;
-	float Y;
-	float Z;
-}
-tdstVector3D;
-
-
-/*
- * Variables
- */
-
-extern void *R2_lpGlobalContext;
-
-
 /*
  * Function pointers
  */
 
 extern DIEnumDevicesCallback R2_fn_InputEnum;
 extern BOOL (*R2_fn_SuspendGame)();
 
-extern char* (*R2_fn_p_szGetLevelName)( void );
+extern char * (*R2_fn_p_szGetLevelName)( void );
 extern void (*R2_fn_vEngine)( void );
-extern void (*R2_JFFTXT_vAffiche)( void *lpContext );
-
-extern void (*R2_JFFTXT_vDrawString)( void *lpContext, tdstJFFTXT *lpTextStruct );
-extern void (*R2_GLI_vDraw2DSpriteWithPercent)( void *lpContext, float x, float y, float u, float v, void *lpTextureData );
 
 extern char* (*R2_fn_szGetStringFromTextOrStringParam)( void *param );