qf/prozac-qfcc
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/prozac-qfcc synced 2025-01-19 16:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- comment out the double-remove check, since the engine should handle

Browse source 
that now
- add an ASSERT macro, not that it's used
- change the build placement distances from +30 - -20 to +50 - -40
- add DMSG_MARTYR handlers, which will hopefully make the BUG deaths
  stop
This commit is contained in:
Adam Olsen 2001-10-17 03:28:37 +00:00
parent ac4e5a8adb
commit 0dc44cb1ac
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debug.qc
View file

@ -33,7 +33,7 @@ void(entity te) dremove =
RPrint("***BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG***\n"); RPrint("***BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG***\n");
return; return;
} }
#if 0
if (te.is_removed == TRUE) if (te.is_removed == TRUE)
{ {
RPrint("***BUG BUG BUG BUG BUG BUG BUG***\n"); RPrint("***BUG BUG BUG BUG BUG BUG BUG***\n");
@ -41,6 +41,7 @@ void(entity te) dremove =
RPrint("***BUG BUG BUG BUG BUG BUG BUG***\n"); RPrint("***BUG BUG BUG BUG BUG BUG BUG***\n");
return; return;
} }
#endif
te.is_removed = TRUE; te.is_removed = TRUE;
remove(te); remove(te);

1
defs.qh
View file

@ -1324,3 +1324,4 @@
#define MIN(a,b) (((a) < (b)) ? (a) : (b)) #define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define MAX(a,b) (((a) > (b)) ? (a) : (b)) #define MAX(a,b) (((a) > (b)) ? (a) : (b))
#define BOUND(a,b,c) (MAX((a), MIN((b), (c)))) #define BOUND(a,b,c) (MAX((a), MIN((b), (c))))
#define ASSERT(a) do {if (!(a)) error (__FILE__ + ":" + itos(__LINE__) + ": Assert failed: " + #a);} while (0)

4
engineer.qc
View file

@ -685,9 +685,9 @@ void(float objtobuild) TeamFortress_Build =
{ {
local vector startpos, endpos; local vector startpos, endpos;
startpos = obj.origin; startpos = obj.origin;
startpos_z = self.absmin_z - obj.mins_z + 30; startpos_z = self.absmin_z - obj.mins_z + 50;
endpos = obj.origin; endpos = obj.origin;
endpos_z = self.absmin_z - obj.mins_z - 20; endpos_z = self.absmin_z - obj.mins_z - 40;
checkmove(startpos, obj.mins, obj.maxs, endpos, MOVE_NORMAL, self); checkmove(startpos, obj.mins, obj.maxs, endpos, MOVE_NORMAL, self);
if (trace_fraction == 1) { if (trace_fraction == 1) {

12
obituary.qc
View file

@ -1010,9 +1010,12 @@ void (entity targ, entity attacker) Obituary_Player_by_Player =
} else if (deathmsg == DMSG_INCENDIARY) { } else if (deathmsg == DMSG_INCENDIARY) {
deathstring = " gets well done by "; deathstring = " gets well done by ";
deathstring2 = "'s incendiary rocket\n"; deathstring2 = "'s incendiary rocket\n";
} else if (deathmsg == DMSG_MARTYR) {
deathstring = " brings down the martyr ";
deathstring2 = "\n";
} else { } else {
deathstring = " has a BUG death ("; deathstring = " has a BUG death by ";
deathstring2 = ")\n"; deathstring2 = " (deathmsg = " + ftos (deathmsg) + ")\n";
} }
bprint (PRINT_MEDIUM, targ.netname); bprint (PRINT_MEDIUM, targ.netname);
@ -1163,9 +1166,12 @@ void (entity targ, entity attacker) Obituary_Player_by_SentryTesla =
deathstring = " decides "; deathstring = " decides ";
deathstring2 = "'s sentry isn't so cuddly after all!\n"; deathstring2 = "'s sentry isn't so cuddly after all!\n";
} }
} else if (deathmsg == DMSG_MARTYR) {
deathstring = " plays cat and mouse with ";
deathstring2 = "'s sentry\n";
} else { } else {
deathstring = " is given a BUG death from "; deathstring = " is given a BUG death from ";
deathstring2 = "'s sentry\n"; deathstring2 = "'s sentry (deathmsg = " + ftos (deathmsg) + ")\n";
} }
bprint (PRINT_MEDIUM, targ.netname); bprint (PRINT_MEDIUM, targ.netname);