diff -r eb4ad6f28c7d -r 76b7b4575e21 extensions/sdktools/vdecoder.cpp
--- a/extensions/sdktools/vdecoder.cpp	Fri Nov 14 03:38:59 2008 -0600
+++ b/extensions/sdktools/vdecoder.cpp	Fri Nov 14 09:18:30 2008 -0600
@@ -223,7 +223,7 @@
 			if (pEntity)
 			{
 				edict_t *pEdict = gameents->BaseEntityToEdict(pEntity);
-				*addr = engine->IndexOfEdict(pEdict);
+				*addr = IndexOfEdict(pEdict);
 			} else {
 				*addr = -1;
 			}
@@ -238,7 +238,7 @@
 			edict_t *pEdict = *(edict_t **)buffer;
 			if (pEdict)
 			{
-				*addr = engine->IndexOfEdict(pEdict);
+				*addr = IndexOfEdict(pEdict);
 			} else {
 				*addr = -1;
 			}
@@ -415,7 +415,7 @@
 			} else if (param == 0) {
 				if (data->decflags & VDECODE_FLAG_ALLOWWORLD)
 				{
-					pEdict = engine->PEntityOfEntIndex(0);
+					pEdict = PEntityOfEntIndex(0);
 				} else {
 					pContext->ThrowNativeError("World not allowed");
 					return Data_Fail;
@@ -479,13 +479,13 @@
 			} else if (param == 0) {
 				if (data->decflags & VDECODE_FLAG_ALLOWWORLD)
 				{
-					pEdict = engine->PEntityOfEntIndex(0);
+					pEdict = PEntityOfEntIndex(0);
 				} else {
 					pContext->ThrowNativeError("World not allowed");
 					return Data_Fail;
 				}
 			} else {
-				pEdict = engine->PEntityOfEntIndex(param);
+				pEdict = PEntityOfEntIndex(param);
 				if (!pEdict || pEdict->IsFree())
 				{
 					pContext->ThrowNativeError("Entity %d is not valid or is freed", param);
@@ -547,13 +547,13 @@
 			} else if (param == 0) {
 				if (data->decflags & VDECODE_FLAG_ALLOWWORLD)
 				{
-					pEdict = engine->PEntityOfEntIndex(0);
+					pEdict = PEntityOfEntIndex(0);
 				} else {
 					pContext->ThrowNativeError("World not allowed");
 					return Data_Fail;
 				}
 			} else {
-				pEdict = engine->PEntityOfEntIndex(param);
+				pEdict = PEntityOfEntIndex(param);
 				if (!pEdict || pEdict->IsFree())
 				{
 					pContext->ThrowNativeError("Entity %d is not valid or is freed", param);