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

Allow unaligned forcefields. They mostly work, but there seems to

Browse source 
still be some issues with rotated bboxes in the engine.
This commit is contained in:
Adam Olsen 2001-07-26 18:22:56 +00:00
parent 2f0c2eec2f
commit ba00cfd56c
2 changed files with 54 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
defs.qc
View file

@ -563,7 +563,10 @@ float(string s) stof = #81; // convert string to float
void(vector where, float set) multicast = #82; // sends the temp message void(vector where, float set) multicast = #82; // sends the temp message
// to a set of clients, // to a set of clients,
// possibly in PVS or PHS // possibly in PVS or PHS
integer () getboxhull = #95;
void (integer hull) freeboxhull = #96;
void (integer hull, vector right, vector forward, vector up,
vector mins, vector maxs) rotate_bbox = #97;
void (vector start, vector mins, vector maxs, vector end, float type, void (vector start, vector mins, vector maxs, vector end, float type,
entity passent) checkmove = #98; // Wrapper around SV_Move. entity passent) checkmove = #98; // Wrapper around SV_Move.
@ -720,6 +723,8 @@ void (entity pl, float topcolor, float bottomcolor) SetPlayerColor;
.float menu_count; // keeps track of display times for menus .float menu_count; // keeps track of display times for menus
.float menu_displaytime; // keep track of how many times this menu is refreshed .float menu_displaytime; // keep track of how many times this menu is refreshed
.integer rotated_bbox;
/*==================================================*/ /*==================================================*/
/* Toggleable Game Settings */ /* Toggleable Game Settings */

108
field.qc
View file

@ -53,7 +53,6 @@ For force field entity:
.fieldgen_hasfield - Shield sound running, boolean .fieldgen_hasfield - Shield sound running, boolean
.has_tesla - Controls delay between hums .has_tesla - Controls delay between hums
.has_sentry - Controls delay between shield sounds .has_sentry - Controls delay between shield sounds
.cnt - Orientation of field (x or y)
.dmg - Next damage the field will do .dmg - Next damage the field will do
.has_camera - Used to control the rate at which the field touch sound/visual effects are done (4hz) .has_camera - Used to control the rate at which the field touch sound/visual effects are done (4hz)
@ -547,24 +546,8 @@ void(entity gen1, entity gen2) Create_Field =
tfield.nextthink = time + 0.25; tfield.nextthink = time + 0.25;
// set pos and size // set pos and size
if (gen1.origin_x == gen2.origin_x) tfield.size_x = vlen (gen1.origin - gen2.origin) - 10;
{ tfield.size_y = 4;
tfield.cnt = 0;
tfield.size_x = 4;
tfield.size_y = vlen (gen1.origin - gen2.origin) - 10;
}
else /* if (gen1.origin_y == gen2.origin_y) */
{
tfield.cnt = 1;
tfield.size_x = vlen (gen1.origin - gen2.origin) - 10;
tfield.size_y = 4;
}
/* else // for rotation. not currently used.
{
tfield.cnt = 2;
tfield.size_x = vlen (gen1.origin - gen2.origin) - 10;
tfield.size_y = 4;
} */
tfield.size_z = 48; // was 64, but this looks more realistic tfield.size_z = 48; // was 64, but this looks 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 * -1; // FIXME: -1 * only did first float tfield.mins = tfield.maxs * -1; // FIXME: -1 * only did first float
@ -572,7 +555,23 @@ void(entity gen1, entity gen2) Create_Field =
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.absmax = tfield.origin + tfield.maxs; tfield.absmax = tfield.origin + tfield.maxs;
tfield.absmin = tfield.origin + tfield.mins; tfield.absmin = tfield.origin + tfield.mins;
// tfield.angles = gen2.origin - gen1.origin; // for rotation?
local vector right, forward, up;
// local string foo;
up = '0 0 1';
right = normalize (gen2.origin - gen1.origin);
forward = crossproduct (up, right);
// foo = "right: " + vtos (right) + " forward: " + vtos (forward)
// + " up: " + vtos (up) + " mins: " + vtos (tfield.mins)
// + " maxs: " + vtos (tfield.maxs) + "\n";
// dprint (foo);
tfield.rotated_bbox = getboxhull();
rotate_bbox (tfield.rotated_bbox, right, forward, up, tfield.mins,
tfield.maxs);
tfield.angles = (gen2.origin - gen1.origin);
// apply stuff // apply stuff
tfield.movetype = MOVETYPE_NONE; tfield.movetype = MOVETYPE_NONE;
@ -605,29 +604,31 @@ void(entity gen1, entity gen2) Create_Field =
void(entity gen1, entity gen2) Remove_Field = void(entity gen1, entity gen2) Remove_Field =
{ {
if (IsValidFieldGen(gen1)) if (IsValidFieldGen(gen1))
{
if (IsValidField(gen1.fieldgen_field))
{
dremove(gen1.fieldgen_field);
}
gen1.fieldgen_hasfield = FALSE;
gen1.fieldgen_field = world;
if (IsValidFieldGen(gen2))
{ {
gen2.fieldgen_hasfield = FALSE; if (IsValidField(gen1.fieldgen_field))
gen2.fieldgen_field = world; {
freeboxhull (gen1.fieldgen_field.rotated_bbox);
dremove(gen1.fieldgen_field);
}
gen1.fieldgen_hasfield = FALSE;
gen1.fieldgen_field = world;
if (IsValidFieldGen(gen2))
{
gen2.fieldgen_hasfield = FALSE;
gen2.fieldgen_field = world;
}
} }
} else if (IsValidFieldGen(gen2))
else if (IsValidFieldGen(gen2)) {
{ if (IsValidField(gen2.fieldgen_field))
if (IsValidField(gen2.fieldgen_field)) {
{ freeboxhull (gen2.fieldgen_field.rotated_bbox);
dremove(gen2.fieldgen_field); dremove(gen2.fieldgen_field);
}
gen2.fieldgen_hasfield = FALSE;
gen2.fieldgen_field = world;
} }
gen2.fieldgen_hasfield = FALSE;
gen2.fieldgen_field = world;
}
}; };
float(entity field) IsValidField = float(entity field) IsValidField =
@ -744,18 +745,9 @@ void(entity tfield) Field_MakeVisual =
{ {
if (IsValidField(tfield)) if (IsValidField(tfield))
{ {
local float fx, fy; local vector f;
if (tfield.cnt) f = tfield.origin + (tfield.angles * 0.5 * (random() * 2 - 1));
{
fy = tfield.origin_y;
fx = tfield.origin_x + (tfield.size_x/2 - tfield.size_x * random());
}
else
{
fx = tfield.origin_x;
fy = tfield.origin_y + (tfield.size_y/2 - tfield.size_y * random());
}
WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY);
if (random() > 0.5) if (random() > 0.5)
@ -763,11 +755,11 @@ void(entity tfield) Field_MakeVisual =
else else
WriteByte (MSG_BROADCAST, TE_LIGHTNING1); WriteByte (MSG_BROADCAST, TE_LIGHTNING1);
WriteEntity (MSG_BROADCAST, tfield); WriteEntity (MSG_BROADCAST, tfield);
WriteCoord (MSG_BROADCAST, fx); WriteCoord (MSG_BROADCAST, f_x);
WriteCoord (MSG_BROADCAST, fy); WriteCoord (MSG_BROADCAST, f_y);
WriteCoord (MSG_BROADCAST, tfield.origin_z - 12); WriteCoord (MSG_BROADCAST, tfield.origin_z - 12);
WriteCoord (MSG_BROADCAST, fx); WriteCoord (MSG_BROADCAST, f_x);
WriteCoord (MSG_BROADCAST, fy); WriteCoord (MSG_BROADCAST, f_y);
WriteCoord (MSG_BROADCAST, tfield.origin_z + 12); WriteCoord (MSG_BROADCAST, tfield.origin_z + 12);
} }
}; };
@ -913,10 +905,6 @@ float(entity fieldgen1, entity fieldgen2) FieldGens_CanLink =
if (fieldgen1.origin_z != fieldgen2.origin_z) if (fieldgen1.origin_z != fieldgen2.origin_z)
return FALSE; return FALSE;
// FIXME: comment out if we allow rotation
if (fieldgen1.origin_x != fieldgen2.origin_x && fieldgen1.origin_y != fieldgen2.origin_y)
return FALSE;
if (fieldgen1.fieldgen_status == FIELDGEN_ISDISABLED || fieldgen2.fieldgen_status == FIELDGEN_ISDISABLED) if (fieldgen1.fieldgen_status == FIELDGEN_ISDISABLED || fieldgen2.fieldgen_status == FIELDGEN_ISDISABLED)
return FALSE; return FALSE;
@ -974,7 +962,7 @@ entity(entity fieldgen) Find_OtherGen =
vector(vector place) WhereGen = vector(vector place) WhereGen =
{ {
// FIXME: remove function if we allow rotation // FIXME: remove function if we allow rotation
// return place; return place;
// if we have no field generator currently, it can be placed anywhere // if we have no field generator currently, it can be placed anywhere
if (self.has_fieldgen == 0) return place; if (self.has_fieldgen == 0) return place;