qf/prozac-qfcc
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/prozac-qfcc synced 2024-12-01 00:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

magic number reduction

Browse source
This commit is contained in:
Bill Currie 2001-07-28 17:48:57 +00:00
parent bf8e4e1b33
commit 83d6cd17e7
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
field.qc
View file

@ -264,6 +264,7 @@ void() Field_touch_SUB =
if (other.classname == "player") // PLAYERS if (other.classname == "player") // PLAYERS
{ {
//dprint (vtos (other.origin) + "\n");
if (other.playerclass == PC_UNDEFINED) // Observers if (other.playerclass == PC_UNDEFINED) // Observers
return; return;
@ -542,9 +543,15 @@ void() Field_touch =
void(entity gen1, entity gen2) Create_Field = void(entity gen1, entity gen2) Create_Field =
{ {
//local string foo;
if (gen1.fieldgen_hasfield || gen2.fieldgen_hasfield) if (gen1.fieldgen_hasfield || gen2.fieldgen_hasfield)
return; return;
//foo = "gen1: " + vtos (gen1.origin) + " " + vtos (gen1.absmin) + " " + vtos (gen1.absmax);
//dprint(foo + "\n");
//foo = "gen2: " + vtos (gen2.origin) + " " + vtos (gen2.absmin) + " " + vtos (gen2.absmax);
//dprint(foo + "\n");
/* dprint("gen1:\n"); /* dprint("gen1:\n");
eprint(gen1.fieldgen_field); eprint(gen1.fieldgen_field);
dprint("gen2:\n"); dprint("gen2:\n");
@ -582,7 +589,7 @@ void(entity gen1, entity gen2) Create_Field =
tfield.size_z = 48; // was 64, but 48 is more realistic tfield.size_z = 48; // was 64, but 48 is more realistic
tfield.maxs = tfield.size * 0.5; // FIXME: / 2 is broken tfield.maxs = tfield.size * 0.5; // FIXME: / 2 is broken
tfield.mins = -tfield.maxs; tfield.mins = -tfield.maxs;
tfield.origin = gen1.origin + (gen2.origin - gen1.origin) * 0.5; tfield.origin = AVG (gen1.origin, gen2.origin);
tfield.origin_z = AVG (gen1.absmax_z, gen2.absmax_z) - tfield.maxs_z; tfield.origin_z = AVG (gen1.absmax_z, gen2.absmax_z) - tfield.maxs_z;
tfield.forcefield_offset = (gen2.origin - gen1.origin); tfield.forcefield_offset = (gen2.origin - gen1.origin);
@ -593,9 +600,9 @@ void(entity gen1, entity gen2) Create_Field =
forward = crossproduct (up, right); forward = crossproduct (up, right);
// local string foo; // local string foo;
// foo = "right: " + vtos (right) + " forward: " + vtos (forward) // foo = "right: " + vtos (right) + "\nforward: " + vtos (forward)
// + " up: " + vtos (up) + " mins: " + vtos (tfield.mins) // + "\nup: " + vtos (up) + "\nmins: " + vtos (tfield.mins)
// + " maxs: " + vtos (tfield.maxs) + "\n"; // + " maxs: " + vtos (tfield.maxs) + "\norigin: " + vtos (tfield.origin) + "\n";
// dprint (foo); // dprint (foo);
tfield.rotated_bbox = getboxhull(); tfield.rotated_bbox = getboxhull();
rotate_bbox (tfield.rotated_bbox, right, forward, up, tfield.mins, rotate_bbox (tfield.rotated_bbox, right, forward, up, tfield.mins,
@ -808,10 +815,10 @@ void(entity tfield) Field_MakeVisual =
WriteEntity (MSG_BROADCAST, tfield); WriteEntity (MSG_BROADCAST, tfield);
WriteCoord (MSG_BROADCAST, f_x); WriteCoord (MSG_BROADCAST, f_x);
WriteCoord (MSG_BROADCAST, f_y); WriteCoord (MSG_BROADCAST, f_y);
WriteCoord (MSG_BROADCAST, tfield.origin_z - 12); WriteCoord (MSG_BROADCAST, tfield.origin_z + tfield.mins_z);
WriteCoord (MSG_BROADCAST, f_x); WriteCoord (MSG_BROADCAST, f_x);
WriteCoord (MSG_BROADCAST, f_y); WriteCoord (MSG_BROADCAST, f_y);
WriteCoord (MSG_BROADCAST, tfield.origin_z + 12); WriteCoord (MSG_BROADCAST, tfield.origin_z + tfield.maxs_z);
} }
}; };