From 04d207f0d8a96fc36666dc3cf026b7a5e5a4c651 Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Tue, 21 Jun 2005 05:24:17 +0000
Subject: [PATCH] switched progs.src format small fixes

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1107 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 quakec/basemod/combat.qc |  3 ++
 quakec/basemod/defs.qc   | 27 +++++-------------
 quakec/basemod/items.qc  |  2 +-
 quakec/basemod/progs.src | 59 ++++++++++++++++++++++++++--------------
 4 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/quakec/basemod/combat.qc b/quakec/basemod/combat.qc
index 9cb0ae377..2b5b63376 100644
--- a/quakec/basemod/combat.qc
+++ b/quakec/basemod/combat.qc
@@ -111,6 +111,9 @@ float(entity targ, entity attacker) OnSameTeam =
 	if (targ.classname != "player" || attacker.classname != "player")
 		return FALSE;
 
+	if (coop)
+		return TRUE;
+
 	if (teamplay == 0)
 		return FALSE;
 
diff --git a/quakec/basemod/defs.qc b/quakec/basemod/defs.qc
index b1269705f..e83218371 100644
--- a/quakec/basemod/defs.qc
+++ b/quakec/basemod/defs.qc
@@ -1,27 +1,14 @@
 
-// uncomment based on desired compile
-// #define NETQUAKE
-// #define FTE
-
-#ifdef FTE
-#pragma target fte
-#pragma PROGS_DAT fteprogs.dat
-// use real ints
-#define INTEGER int
-#else
-
-// if netquake, use progs.dat file name
-#ifdef NETQUAKE
-#pragma PROGS_DAT progs.dat
-#endif
-
-#define INTEGER float
-#endif
-
-
 #define FALSE 0
 #define TRUE 1
 
+#ifdef FTE
+// use real floats if using FTE type progs
+#define INTEGER int
+#else
+#define INTEGER float
+#endif
+
 /*
 ==============================================================================
 
diff --git a/quakec/basemod/items.qc b/quakec/basemod/items.qc
index 3a6b76749..a0c4ae01c 100644
--- a/quakec/basemod/items.qc
+++ b/quakec/basemod/items.qc
@@ -1238,7 +1238,7 @@ void() powerup_touch =
 
 	if (deathmatch)
 	{	
-		if (self.items & (IT_INVULNERABILITY | IT_INVISIBLITY))
+		if (self.items & (IT_INVULNERABILITY | IT_INVISIBILITY))
 			self.nextthink = time + 60*5;
 		else
 			self.nextthink = time + 60;
diff --git a/quakec/basemod/progs.src b/quakec/basemod/progs.src
index 5e8a25690..7eee421a6 100644
--- a/quakec/basemod/progs.src
+++ b/quakec/basemod/progs.src
@@ -1,22 +1,41 @@
-./qwprogs.dat
+// First non-comment character must be # to use
+// "new style" progs.src
+#pragma PROGS_DAT qwprogs.dat
 
-defs.qc
-subs.qc
-engine.qc
-effects.qc
-obituary.qc
-combat.qc
-items.qc
-proj.qc
-weapons.qc
-world.qc
-client.qc
-spectate.qc
-player.qc
-doors.qc
-buttons.qc
-triggers.qc
-plats.qc
-misc.qc
+// uncomment based on desired compile
+// #define NETQUAKE
+// #define FTE
+
+// compile options
+#ifdef NETQUAKE
+// if netquake, use progs.dat file name
+#pragma PROGS_DAT progs.dat
+#endif
+
+#ifdef FTE
+// if FTE, use FTE style progs and use fteprogs.dat file name
+#pragma target fte
+#pragma PROGS_DAT fteprogs.dat
+#endif
+
+// includes
+#include "defs.qc"
+#include "subs.qc"
+#include "engine.qc"
+#include "effects.qc"
+#include "obituary.qc"
+#include "combat.qc"
+#include "items.qc"
+#include "proj.qc"
+#include "weapons.qc"
+#include "world.qc"
+#include "client.qc"
+#include "spectate.qc"
+#include "player.qc"
+#include "doors.qc"
+#include "buttons.qc"
+#include "triggers.qc"
+#include "plats.qc"
+#include "misc.qc"
+#include "server.qc"
 
-server.qc