From a5a8f85764fdb9e3447a1321234d1b866b758ff4 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sat, 26 Mar 2022 01:04:20 +0100
Subject: [PATCH] Rename materialsystem to cmaterialsystem
Naming it the same as Valve did
---
r5dev/common/opcodes.cpp | 2 +-
r5dev/core/init.cpp | 3 ++-
r5dev/materialsystem/cmaterialglue.h | 3 ++-
.../{materialsystem.cpp => cmaterialsystem.cpp} | 2 +-
.../{materialsystem.h => cmaterialsystem.h} | 0
r5dev/vproj/clientsdk.vcxproj | 4 ++--
r5dev/vproj/clientsdk.vcxproj.filters | 4 ++--
r5dev/vproj/dedicated.vcxproj | 3 +++
r5dev/vproj/dedicated.vcxproj.filters | 12 ++++++++++++
r5dev/vproj/gamesdk.vcxproj | 6 ++++--
r5dev/vproj/gamesdk.vcxproj.filters | 10 ++++++++--
11 files changed, 37 insertions(+), 12 deletions(-)
rename r5dev/materialsystem/{materialsystem.cpp => cmaterialsystem.cpp} (97%)
rename r5dev/materialsystem/{materialsystem.h => cmaterialsystem.h} (100%)
diff --git a/r5dev/common/opcodes.cpp b/r5dev/common/opcodes.cpp
index 68cfa355..3ea73624 100644
--- a/r5dev/common/opcodes.cpp
+++ b/r5dev/common/opcodes.cpp
@@ -18,7 +18,7 @@
#include "game/server/fairfight_impl.h"
#include "rtech/rtech_game.h"
#include "client/cdll_engine_int.h"
-#include "materialsystem/materialsystem.h"
+#include "materialsystem/cmaterialsystem.h"
#include "studiorender/studiorendercontext.h"
#include "squirrel/sqvm.h"
#include "bsplib/bsplib.h"
diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index cef43893..fb0cd04b 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -26,7 +26,8 @@
#include "vphysics/QHull.h"
#include "bsplib/bsplib.h"
#ifndef DEDICATED
-#include "materialsystem/materialsystem.h"
+#include "materialsystem/cmaterialsystem.h"
+#include "materialsystem/cmaterialglue.h"
#include "vgui/vgui_baseui_interface.h"
#include "vgui/vgui_debugpanel.h"
#include "vgui/vgui_fpspanel.h"
diff --git a/r5dev/materialsystem/cmaterialglue.h b/r5dev/materialsystem/cmaterialglue.h
index 12d5f960..7a7b0213 100644
--- a/r5dev/materialsystem/cmaterialglue.h
+++ b/r5dev/materialsystem/cmaterialglue.h
@@ -59,7 +59,8 @@ class HCMaterialGlue : public IDetour
{
virtual void debugp()
{
-
+ std::cout << "| FUN: CMaterialGlue::GetMaterialAtCrossHair: 0x" << std::hex << std::uppercase << p_GetMaterialAtCrossHair.GetPtr() << std::setw(npad) << " |" << std::endl;
+ std::cout << "+----------------------------------------------------------------+" << std::endl;
}
};
///////////////////////////////////////////////////////////////////////////////
diff --git a/r5dev/materialsystem/materialsystem.cpp b/r5dev/materialsystem/cmaterialsystem.cpp
similarity index 97%
rename from r5dev/materialsystem/materialsystem.cpp
rename to r5dev/materialsystem/cmaterialsystem.cpp
index 749746c1..8fe513ba 100644
--- a/r5dev/materialsystem/materialsystem.cpp
+++ b/r5dev/materialsystem/cmaterialsystem.cpp
@@ -6,7 +6,7 @@
#include "core/stdafx.h"
#include "tier0/cvar.h"
#include "engine/sys_utils.h"
-#include "materialsystem/materialsystem.h"
+#include "materialsystem/cmaterialsystem.h"
//---------------------------------------------------------------------------------
// Purpose: loads and processes STBSP files
diff --git a/r5dev/materialsystem/materialsystem.h b/r5dev/materialsystem/cmaterialsystem.h
similarity index 100%
rename from r5dev/materialsystem/materialsystem.h
rename to r5dev/materialsystem/cmaterialsystem.h
diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj
index 28a8dcf0..fdb130c9 100644
--- a/r5dev/vproj/clientsdk.vcxproj
+++ b/r5dev/vproj/clientsdk.vcxproj
@@ -46,7 +46,7 @@
-
+
@@ -142,7 +142,7 @@
-
+
diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters
index fb859b9b..e3ed0487 100644
--- a/r5dev/vproj/clientsdk.vcxproj.filters
+++ b/r5dev/vproj/clientsdk.vcxproj.filters
@@ -369,7 +369,7 @@
sdk\engine
-
+
sdk\materialsystem
@@ -917,7 +917,7 @@
sdk\mathlib
-
+
sdk\materialsystem
diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj
index 31598af3..101e5820 100644
--- a/r5dev/vproj/dedicated.vcxproj
+++ b/r5dev/vproj/dedicated.vcxproj
@@ -139,6 +139,7 @@
+
@@ -164,6 +165,7 @@
+
@@ -360,6 +362,7 @@
+
diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters
index fe528fd5..39414dd8 100644
--- a/r5dev/vproj/dedicated.vcxproj.filters
+++ b/r5dev/vproj/dedicated.vcxproj.filters
@@ -133,6 +133,9 @@
{07362c29-d064-4bdb-97a6-6e3dbcdc8c02}
+
+ {3e3725c1-9a0d-44c7-86dc-8e146bb38eca}
+
@@ -807,6 +810,12 @@
sdk\rtech\stryder
+
+ sdk\engine
+
+
+ sdk\materialsystem
+
@@ -1010,6 +1019,9 @@
sdk\rtech\stryder
+
+ sdk\engine
+
diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj
index 9201a16f..a1d939bf 100644
--- a/r5dev/vproj/gamesdk.vcxproj
+++ b/r5dev/vproj/gamesdk.vcxproj
@@ -27,6 +27,7 @@
+
@@ -50,7 +51,7 @@
-
+
@@ -125,6 +126,7 @@
+
@@ -156,7 +158,7 @@
-
+
diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters
index 3fa09ec5..999d1867 100644
--- a/r5dev/vproj/gamesdk.vcxproj.filters
+++ b/r5dev/vproj/gamesdk.vcxproj.filters
@@ -393,7 +393,7 @@
sdk\engine
-
+
sdk\materialsystem
@@ -417,6 +417,9 @@
sdk\rtech\stryder
+
+ sdk\engine
+
@@ -950,7 +953,7 @@
sdk\mathlib
-
+
sdk\materialsystem
@@ -1178,6 +1181,9 @@
sdk\rtech\stryder
+
+ sdk\engine
+