From c7a6b796f93046ec9f2e459a8ee58fa0e34548f8 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Wed, 16 Sep 2009 05:44:24 +0000
Subject: [PATCH] - fixed: The linetarget CCMD duplicated all of the info CCMD.
 - fixed: PrintActorInfo crashed due to some incomplete implementation.

SVN r1845 (trunk)
---
 docs/rh-log.txt    |  4 ++++
 src/c_cmds.cpp     |  1 -
 src/p_3dfloors.cpp | 10 ++++++----
 src/p_3dfloors.h   |  3 ++-
 src/p_mobj.cpp     |  2 --
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 9c064977cd..75c7fd5726 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+September 16, 2009  (Changes by Graf Zahl)
+- fixed: The linetarget CCMD duplicated all of the info CCMD. 
+- fixed: PrintActorInfo crashed due to some incomplete implementation.
+
 September 15, 2009  (Changes by Graf Zahl)
 - added PinkSilver's A_Respawn enhancement patch.
 - added RandomSpawner update from Gez's experimental build.
diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp
index 3cddb6d520..ed27e2d276 100644
--- a/src/c_cmds.cpp
+++ b/src/c_cmds.cpp
@@ -778,7 +778,6 @@ CCMD(linetarget)
 			linetarget->GetClass()->TypeName.GetChars(),
 			linetarget->health,
 			linetarget->SpawnHealth());
-		PrintMiscActorInfo(linetarget);
 	}
 	else Printf("No target found\n");
 }
diff --git a/src/p_3dfloors.cpp b/src/p_3dfloors.cpp
index 29b3295e0a..d1509c6497 100644
--- a/src/p_3dfloors.cpp
+++ b/src/p_3dfloors.cpp
@@ -74,14 +74,14 @@ static void P_Add3DFloor(sector_t* sec, sector_t* sec2, line_t* master, int flag
 		ffloor->bottom.plane = &sec2->floorplane;
 		ffloor->bottom.texture = &sec2->planes[sector_t::floor].Texture;
 		ffloor->bottom.texheight = &sec2->planes[sector_t::floor].TexZ;
-		ffloor->bottom.isceiling = false;
+		ffloor->bottom.isceiling = sector_t::floor;
 	}
 	else 
 	{
 		ffloor->bottom.plane = &sec2->ceilingplane;
 		ffloor->bottom.texture = &sec2->planes[sector_t::ceiling].Texture;
 		ffloor->bottom.texheight = &sec2->planes[sector_t::ceiling].TexZ;
-		ffloor->bottom.isceiling = true;
+		ffloor->bottom.isceiling = sector_t::ceiling;
 	}
 	
 	if (!(flags&FF_FIX))
@@ -90,7 +90,7 @@ static void P_Add3DFloor(sector_t* sec, sector_t* sec2, line_t* master, int flag
 		ffloor->top.texture = &sec2->planes[sector_t::ceiling].Texture;
 		ffloor->top.texheight = &sec2->planes[sector_t::ceiling].TexZ;
 		ffloor->toplightlevel = &sec2->lightlevel;
-		ffloor->top.isceiling = true;
+		ffloor->top.isceiling = sector_t::ceiling;
 	}
 	else	// FF_FIX is a special case to patch rendering holes
 	{
@@ -98,7 +98,7 @@ static void P_Add3DFloor(sector_t* sec, sector_t* sec2, line_t* master, int flag
 		ffloor->top.texture = &sec2->planes[sector_t::floor].Texture;
 		ffloor->top.texheight = &sec2->planes[sector_t::floor].TexZ;
 		ffloor->toplightlevel = &sec->lightlevel;
-		ffloor->top.isceiling = false;
+		ffloor->top.isceiling = sector_t::floor;
 		ffloor->top.model = sec;
 	}
 
@@ -117,12 +117,14 @@ static void P_Add3DFloor(sector_t* sec, sector_t* sec2, line_t* master, int flag
 			// fortunately this plane won't be rendered - otherwise this wouldn't work...
 			ffloor->bottom.plane=&sec->floorplane;
 			ffloor->bottom.model=sec;
+			ffloor->bottom.isceiling = sector_t::floor;
 		}
 	}
 
 	ffloor->flags  = flags;
 	ffloor->master = master;
 	ffloor->alpha  = transluc;
+	ffloor->top.vindex = ffloor->bottom.vindex = -1;
 
 	// The engine cannot handle sloped translucent floors. Sorry
 	if (ffloor->top.plane->a || ffloor->top.plane->b || ffloor->bottom.plane->a || ffloor->bottom.plane->b)
diff --git a/src/p_3dfloors.h b/src/p_3dfloors.h
index 6ae29e3c32..dfaf5a5eb9 100644
--- a/src/p_3dfloors.h
+++ b/src/p_3dfloors.h
@@ -73,7 +73,8 @@ struct F3DFloor
 		const FTextureID *	texture;
 		const fixed_t *		texheight;
 		sector_t *		model;
-		bool			isceiling;
+		int				isceiling;
+		int				vindex;
 	};
 
 	planeref			bottom;
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 670672ec7d..f3313e7786 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -5503,11 +5503,9 @@ void PrintMiscActorInfo(AActor * query)
 			FIXED2FLOAT(query->wallbouncefactor), query->BounceFlags);
 		for (flagi = 0; flagi < 31; flagi++)
 			if (query->BounceFlags & 1<<flagi) Printf(" %s", flagnamesb[flagi]);
-		*/
 		Printf("\nIts render style is %i:%s with alpha %f and the following render flags:\n\tflagsr: %x", 
 			querystyle, (querystyle < STYLE_Count ? renderstyles[querystyle] : "Unknown"),
 			FIXED2FLOAT(query->alpha), query->renderflags);
-		/*
 		for (flagi = 0; flagi < 31; flagi++)
 			if (query->renderflags & 1<<flagi) Printf(" %s", flagnamesr[flagi]);
 		*/