From f69da4341be48046e177bf6b3fd0dfb3ec5a0fc4 Mon Sep 17 00:00:00 2001
From: Lukasz Wlasinksi <SidLuke>
Date: Mon, 28 Jun 2004 11:13:07 +0000
Subject: [PATCH] Fixed TraceLine problems after map change

---
 dlls/tfc/tfcx/CMisc.h          | 2 +-
 dlls/tfc/tfcx/moduleconfig.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/tfc/tfcx/CMisc.h b/dlls/tfc/tfcx/CMisc.h
index 57423df3..7921562b 100755
--- a/dlls/tfc/tfcx/CMisc.h
+++ b/dlls/tfc/tfcx/CMisc.h
@@ -99,7 +99,7 @@ struct weaponsVault {
 
 struct traceVault {
 	char * szName;
-	char * szTa;
+	char szTag[6];
 	int iId;
 	int iAction;
 	float fDel;
diff --git a/dlls/tfc/tfcx/moduleconfig.cpp b/dlls/tfc/tfcx/moduleconfig.cpp
index 72c776c4..d903461f 100755
--- a/dlls/tfc/tfcx/moduleconfig.cpp
+++ b/dlls/tfc/tfcx/moduleconfig.cpp
@@ -288,14 +288,14 @@ void TraceLine_Post(const float *v1, const float *v2, int fNoMonsters, edict_t *
 	else{
 		if ( e->v.owner && e->v.owner->v.flags& (FL_CLIENT | FL_FAKECLIENT) ){
 			CPlayer *pPlayer = GET_PLAYER_POINTER(e->v.owner);
-		
-			for ( int i=0;i<MAX_TRACE;i++){
-				if ( util_strncmp( traceData[i].szTa,traceData[i].start ? STRING(e->v.classname)+traceData[i].start :  STRING(e->v.classname) ,traceData[i].stop) ){
+			int i;
+			for ( i=0;i<MAX_TRACE;i++){
+				if ( util_strncmp( traceData[i].szTag,traceData[i].start ? STRING(e->v.classname)+traceData[i].start :  STRING(e->v.classname) ,traceData[i].stop) ){
 					if ( traceData[i].iAction & ACT_NADE_SHOT  ){
 						pPlayer->saveShot(traceData[i].iId);
 					}
 					if ( traceData[i].iAction & ACT_NADE_PUT ){
-						g_grenades.put(e,traceData[i].fDel,traceData[i].iId,GET_PLAYER_POINTER(e->v.owner));
+						g_grenades.put(e,traceData[i].fDel,traceData[i].iId,pPlayer);
 					}
 					break;
 				}