From 136873b9ea59e54bf0f3f9c6a8aa22006b65df78 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Fri, 25 Jun 2004 20:51:48 +0000
Subject: [PATCH] Fixed meta set bug in ServerActivate Added linux options to
 pvPrivateData natives

---
 dlls/engine/amxxapi.cpp   |  2 ++
 dlls/engine/engine.vcproj |  2 +-
 dlls/engine/entity.cpp    | 16 ++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dlls/engine/amxxapi.cpp b/dlls/engine/amxxapi.cpp
index 9fdc578d..4fe47111 100755
--- a/dlls/engine/amxxapi.cpp
+++ b/dlls/engine/amxxapi.cpp
@@ -138,6 +138,8 @@ void ServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
 		msgHooks[i] = 0;
 		msgBlocks[i] = 0;
 	}
+
+	RETURN_META(MRES_IGNORED);
 }
 
 void LightStyle(int style, char *val) {
diff --git a/dlls/engine/engine.vcproj b/dlls/engine/engine.vcproj
index 6380e278..149a6315 100755
--- a/dlls/engine/engine.vcproj
+++ b/dlls/engine/engine.vcproj
@@ -77,7 +77,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/engine.dll"
+				OutputFile="$(OutDir)/engine_amxx.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/dlls/engine/entity.cpp b/dlls/engine/entity.cpp
index 202d373f..64796b0b 100755
--- a/dlls/engine/entity.cpp
+++ b/dlls/engine/entity.cpp
@@ -1351,7 +1351,7 @@ static cell AMX_NATIVE_CALL get_offset_short(AMX *amx, cell *params)
 
 	edict_t *pEnt = INDEXENT(idx);
 #ifdef __linux__
-	off += 5;
+	off += params[3];
 #endif
 
 	return *((short *)pEnt->pvPrivateData + off);
@@ -1369,7 +1369,7 @@ static cell AMX_NATIVE_CALL set_offset_short(AMX *amx, cell *params)
 
 	edict_t *pEnt = INDEXENT(idx);
 #ifdef __linux__
-	off += 5;
+	off += params[3];
 #endif
 	
 	*((short *)pEnt->pvPrivateData + off) = (short)params[3];
@@ -1389,7 +1389,7 @@ static cell AMX_NATIVE_CALL get_offset_char(AMX *amx, cell *params)
 
 	edict_t *pEnt = INDEXENT(idx);
 #ifdef __linux__
-	off += 5;
+	off += params[3];
 #endif
 	
 	char r = *((char *)pEnt->pvPrivateData + off);
@@ -1408,7 +1408,7 @@ static cell AMX_NATIVE_CALL set_offset_char(AMX *amx, cell *params)
 
 	edict_t *pEnt = INDEXENT(idx);
 #ifdef __linux__
-	off += 5;
+	off += params[3];
 #endif
 	
 	char data = params[3];
@@ -1429,7 +1429,7 @@ static cell AMX_NATIVE_CALL get_offset_int(AMX *amx, cell *params)
 
 	edict_t *pEnt = INDEXENT(idx);
 #ifdef __linux__
-	off += 5;
+	off += params[3];
 #endif
 	
 	return *((int *)pEnt->pvPrivateData + off);
@@ -1447,7 +1447,7 @@ static cell AMX_NATIVE_CALL set_offset_int(AMX *amx, cell *params)
 
 	edict_t *pEnt = INDEXENT(idx);
 #ifdef __linux__
-	off += 5;
+	off += params[3];
 #endif
 	
 	*((int *)pEnt->pvPrivateData + off) = params[3];
@@ -1467,7 +1467,7 @@ static cell AMX_NATIVE_CALL get_offset_float(AMX *amx, cell *params)
 
 	edict_t *pEnt = INDEXENT(idx);
 #ifdef __linux__
-	off += 5;
+	off += params[3];
 #endif
 	
    REAL fRet = (REAL)(*((REAL*)pEnt->pvPrivateData + off));
@@ -1487,7 +1487,7 @@ static cell AMX_NATIVE_CALL set_offset_float(AMX *amx, cell *params)
 
 	edict_t *pEnt = INDEXENT(idx);
 #ifdef __linux__
-	off += 5;
+	off += params[3];
 #endif
 	
 	REAL fVal = amx_ctof(params[3]);