[Quake2world-dev] r520 - in quake2world/trunk: gtkradiant/games gtkradiant/q2w.game/default src src/game/default

[jdolan at jdolan.dyndns.org]

Author: jdolan
Date: 2009-06-06 04:49:03 +0000 (Sat, 06 Jun 2009)
New Revision: 520

Modified:
   quake2world/trunk/gtkradiant/games/q2w.game
   quake2world/trunk/gtkradiant/q2w.game/default/entities.def
   quake2world/trunk/src/cl_emit.c
   quake2world/trunk/src/game/default/g_spawn.c
Log:
Alias misc_model for misc_emit.  Add misc_model to entities.def.  Turn on .obj support in Radiant config.

Modified: quake2world/trunk/gtkradiant/games/q2w.game
===================================================================
--- quake2world/trunk/gtkradiant/games/q2w.game	2009-06-06 04:07:12 UTC (rev 519)
+++ quake2world/trunk/gtkradiant/games/q2w.game	2009-06-06 04:49:03 UTC (rev 520)
@@ -17,7 +17,7 @@
   no_bsp_monitor="1"
   archivetypes="pak"
   texturetypes="tga png jpg wal"
-  modeltypes="md2 md3"
+  modeltypes="md2 md3 obj"
   maptypes="mapq2"
   shaderpath="scripts"
   shaders="quake3"

Modified: quake2world/trunk/gtkradiant/q2w.game/default/entities.def
===================================================================
--- quake2world/trunk/gtkradiant/q2w.game/default/entities.def	2009-06-06 04:07:12 UTC (rev 519)
+++ quake2world/trunk/gtkradiant/q2w.game/default/entities.def	2009-06-06 04:49:03 UTC (rev 520)
@@ -201,7 +201,7 @@
 
 /*QUAKED weapon_supershotgun (.3 .3 1) (-16 -16 -16) (16 16 16)
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
-model="models/weapons/supershotgun/tris.md3"
+model="models/weapons/supershotgun/tris.obj"
 */
 
 
@@ -211,12 +211,6 @@
 */
 
 
-/*QUAKED weapon_lightning (.3 .3 1) (-16 -16 -16) (16 16 16)
--------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
-model="models/weapons/lightning/tris.md3"
-*/
-
-
 /*QUAKED weapon_grenadelauncher (.3 .3 1) (-16 -16 -16) (16 16 16)
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
 model="models/weapons/grenadelauncher/tris.obj"
@@ -293,7 +287,7 @@
 
 
 /*QUAKED item_adrenaline (.3 .3 1) (-16 -16 -16) (16 16 16)
-model="models/items/adrenal/tris.md2"
+model="models/powerups/adren/tris.obj"
 */
 
 
@@ -395,11 +389,10 @@
 
 /*QUAKED misc_teleporter_dest (1 0 0) (-32 -32 -24) (32 32 -16)
 Point teleporters at these.
-model="models/objects/dmspot/tris.md2"
 */
 
 
-/*QUAKED misc_emit (.8 .8 0) (-8 -8 -8) (8 8 8) ? 1
+/*QUAKED misc_emit (.8 .8 0) (-8 -8 -8) (8 8 8) ? 1 2 4 8 16 32 64
 Client sided source of particles, ambient sounds, light flashes, and static models.
 "angles"		The angles of orientation for particles emissions and static models.
 "velocity"		The directional vector for steam emissions.
@@ -408,6 +401,7 @@
 "drift"		The factor of randomized drift applied to the emission rate.
 "radius"		The radius for coronas and light flashes.
 "count"		The number of particles to emit per event.
+"scale"		The scale for a static model.
 "sound"		The sound sample to accompany events.
 "attenuation"	The sound attenuation, -1 for global.
 "flags"		Determines emit type.
@@ -422,6 +416,14 @@
 */
 
 
+*QUAKED misc_model (.8 .8 0) (-8 -8 -8) (8 8 8)
+Client sided static models.
+"angles"		The angles of orientation for particles emissions and static models.
+"scale"		The scale for a static model.
+"model"		The static model name, e.g. trees/mytree.
+*/
+
+
 /*QUAKED worldspawn (0 0 0) ?
 
 Only used for the world.
@@ -574,6 +576,6 @@
 */
 
 /*QUAKED item_quad (0.4 0.4 1.0) (-16 -16 -16) (16 16 16)
-model="models/items/quad/tris.md3"
+model="models/powerups/quad/tris.md3"
 */
 

Modified: quake2world/trunk/src/cl_emit.c
===================================================================
--- quake2world/trunk/src/cl_emit.c	2009-06-06 04:07:12 UTC (rev 519)
+++ quake2world/trunk/src/cl_emit.c	2009-06-06 04:49:03 UTC (rev 520)
@@ -218,7 +218,7 @@
 			c = Com_Parse(&ents);
 			strncpy(class, c, sizeof(class) - 1);
 
-			if(!strcmp(c, "misc_emit"))
+			if(!strcmp(c, "misc_emit") || !strcmp(c, "misc_model"))
 				emit = true;
 		}
 
@@ -284,8 +284,7 @@
 		}
 
 		if(!strcmp(c, "model")){
-			snprintf(e->model, sizeof(e->model),
-					"models/%s/tris.md3", Com_Parse(&ents));
+			strncpy(e->model, Com_Parse(&ents), sizeof(e->model));
 			e->mod = R_LoadModel(e->model);
 			continue;
 		}

Modified: quake2world/trunk/src/game/default/g_spawn.c
===================================================================
--- quake2world/trunk/src/game/default/g_spawn.c	2009-06-06 04:07:12 UTC (rev 519)
+++ quake2world/trunk/src/game/default/g_spawn.c	2009-06-06 04:49:03 UTC (rev 520)
@@ -456,8 +456,9 @@
 				continue;
 			}
 
-			// emits are client sided
-			if(!strcmp(ent->classname, "misc_emit")){
+			// emits and models are client sided
+			if(!strcmp(ent->classname, "misc_emit") ||
+					!strcmp(ent->classname, "misc_model")){
 				G_FreeEdict(ent);
 				inhibit++;
 				continue;