r692 - trunk/game

[lordhavoc at icculus.org]

Author: lordhavoc
Date: 2006-04-08 17:09:02 -0400 (Sat, 08 Apr 2006)
New Revision: 692

Modified:
   trunk/game/g_entityclass.c
   trunk/game/g_world.c
Log:
renamed turret class to vehicle_turret
spawn player above the spawn pad


Modified: trunk/game/g_entityclass.c
===================================================================
--- trunk/game/g_entityclass.c	2006-04-08 02:42:27 UTC (rev 691)
+++ trunk/game/g_entityclass.c	2006-04-08 21:09:02 UTC (rev 692)
@@ -279,23 +279,23 @@
 {
 }
 
-static void G_Object_Turret_Spawn(G_Entity *self)
+static void G_Object_Vehicle_Turret_Spawn(G_Entity *self)
 {
 }
 
-static void G_Object_Turret_Remove(G_Entity *self)
+static void G_Object_Vehicle_Turret_Remove(G_Entity *self)
 {
 }
 
-static void G_Object_Turret_Frame(G_Entity *self)
+static void G_Object_Vehicle_Turret_Frame(G_Entity *self)
 {
 }
 
-static void G_Object_Turret_WritePacket(G_Entity *self, G_PacketBuffer *buffer)
+static void G_Object_Vehicle_Turret_WritePacket(G_Entity *self, G_PacketBuffer *buffer)
 {
 }
 
-static void G_Object_Turret_ReadPacket(G_Entity *self, G_PacketBuffer *buffer, Nbool reset)
+static void G_Object_Vehicle_Turret_ReadPacket(G_Entity *self, G_PacketBuffer *buffer, Nbool reset)
 {
 }
 
@@ -682,12 +682,12 @@
 		"Provides protection from the hail of gunfire\nTODO: explain fields\n"
 	},
 	{
-		"turret",
-		G_Object_Turret_Spawn,
-		G_Object_Turret_Remove,
-		G_Object_Turret_Frame,
-		G_Object_Turret_ReadPacket,
-		G_Object_Turret_WritePacket,
+		"vehicle_turret",
+		G_Object_Vehicle_Turret_Spawn,
+		G_Object_Vehicle_Turret_Remove,
+		G_Object_Vehicle_Turret_Frame,
+		G_Object_Vehicle_Turret_ReadPacket,
+		G_Object_Vehicle_Turret_WritePacket,
 		G_SCOPE_RENDER_OPAQUE | G_SCOPE_RENDER_CASTSHADOW | G_SCOPE_RENDER_RECEIVELIGHT | G_SCOPE_BLOCK_EVERYTHING | G_SCOPE_NETWORK_RENDERABLE | G_SCOPE_NETWORK_HEARABLE,
 		"Provides a hail of gunfire\nTODO: explain fields\n"
 	},

Modified: trunk/game/g_world.c
===================================================================
--- trunk/game/g_world.c	2006-04-08 02:42:27 UTC (rev 691)
+++ trunk/game/g_world.c	2006-04-08 21:09:02 UTC (rev 692)
@@ -512,6 +512,7 @@
 		position = spot->position;
 	else
 		position = GS.identityposition;
+	position.m.m[2][3] += 2;
 	// set up player entity for this user
 	player = G_Entity_New(NULL, G_EntityClass_ByName("infantry"), &position);
 	player->localuserindex = user - GS.users;