Skip to content

Commit 7e7f4fd

Browse files
committed
Moved files around and added new memory and hook files, DOESNT COMPILE
1 parent c4ea64c commit 7e7f4fd

18 files changed

+623
-31
lines changed

p2mm.vcxproj

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -514,27 +514,30 @@
514514
</PostBuildEvent>
515515
</ItemDefinitionGroup>
516516
<ItemGroup>
517-
<ClCompile Include="commands.cpp" />
518-
<ClCompile Include="discordrpc.cpp" />
519-
<ClCompile Include="globals.cpp" />
520-
<ClCompile Include="p2mm.cpp" />
521-
<ClCompile Include="scanner.cpp" />
522-
<ClCompile Include="sdk.cpp" />
523-
<ClCompile Include="vscript.cpp" />
524-
</ItemGroup>
525-
<ItemGroup>
526-
<ClInclude Include="commands.hpp" />
527517
<ClInclude Include="discord-rpc\include\discord_register.h" />
528518
<ClInclude Include="discord-rpc\include\discord_rpc.h" />
529-
<ClInclude Include="discordrpc.hpp" />
530-
<ClInclude Include="globals.hpp" />
531-
<ClInclude Include="p2mm.hpp" />
532-
<ClInclude Include="scanner.hpp" />
533-
<ClInclude Include="sdk.hpp" />
519+
<ClInclude Include="src\commands.hpp" />
520+
<ClInclude Include="src\discordrpc.hpp" />
521+
<ClInclude Include="src\globals.hpp" />
522+
<ClInclude Include="src\p2mm.hpp" />
523+
<ClInclude Include="src\sdk.hpp" />
524+
<ClInclude Include="src\utils\hook.hpp" />
525+
<ClInclude Include="src\utils\memory.hpp" />
526+
<ClInclude Include="src\utils\scanner.hpp" />
534527
</ItemGroup>
535528
<ItemGroup>
536529
<Content Include="README.md" />
537530
</ItemGroup>
531+
<ItemGroup>
532+
<ClCompile Include="src\commands.cpp" />
533+
<ClCompile Include="src\discordrpc.cpp" />
534+
<ClCompile Include="src\globals.cpp" />
535+
<ClCompile Include="src\p2mm.cpp" />
536+
<ClCompile Include="src\sdk.cpp" />
537+
<ClCompile Include="src\utils\memory.cpp" />
538+
<ClCompile Include="src\utils\scanner.cpp" />
539+
<ClCompile Include="src\vscript.cpp" />
540+
</ItemGroup>
538541
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
539542
<ImportGroup Label="ExtensionTargets">
540543
</ImportGroup>

p2mm.vcxproj.filters

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<ClCompile Include="discordrpc.cpp" />
5-
<ClCompile Include="globals.cpp" />
6-
<ClCompile Include="p2mm.cpp" />
7-
<ClCompile Include="scanner.cpp" />
8-
<ClCompile Include="vscript.cpp" />
9-
<ClCompile Include="sdk.cpp" />
10-
<ClCompile Include="commands.cpp" />
4+
<ClCompile Include="src\commands.cpp" />
5+
<ClCompile Include="src\discordrpc.cpp" />
6+
<ClCompile Include="src\globals.cpp" />
7+
<ClCompile Include="src\p2mm.cpp" />
8+
<ClCompile Include="src\sdk.cpp" />
9+
<ClCompile Include="src\utils\memory.cpp" />
10+
<ClCompile Include="src\utils\scanner.cpp" />
11+
<ClCompile Include="src\vscript.cpp" />
1112
</ItemGroup>
1213
<ItemGroup>
13-
<ClInclude Include="discordrpc.hpp" />
14-
<ClInclude Include="globals.hpp" />
15-
<ClInclude Include="p2mm.hpp" />
16-
<ClInclude Include="scanner.hpp" />
1714
<ClInclude Include="discord-rpc\include\discord_register.h">
1815
<Filter>Discord-RPC</Filter>
1916
</ClInclude>
2017
<ClInclude Include="discord-rpc\include\discord_rpc.h">
2118
<Filter>Discord-RPC</Filter>
2219
</ClInclude>
23-
<ClInclude Include="sdk.hpp" />
24-
<ClInclude Include="commands.hpp" />
20+
<ClInclude Include="src\commands.hpp" />
21+
<ClInclude Include="src\discordrpc.hpp" />
22+
<ClInclude Include="src\globals.hpp" />
23+
<ClInclude Include="src\p2mm.hpp" />
24+
<ClInclude Include="src\sdk.hpp" />
25+
<ClInclude Include="src\utils\hook.hpp" />
26+
<ClInclude Include="src\utils\memory.hpp" />
27+
<ClInclude Include="src\utils\scanner.hpp" />
2528
</ItemGroup>
2629
<ItemGroup>
2730
<Filter Include="Discord-RPC">

commands.cpp renamed to src/commands.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// Purpose: Where ConVars and ConCommands are defined and used throughout the plugin.
55
//
66
//===========================================================================//
7+
78
#include "commands.hpp"
89

910
#include "globals.hpp"
@@ -125,7 +126,7 @@ CON_COMMAND_F_COMPLETION(p2mm_map, "Starts up a P2:MM session with a requested m
125126
{
126127
if (!engineServer->IsMapValid(p2mm_lastmap.GetString()))
127128
{
128-
// Running disconnect to make the error screen appear causes the music to stop, don't let that to happen, so here it is started it again.
129+
// Running disconnect to make the error screen appear causes the music to stop, here it is started it again.
129130

130131
// Get the current act so we can start the right main menu music.
131132
int iAct = ConVarRef("ui_lastact_played").GetInt();
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

globals.hpp renamed to src/globals.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "tier2/fileutils.h"
1919
#include "irecipientfilter.h"
2020

21-
#include "scanner.hpp"
21+
#include "utils/scanner.hpp"
2222

2323
#include <comdef.h>
2424

p2mm.cpp renamed to src/p2mm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ IFileSystem* g_pFileSystem = nullptr; // Access interface for Valve's file syste
4242
//---------------------------------------------------------------------------------
4343
// The plugin is a static singleton that is exported as an interface
4444
//---------------------------------------------------------------------------------
45-
CP2MMServerPlugin g_P2MMServerPlugin;
45+
CP2MMServerPlugin* g_P2MMServerPlugin;
4646
EXPOSE_SINGLE_INTERFACE_GLOBALVAR(CP2MMServerPlugin, IServerPluginCallbacks, INTERFACEVERSION_ISERVERPLUGINCALLBACKS, g_P2MMServerPlugin);
4747

4848
// List of game events the plugin interfaces used to load each one.
File renamed without changes.

0 commit comments

Comments
 (0)