Removed redundant protobuf library from the thirdparty folder

- Added missing patch definition
- Added missing quotation mark
- Updated CS:GO SDK

Author: Ayuto

src/core/modules/usermessage/csgo/usermessage_implementation.h

@@ -29,8 +29,8 @@
 
 #include "../usermessage_implementation_base.h"
 
-#include "common/protobuf-2.3.0/src/google/protobuf/message.h"
-#include "common/protobuf-2.3.0/src/google/protobuf/descriptor.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/descriptor.h"
 
 class CUserMessageImplementation : public IUsermessageImplementationBase
 {

src/core/utility/patches/engine3/patches.cpp

@@ -26,5 +26,10 @@
 
 #include "KeyValues.h"
 #ifndef PATCH_KEYVALUES_DESTRUCTOR
-#error "Make KeyValues::~KeyValues() public.
+#error "Make KeyValues::~KeyValues() public."
+#endif
+
+#include "eiface.h"
+#ifndef PATCH_SEND_USER_MESSAGE
+#error "Make IVEngineServer::SendUserMessage pure virtual."
 #endif

src/makefiles/shared.cmake

@@ -39,12 +39,6 @@ Set(DYNCALLSDK           ${THIRDPARTY_DIR}/dyncall)
 Set(DYNCALLSDK_INCLUDE   ${DYNCALLSDK}/include)
 Set(DYNCALLSDK_LIB       ${DYNCALLSDK}/lib)
 
-# ------------------------------------------------------------------
-# Protobuf specific.
-# ------------------------------------------------------------------
-Set(PROTOBUF		${THIRDPARTY_DIR}/protobuf/protobuf-2.3.0)
-Set(PROTOBUF_INCLUDE	${PROTOBUF}/src)
-
 # ------------------------------------------------------------------
 # AsmJit specific.
 # ------------------------------------------------------------------
@@ -63,6 +57,7 @@ Set(DYNAMICHOOKSSDK ${THIRDPARTY_DIR}/DynamicHooks)
 Include_Directories(
     ${SOURCESDK}
     ${SOURCESDK}/common
+    ${SOURCESDK}/common/protobuf-2.3.0/src
     ${SOURCESDK}/game/shared
     ${SOURCESDK}/game/server
     ${SOURCESDK}/public
@@ -71,7 +66,6 @@ Include_Directories(
     ${SOURCESDK}/public/engine/protobuf
     ${DYNCALLSDK_INCLUDE}
     ${BOOSTSDK_INCLUDE}
-    ${PROTOBUF_INCLUDE}
     ${ASMJITSDK_INCLUDE}
     ${DYNAMICHOOKSSDK}
     ${CMAKE_CURRENT_SOURCE_DIR}/core # Hack but required.

src/sdks/hl2sdk-csgo/.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: 5476a15192a9d365b3bde48690c1b00da494d054
-node: c5f7e17249f36210c63cb6834bd8e7cb1bd5d005
+node: 49263c6651551ad89e16fc585281bbd1579e1e5e
 branch: default
 latesttag: null
-latesttagdistance: 90
+latesttagdistance: 92

src/sdks/hl2sdk-csgo/lib/win32/debug/vs2010/libprotobuf.lib

@@ -208,6 +208,7 @@ abstract_class IVEngineServer
 	// Finish the EntityMessage and dispatch to network layer
 	virtual void		MessageEnd( void ) = 0;
 
+#define PATCH_SEND_USER_MESSAGE
 	virtual void		SendUserMessage( IRecipientFilter &filter, int message, const google::protobuf::Message &msg ) = 0;
 
 	// Print szMsg to the client console.