Merge branch 'dev' of https://github.com/Portal-2-Multiplayer-Mod/Portal-2-Multiplayer-Mod-Plugin into dev

Author: OrsellGit

discordrpc.cpp

@@ -302,6 +302,10 @@ bool CDiscordIntegration::StartDiscordRPC()
 		RPC.largeImageKey = "p2mmmellogo";
 		RPC.largeImageText = "Portal Stories: Mel";
 		break;
+	case (APERTURE_TAG):
+		RPC.largeImageKey = "p2mmtaglogo";
+		RPC.largeImageText = "Aperture Tag";
+		break;	
 	case (DIVINITY):
 		RPC.largeImageKey = "p2mmdivinitylogo";
 		RPC.largeImageText = "Portal: Divinity";
@@ -311,6 +315,7 @@ bool CDiscordIntegration::StartDiscordRPC()
 		RPC.largeImageText = "Portal 2";
 		break;
 	}
+
 	UpdateDiscordRPC();
 
 	DiscordLog(0, false, "Discord RPC activated!");

p2mm.cpp

@@ -186,8 +186,6 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, CreateInterface
 	{
 		this->m_iCurGameIndex = APERTURE_TAG;
 		P2MMLog(0, false, "Currently running Aperture Tag.");
-		// Unsupported...for now...
-		unsupportedGame = true;
 	}
 	else if ((FStrEq(gameMainDir, "portalreloaded")))
 	{
@@ -390,10 +388,6 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, CreateInterface
 			Memory::Rel32(Memory::Scanner::Scan(SERVERDLL, "E8 ?? ?? ?? ?? 83 C4 04 50 8B 45 10 8B 10", 1)),
 			&GetEggBotModel_hook, (void**)&GetEggBotModel_orig
 		);
-		MH_CreateHook(
-			Memory::Scanner::Scan(SERVERDLL, "55 8B EC 81 EC 10 01 00 00 53 8B 1D"),
-			&CPortal_Player__GetPlayerModelName_hook, (void**)&CPortal_Player__GetPlayerModelName_orig
-		);
 
 		// For p2mm_instantrespawn.
 		MH_CreateHook(
@@ -413,6 +407,16 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, CreateInterface
 			&UTIL_GetLocalPlayer, (void**)&UTIL_GetLocalPlayer_orig
 		);
 
+		// Game-specific hooks
+		switch (g_P2MMServerPlugin.m_iCurGameIndex)
+		{
+		case PORTAL_STORIES_MEL:
+			MH_CreateHook(
+				Memory::Scanner::Scan(SERVERDLL, "55 8B EC 81 EC 10 01 00 00 53 8B 1D"),
+				&CPortal_Player__GetPlayerModelName_hook, (void**)&CPortal_Player__GetPlayerModelName_orig
+			);
+		}
+
 		MH_EnableHook(MH_ALL_HOOKS);
 	} catch (const std::exception& ex) {
 		P2MMLog(0, false, "Failed to load plugin! :( Exception: \"%s\"", ex.what());

p2mm.sln

@@ -7,11 +7,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "p2mm", "p2mm.vcxproj", "{53
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Aperture Tag|Win32 = Aperture Tag|Win32
 		Portal 2|Win32 = Portal 2|Win32
 		Portal Stories Mel|Win32 = Portal Stories Mel|Win32
 		Vanilla|Win32 = Vanilla|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{531796FA-476D-47F1-84FA-CD3613D68536}.Aperture Tag|Win32.ActiveCfg = Aperture Tag|Win32
+		{531796FA-476D-47F1-84FA-CD3613D68536}.Aperture Tag|Win32.Build.0 = Aperture Tag|Win32
 		{531796FA-476D-47F1-84FA-CD3613D68536}.Portal 2|Win32.ActiveCfg = Portal 2|Win32
 		{531796FA-476D-47F1-84FA-CD3613D68536}.Portal 2|Win32.Build.0 = Portal 2|Win32
 		{531796FA-476D-47F1-84FA-CD3613D68536}.Portal Stories Mel|Win32.ActiveCfg = Portal Stories Mel|Win32

p2mm.vcxproj

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Aperture Tag|Win32">
+      <Configuration>Aperture Tag</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Divinity|Win32">
       <Configuration>Divinity</Configuration>
       <Platform>Win32</Platform>
@@ -30,6 +34,12 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Aperture Tag|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Divinity|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -54,6 +64,9 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Portal 2|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Aperture Tag|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Divinity|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -67,6 +80,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Portal 2|Win32'">
     <OutDir>.\Release\.\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Aperture Tag|Win32'">
+    <OutDir>.\Release\.\</OutDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Divinity|Win32'">
     <OutDir>.\Release\.\</OutDir>
   </PropertyGroup>
@@ -79,6 +95,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Portal 2|Win32'">
     <IntDir>.\Release\.\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Aperture Tag|Win32'">
+    <IntDir>.\Release\.\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Divinity|Win32'">
     <IntDir>.\Release\.\</IntDir>
   </PropertyGroup>
@@ -91,6 +110,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Portal 2|Win32'">
     <TargetName>p2mm</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Aperture Tag|Win32'">
+    <TargetName>p2mm</TargetName>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Divinity|Win32'">
     <TargetName>p2mm</TargetName>
   </PropertyGroup>
@@ -103,6 +125,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Portal 2|Win32'">
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Aperture Tag|Win32'">
+    <TargetExt>.dll</TargetExt>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Divinity|Win32'">
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
@@ -116,6 +141,10 @@
     <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\lib;</IncludePath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Aperture Tag|Win32'">
+    <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\lib;</IncludePath>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Divinity|Win32'">
     <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\lib;</IncludePath>
@@ -172,6 +201,50 @@
       </Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Aperture Tag|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>public;public\tier0;public\tier1;$(SolutionDir)\lib;discord-rpc;curl</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>VPC;RAD_TELEMETRY_DISABLED;_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;DLLNAME=p2mm;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;_MBCS;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=HL2MP;SOURCE1=1;VPCGAME=hl2mp;</PreprocessorDefinitions>
+      <StringPooling>false</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <AssemblerListingLocation>
+      </AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)/</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)/</ProgramDataBaseFileName>
+      <BrowseInformationFile>$(IntDir)/</BrowseInformationFile>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <DisableSpecificWarnings>;4316</DisableSpecificWarnings>
+      <UseFullPaths>true</UseFullPaths>
+      <ErrorReporting>Prompt</ErrorReporting>
+      <MinimalRebuild>false</MinimalRebuild>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAsManaged>false</CompileAsManaged>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>Default</LanguageStandard_C>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>lib\public;%(AdditionalLibraryDirectories);minhook\lib;curl\lib;discord-rpc\lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Normaliz.lib;Crypt32.lib;Iphlpapi.lib;Advapi32.lib;Ws2_32.lib;wldap32.lib;ole32.lib;legacy_stdio_definitions.lib;vstdlib.lib;tier0.lib;tier1.lib;tier2.lib;mathlib.lib;interfaces.lib;libMinHook-x86-v141-mtd.lib;libcurl_a.lib;discord-rpc.lib</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>libc;libcd;libcmt;libcpmt;libcpmt1</IgnoreSpecificDefaultLibraries>
+      <LinkStatus>
+      </LinkStatus>
+    </Link>
+    <PostBuildEvent>
+      <Command>IF EXIST ./copy.bat copy.bat</Command>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Divinity|Win32'">
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>