fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

switched progs.src format

Browse source 
small fixes


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1107 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-06-21 05:24:17 +00:00
parent cb7bd8eba5
commit 04d207f0d8
4 changed files with 50 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
quakec/basemod/combat.qc
View file

@ -111,6 +111,9 @@ float(entity targ, entity attacker) OnSameTeam =
if (targ.classname != "player" || attacker.classname != "player") if (targ.classname != "player" || attacker.classname != "player")
return FALSE; return FALSE;
if (coop)
return TRUE;
if (teamplay == 0) if (teamplay == 0)
return FALSE; return FALSE;

27
quakec/basemod/defs.qc
View file

@ -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 FALSE 0
#define TRUE 1 #define TRUE 1
#ifdef FTE
// use real floats if using FTE type progs
#define INTEGER int
#else
#define INTEGER float
#endif
/* /*
============================================================================== ==============================================================================

2
quakec/basemod/items.qc
View file

@ -1238,7 +1238,7 @@ void() powerup_touch =
if (deathmatch) if (deathmatch)
{ {
if (self.items & (IT_INVULNERABILITY | IT_INVISIBLITY)) if (self.items & (IT_INVULNERABILITY | IT_INVISIBILITY))
self.nextthink = time + 60*5; self.nextthink = time + 60*5;
else else
self.nextthink = time + 60; self.nextthink = time + 60;

59
quakec/basemod/progs.src
View file

@ -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 // uncomment based on desired compile
subs.qc // #define NETQUAKE
engine.qc // #define FTE
effects.qc
obituary.qc // compile options
combat.qc #ifdef NETQUAKE
items.qc // if netquake, use progs.dat file name
proj.qc #pragma PROGS_DAT progs.dat
weapons.qc #endif
world.qc
client.qc #ifdef FTE
spectate.qc // if FTE, use FTE style progs and use fteprogs.dat file name
player.qc #pragma target fte
doors.qc #pragma PROGS_DAT fteprogs.dat
buttons.qc #endif
triggers.qc
plats.qc // includes
misc.qc #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