r686 - trunk/game

[lordhavoc at icculus.org]

Author: lordhavoc
Date: 2006-03-27 16:28:02 -0500 (Mon, 27 Mar 2006)
New Revision: 686

Modified:
   trunk/game/g_entity.c
   trunk/game/g_entityclass.c
Log:
fix two botched search/replace things I forgot to fix before committing


Modified: trunk/game/g_entity.c
===================================================================
--- trunk/game/g_entity.c	2006-03-27 09:16:27 UTC (rev 685)
+++ trunk/game/g_entity.c	2006-03-27 21:28:02 UTC (rev 686)
@@ -149,7 +149,7 @@
 
 void G_Entity_GetTransformMatrix(G_Entity *entity, NUint32 transformindex, matrix4x4_t *result)
 {
-	if (index >= 1 && index <= entity->numtransforms)
+	if (transformindex >= 1 && transformindex <= entity->numtransforms)
 		Matrix4x4_Concat(result, &entity->position.m, entity->transforms + (transformindex - 1));
 	else
 		*result = entity->position.m;
@@ -160,7 +160,7 @@
 	matrix4x4_t parentmatrix;
 	if (!entity->attachment_entity)
 		return;
-	G_Entity_GetMatrix(entity->attachment_entity, entity->attachment_index, &parentmatrix);
+	G_Entity_GetTransformMatrix(entity->attachment_entity, entity->attachment_transformindex, &parentmatrix);
 	Matrix4x4_Concat(&entity->position.m, &parentmatrix, &entity->attachment_matrix);
 	G_Entity_Relink(entity);
 }

Modified: trunk/game/g_entityclass.c
===================================================================
--- trunk/game/g_entityclass.c	2006-03-27 09:16:27 UTC (rev 685)
+++ trunk/game/g_entityclass.c	2006-03-27 21:28:02 UTC (rev 686)
@@ -387,7 +387,7 @@
 	{
 		G_PacketBuffer_WriteBool(buffer, true);
 		G_PacketBuffer_WriteEntityAsIndex(buffer, self->owner);
-		G_PacketBuffer_Write16(buffer, self->attachment_index);
+		G_PacketBuffer_Write16(buffer, self->attachment_transformindex);
 	}
 	else
 		G_PacketBuffer_WriteBool(buffer, false);
@@ -401,7 +401,7 @@
 	if (G_PacketBuffer_ReadBool(buffer))
 	{
 		self->owner = G_PacketBuffer_ReadEntityAsIndex(buffer);
-		self->attachment_index = G_PacketBuffer_Read16(buffer);
+		self->attachment_transformindex = G_PacketBuffer_Read16(buffer);
 	}
 	G_PacketBuffer_ReadClamped8(buffer, 255.0f / self->eclass->autorefire);
 }
@@ -807,25 +807,25 @@
 	CSVCOLUMNINFO("NoRemove", noremove, CSVCOLUMNFIELDTYPE_BOOL),
 	CSVCOLUMNINFO("Respawn", respawn, CSVCOLUMNFIELDTYPE_NVEC),
 	CSVCOLUMNINFO("I0C", inventory[0].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I0B", inventory[0].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I0B", inventory[0].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("I1C", inventory[1].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I1B", inventory[1].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I1B", inventory[1].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("I2C", inventory[2].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I2B", inventory[2].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I2B", inventory[2].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("I3C", inventory[3].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I3B", inventory[3].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I3B", inventory[3].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("I4C", inventory[4].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I4B", inventory[4].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I4B", inventory[4].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("I5C", inventory[5].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I5B", inventory[5].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I5B", inventory[5].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("I6C", inventory[6].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I6B", inventory[6].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I6B", inventory[6].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("I7C", inventory[7].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I7B", inventory[7].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I7B", inventory[7].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("I8C", inventory[8].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I8B", inventory[8].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I8B", inventory[8].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("I9C", inventory[9].codename, CSVCOLUMNFIELDTYPE_CHARPOINTER),
-	CSVCOLUMNINFO("I9B", inventory[9].name, CSVCOLUMNFIELDTYPE_CHARPOINTER),
+	CSVCOLUMNINFO("I9B", inventory[9].transformname, CSVCOLUMNFIELDTYPE_CHARPOINTER),
 	CSVCOLUMNINFO("AmmoMax", ammomax, CSVCOLUMNFIELDTYPE_NVEC),
 	CSVCOLUMNINFO("AmmoRegen", ammoregen, CSVCOLUMNFIELDTYPE_NVEC),
 	CSVCOLUMNINFO("Projectile", projectilecodename, CSVCOLUMNFIELDTYPE_CHARPOINTER),