Weapons Of Destruction, version 6.05.

Source-code release only.
Bug fixes.

Author: ulatekh

Makefile

@@ -0,0 +1,129 @@
+CFLAGS = -O -Dstricmp=Q_stricmp -D__cdecl=
+LDFLAGS = -S
+
+ORIGDIR=Source
+
+OBJS = dwm.o g_ai.o g_chase.o g_cmds.o g_combat.o g_func.o g_items.o \
+	g_main.o g_misc.o g_monster.o g_phys.o g_team.o g_save.o g_spawn.o \
+	g_svcmds.o g_target.o g_trigger.o g_turret.o g_utils.o g_weapon.o \
+	jetpack.o kamikaze.o lasertrip.o lsight.o m_actor.o m_berserk.o \
+	m_boss2.o m_boss3.o m_boss31.o m_boss32.o m_brain.o m_chick.o \
+	m_flash.o m_flipper.o m_float.o m_flyer.o m_gladiator.o m_gunner.o \
+	m_hover.o m_infantry.o m_insane.o m_medic.o m_move.o m_mutant.o \
+	m_parasite.o m_soldier.o m_supertank.o m_tank.o maplist.o \
+	p_client.o p_hook.o p_hud.o p_menu.o p_trail.o p_view.o p_weapon.o \
+	q_shared.o s_cam.o scanner.o wf_decoy.o x_fbomb.o x_fire.o
+
+gamei386.so: $(OBJS)
+	ld -o $@ $(OBJS) -shared $(LDFLAGS); chmod 0755 $@
+
+clean:
+	/bin/rm -f $(OBJS) gamei386.so
+
+$*.o: $*.c
+	$(CC) $(CFLAGS) -c $*.c
+
+$*.c: $(ORIGDIR)/$*.c
+	tr -d '\015' < $(ORIGDIR)/$*.c > $*.c
+
+$*.h: $(ORIGDIR)/$*.h
+	tr -d '\015' < $(ORIGDIR)/$*.h > $*.h
+
+# DO NOT DELETE
+
+dwm.o: g_local.h q_shared.h game.h
+g_ai.o: g_local.h q_shared.h game.h
+g_cmds.o: g_local.h q_shared.h game.h m_player.h
+g_combat.o: g_local.h q_shared.h game.h
+g_func.o: g_local.h q_shared.h game.h
+g_items.o: g_local.h q_shared.h game.h
+g_main.o: g_local.h q_shared.h game.h
+g_misc.o: g_local.h q_shared.h game.h
+g_monster.o: g_local.h q_shared.h game.h
+g_phys.o: g_local.h q_shared.h game.h
+g_save.o: g_local.h q_shared.h game.h
+g_spawn.o: g_local.h q_shared.h game.h
+g_svcmds.o: g_local.h q_shared.h game.h
+g_target.o: g_local.h q_shared.h game.h
+g_trigger.o: g_local.h q_shared.h game.h
+g_turret.o: g_local.h q_shared.h game.h
+g_utils.o: g_local.h q_shared.h game.h
+g_weapon.o: g_local.h q_shared.h game.h
+jetpack.o: g_local.h q_shared.h game.h
+kamikaze.o: g_local.h q_shared.h game.h
+laser.o: g_local.h q_shared.h game.h
+lsight.o: g_local.h q_shared.h game.h
+m_actor.o: g_local.h q_shared.h game.h m_actor.h
+m_berserk.o: g_local.h q_shared.h game.h m_berserk.h
+m_boss2.o: g_local.h q_shared.h
+m_boss2.o: game.h m_boss2.h
+m_boss3.o: g_local.h q_shared.h
+m_boss3.o: game.h m_boss32.h
+m_boss31.o: g_local.h q_shared.h
+m_boss31.o: game.h m_boss31.h
+m_boss32.o: g_local.h q_shared.h
+m_boss32.o: game.h m_boss32.h
+m_brain.o: g_local.h q_shared.h
+m_brain.o: game.h m_brain.h
+m_chick.o: g_local.h q_shared.h
+m_chick.o: game.h m_chick.h
+m_flash.o: q_shared.h
+m_flipper.o: g_local.h q_shared.h
+m_flipper.o: game.h
+m_flipper.o: m_flipper.h
+m_float.o: g_local.h q_shared.h
+m_float.o: game.h m_float.h
+m_flyer.o: g_local.h q_shared.h
+m_flyer.o: game.h m_flyer.h
+m_gladiator.o: g_local.h q_shared.h
+m_gladiator.o: game.h m_gladiator.h
+m_gunner.o: g_local.h q_shared.h
+m_gunner.o: game.h m_gunner.h
+m_hover.o: g_local.h q_shared.h
+m_hover.o: game.h m_hover.h
+m_infantry.o: g_local.h q_shared.h
+m_infantry.o: game.h
+m_infantry.o: m_infantry.h
+m_insane.o: g_local.h q_shared.h
+m_insane.o: game.h m_insane.h
+m_medic.o: g_local.h q_shared.h
+m_medic.o: game.h m_medic.h
+m_move.o: g_local.h q_shared.h
+m_move.o: game.h
+m_mutant.o: g_local.h q_shared.h
+m_mutant.o: game.h m_mutant.h
+m_parasite.o: g_local.h q_shared.h
+m_parasite.o: game.h
+m_parasite.o: m_parasite.h
+m_soldier.o: g_local.h q_shared.h
+m_soldier.o: game.h
+m_soldier.o: m_soldier.h
+m_supertank.o: g_local.h q_shared.h
+m_supertank.o: game.h m_supertank.h
+m_tank.o: g_local.h q_shared.h
+m_tank.o: game.h m_tank.h
+maplist.o: g_local.h q_shared.h
+maplist.o: game.h
+p_client.o: g_local.h q_shared.h
+p_client.o: game.h m_player.h
+p_hook.o: g_local.h q_shared.h
+p_hook.o: game.h
+p_hud.o: g_local.h q_shared.h
+p_hud.o: game.h
+p_trail.o: g_local.h q_shared.h
+p_trail.o: game.h
+p_view.o: g_local.h q_shared.h
+p_view.o: game.h m_player.h
+p_weapon.o: g_local.h q_shared.h
+p_weapon.o: game.h m_player.h x_fbomb.h x_fire.h
+q_shared.o: q_shared.h
+s_cam.o: g_local.h q_shared.h
+s_cam.o: game.h
+scanner.o: g_local.h q_shared.h
+scanner.o: game.h
+wf_decoy.o: g_local.h q_shared.h
+wf_decoy.o: game.h m_player.h
+x_fbomb.o: g_local.h q_shared.h
+x_fbomb.o: game.h x_fbomb.h x_fire.h
+x_fire.o: g_local.h q_shared.h
+x_fire.o: game.h x_fire.h

g_items.c

@@ -2141,7 +2141,7 @@ gitem_t gI_weapon_sniper =
 	IT_WEAPON|IT_ALTWEAPON|IT_STAY_COOP,
 	NULL,
 	0,
-/* precache */ "weapons/rg_hum.wav"
+/* precache */ "weapons/rg_hum.wav models/monsters/parasite/tip/tris.md2"
 };
 
 /*QUAKED weapon_plasma (.3 .3 1) (-16 -16 -16) (16 16 16)

g_local.h

@@ -626,6 +626,8 @@ extern	cvar_t	*flood_persecond;
 extern	cvar_t	*flood_waitdelay;
 
 extern	cvar_t	*gamedir;
+extern	cvar_t	*maplistfile;
+extern	cvar_t	*motdfile;
 
 extern	cvar_t	*teamplay;
 
@@ -1004,6 +1006,7 @@ void DropHook (edict_t *ent);
 //
 // g_weapon.c
 //
+void check_dodge (edict_t *self, vec3_t start, vec3_t dir, int speed);
 void PlayerNoise(edict_t *who, vec3_t where, int type);
 void P_ProjectSource (gclient_t *client, vec3_t point, vec3_t distance, vec3_t forward, vec3_t right, vec3_t result);
 void Weapon_Generic (edict_t *ent, int FRAME_ACTIVATE_LAST, int FRAME_FIRE_LAST, int FRAME_IDLE_LAST, int FRAME_DEACTIVATE_LAST, int *pause_frames, int *fire_frames, void (*fire)(edict_t *ent));
@@ -1240,6 +1243,8 @@ struct gclient_s
 	edict_t		*chase_target;
 	qboolean	update_chase;
 //ZOID
+
+	float		tripwire_debounce_time;
 };
 
 
@@ -1398,9 +1403,9 @@ struct edict_s
 	// ************************
 
 	//ThirdPerson Perspective Stuff
-	int		thirdperson;		// To tell the server if that person is in 3rd person mode
-	edict_t		*clone;			// This is what the player sees
-	int		currentweapon;		// This is for the weapon model info when in 3rd person mode
+	int		thirdperson;	// To tell the server if that person is in 3rd person mode
+	edict_t	*clone;			// This is what the player sees
+	int		currentweapon;	// This is for the weapon model info when in 3rd person mode
 	float		thirdoffx;		// So the player can move the camera around
 	float		thirdoffz;
 
@@ -1412,9 +1417,10 @@ struct edict_s
 	int chasedist2;
 
 	edict_t		*hook_target;
-	float           burnout;
-	edict_t         *burner;
-	edict_t *lasersight;
+	float       burnout;
+	edict_t     *burner;
+
+	edict_t		*lasersight;
 };
 
 void LaserSightThink (edict_t *self);

g_phys.c

@@ -87,7 +87,10 @@ qboolean SV_RunThink (edict_t *ent)
 	ent->nextthink = 0;
 	if (!ent->think)
 	{
-		if (ent->classname)
+		if (ent->classname && ent->model)
+			gi.error ("NULL ent->think (classname %s, model %s)", ent->classname,
+				ent->model);
+		else if (ent->classname)
 			gi.error ("NULL ent->think (classname %s)", ent->classname);
 		else
 			gi.error ("NULL ent->think");

g_save.c

@@ -142,7 +142,7 @@ void InitGame (void)
 	//FIXME: sv_ prefix is wrong for these
 	sv_rollspeed = gi.cvar ("sv_rollspeed", "200", 0);
 	sv_rollangle = gi.cvar ("sv_rollangle", "2", 0);
-	sv_maxvelocity = gi.cvar ("sv_maxvelocity", "2000", 0);
+	sv_maxvelocity = gi.cvar ("sv_maxvelocity", "2500", 0);
 	sv_gravity = gi.cvar ("sv_gravity", "800", 0);
 
 	// noset vars
@@ -162,6 +162,9 @@ void InitGame (void)
 	maxentities = gi.cvar ("maxentities", "1024", CVAR_LATCH);
 	maplist = gi.cvar ("maplist", "0", CVAR_SERVERINFO);
 
+	maplistfile = gi.cvar ("maplistfile", "maplist.txt", 0);
+	motdfile = gi.cvar ("motdfile", "motd.txt", 0);
+
 	// change anytime vars
 	dmflags = gi.cvar ("dmflags", "0", CVAR_SERVERINFO);
 	fraglimit = gi.cvar ("fraglimit", "0", CVAR_SERVERINFO);

g_spawn.c

@@ -1062,5 +1062,41 @@ void SP_worldspawn (edict_t *ent)
 	gi.imageindex (PIC_QUADDOT_TAG);
 	gi.imageindex (PIC_UP_TAG);
 	gi.imageindex (PIC_DOWN_TAG);
+
+#if 0
+	// Precache Foxman's song list.
+	{
+		FILE *in;
+		char buffer[MAX_QPATH + 1], *res;
+
+		// Open the songlist file.
+		gi.dprintf ("Preparing to read songlist...\n");
+		sprintf (buffer, "./%s/songlist.txt", gamedir->string);
+		in = fopen (buffer, "rt");
+		if (in == NULL)
+		{
+			gi.dprintf ("No songlist -- can't open ./%s/songlist.txt\n",
+				gamedir->string);
+		}
+		else
+		{
+			gi.dprintf ("Reading songlist...\n");
+
+			// Precache each song in the list.
+			while ((res = fgets (buffer, sizeof (buffer), in)) != NULL)
+			{
+				// Chop the newline(s) from the end of the string.
+				res = buffer + strlen (buffer) - 1;
+				while (res >= buffer && (*res == 10 || *res == 13))
+					{ *res = 0; res--; }
+
+				// Precache this sound.
+				gi.soundindex (res);
+			}
+
+			fclose (in);
+		}
+	}
+#endif
 }
 

g_svcmds.c

@@ -437,7 +437,7 @@ void SVCmd_PlaySound_f (void)
 	}
 
 	// Play the sound they want.
-	gi.sound (world, CHAN_ITEM+CHAN_RELIABLE+CHAN_NO_PHS_ADD,
+	gi.sound (world, CHAN_SONG+CHAN_RELIABLE+CHAN_NO_PHS_ADD,
 		gi.soundindex (gi.argv (2)), 1, ATTN_NONE, 0);
 }
 

g_team.c

@@ -1539,11 +1539,13 @@ void TeamplaySpawnpointTouch (edict_t *self, edict_t *other,
 	// Display the changed spawnpoint.
 	gi.linkentity (self);
 
+#ifdef EXT_DEVT
 	// HACK to use when I'm editing maps for Extinction.
 	if (sv_cheats->value)
 		gi.cprintf (other, PRINT_HIGH, "dmspot at [%i,%i,%i]\n",
 			(int)self->s.origin[0], (int)self->s.origin[1],
 			(int)self->s.origin[2]);
+#endif EXT_DEVT
 }
 
 

g_team.h

@@ -84,3 +84,6 @@ qboolean TeamplayCheckRound2 (void);
 void TeamplayStartRound2 (void);
 
 void TeamplayRebalanceTeams (void);
+
+/* Define this to get some development code for Extinction.
+#define EXT_DEVT */

g_utils.c

@@ -388,6 +388,10 @@ void G_InitEdict (edict_t *e)
 
 	// Clear what the free-edict list may have set.
 	e->chain = NULL;
+
+	// This is another headache.
+	e->think = NULL;
+	e->nextthink = 0;
 }
 
 // The free-edict list.  Meant to vastly speed up G_Spawn().