From 3f80b8d21f158712dc963fd63c4552d7989a44e4 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sun, 10 Feb 2008 03:24:25 +0000
Subject: [PATCH] - Fixed: G_StartTravel() inadvertantly removed players' TIDs.

SVN r738 (trunk)
---
 docs/rh-log.txt | 1 +
 src/g_level.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index b12a3a8da..885381f14 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,5 @@
 February 9, 2008
+- Fixed: G_StartTravel() inadvertantly removed players' TIDs.
 - Modified FLAC/share/alloc.h to define SIZE_T_MAX if it isn't defined
   already. For some reason, a stock install of MinGW doesn't define it, but
   if you compile your own GCC, it installs headers that do.
diff --git a/src/g_level.cpp b/src/g_level.cpp
index f008185ce..28abe37f1 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -2211,7 +2211,9 @@ void G_StartTravel ()
 			{
 				pawn->UnlinkFromWorld ();
 				P_DelSector_List ();
+				int tid = pawn->tid;	// Save TID
 				pawn->RemoveFromHash ();
+				pawn->tid = tid;		// Restore TID (but no longer linked into the hash chain)
 				pawn->ChangeStatNum (STAT_TRAVELLING);
 
 				for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)