rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-27 14:32:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

New hitboxes. Fixed CTB awards (flags)

Browse source
This commit is contained in:
Richard Allen 2002-08-18 20:26:35 +00:00
parent 01f2e637a2
commit 55360315e9
3 changed files with 71 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reaction/ChangeLog
View file

@ -33,6 +33,7 @@
* MM: Changed Voting system to allow only captains to vote/callvote * MM: Changed Voting system to allow only captains to vote/callvote
* MM: Added "clearscores" and "resetmatch" to vote command list * MM: Added "clearscores" and "resetmatch" to vote command list
* Each client can call a maximum of g_RQ3_maxClientVotes votes/team votes (default: 3) * Each client can call a maximum of g_RQ3_maxClientVotes votes/team votes (default: 3)
* Hitboxes now 100% AQ style
# List fixes here for the 2.1 release # List fixes here for the 2.1 release

19
reaction/cgame/cg_players.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.43 2002/08/18 20:26:35 jbravo
// New hitboxes. Fixed CTB awards (flags)
//
// Revision 1.42 2002/08/07 16:13:33 jbravo // Revision 1.42 2002/08/07 16:13:33 jbravo
// Case carrier glowing removed. Ignorenum bug fixed // Case carrier glowing removed. Ignorenum bug fixed
// //
@ -2074,9 +2077,6 @@ static void CG_PlayerPowerups(centity_t * cent, refEntity_t * torso)
int powerups; int powerups;
clientInfo_t *ci; clientInfo_t *ci;
// JBravo: no glowing stuff in CTB
return;
powerups = cent->currentState.powerups; powerups = cent->currentState.powerups;
if (!powerups) { if (!powerups) {
return; return;
@ -2089,7 +2089,8 @@ static void CG_PlayerPowerups(centity_t * cent, refEntity_t * torso)
} else { } else {
CG_TrailItem(cent, cgs.media.redFlagModel, torso); CG_TrailItem(cent, cgs.media.redFlagModel, torso);
} }
trap_R_AddLightToScene(cent->lerpOrigin, 200 + (rand() & 31), 1.0, 0.2f, 0.2f); // JBravo: no glowing in RQ3
// trap_R_AddLightToScene(cent->lerpOrigin, 200 + (rand() & 31), 1.0, 0.2f, 0.2f);
} }
// blueflag // blueflag
if (powerups & (1 << PW_BLUEFLAG)) { if (powerups & (1 << PW_BLUEFLAG)) {
@ -2098,7 +2099,8 @@ static void CG_PlayerPowerups(centity_t * cent, refEntity_t * torso)
} else { } else {
CG_TrailItem(cent, cgs.media.blueFlagModel, torso); CG_TrailItem(cent, cgs.media.blueFlagModel, torso);
} }
trap_R_AddLightToScene(cent->lerpOrigin, 200 + (rand() & 31), 0.2f, 0.2f, 1.0); // JBravo: no glowing in RQ3
// trap_R_AddLightToScene(cent->lerpOrigin, 200 + (rand() & 31), 0.2f, 0.2f, 1.0);
} }
// neutralflag // neutralflag
if (powerups & (1 << PW_NEUTRALFLAG)) { if (powerups & (1 << PW_NEUTRALFLAG)) {
@ -2107,12 +2109,9 @@ static void CG_PlayerPowerups(centity_t * cent, refEntity_t * torso)
} else { } else {
CG_TrailItem(cent, cgs.media.neutralFlagModel, torso); CG_TrailItem(cent, cgs.media.neutralFlagModel, torso);
} }
trap_R_AddLightToScene(cent->lerpOrigin, 200 + (rand() & 31), 1.0, 1.0, 1.0); // JBravo: no glowing in RQ3
// trap_R_AddLightToScene(cent->lerpOrigin, 200 + (rand() & 31), 1.0, 1.0, 1.0);
} }
// Elder: HC Smoke
//if ( powerups & ( 1 << PW_HANDCANNON_SMOKED) ) {
//CG_HCSmokeTrail( cent );
//}
} }
/* /*

150
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.116 2002/08/18 20:26:35 jbravo
// New hitboxes. Fixed CTB awards (flags)
//
// Revision 1.115 2002/08/07 16:13:33 jbravo // Revision 1.115 2002/08/07 16:13:33 jbravo
// Case carrier glowing removed. Ignorenum bug fixed // Case carrier glowing removed. Ignorenum bug fixed
// //
@ -522,7 +525,8 @@ void body_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, int
return; return;
} }
if (attacker->client && ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY)) if (attacker->client
&& ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY))
attacker->client->pers.records[REC_GIBSHOTS]++; attacker->client->pers.records[REC_GIBSHOTS]++;
GibEntity(self, 0); GibEntity(self, 0);
@ -1300,7 +1304,7 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i
attacker->client->pers.records[REC_TEAMKILLS]++; attacker->client->pers.records[REC_TEAMKILLS]++;
Add_TeamKill(attacker); Add_TeamKill(attacker);
trap_SendServerCommand(self - g_entities, trap_SendServerCommand(self - g_entities,
va("rq3_cmd %i %s", TKOK, attacker->client->pers.netname)); va("rq3_cmd %i %s", TKOK, attacker->client->pers.netname));
} }
} else { } else {
// Increase number of kills this life for attacker // Increase number of kills this life for attacker
@ -1454,7 +1458,6 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i
if (g_gametype.integer == GT_CTF) { if (g_gametype.integer == GT_CTF) {
self->client->time_of_death = level.time; self->client->time_of_death = level.time;
} }
// remove powerups // remove powerups
memset(self->client->ps.powerups, 0, sizeof(self->client->ps.powerups)); memset(self->client->ps.powerups, 0, sizeof(self->client->ps.powerups));
@ -1481,7 +1484,7 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i
} }
// never gib in a nodrop // never gib in a nodrop
if (g_RQ3_gib.integer > 3 && !self->client->gibbed if (g_RQ3_gib.integer > 3 && !self->client->gibbed
&& (self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer)) { && (self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer)) {
// gib death // gib death
GibEntity(self, killer); GibEntity(self, killer);
} else if (meansOfDeath == MOD_SUICIDE) { } else if (meansOfDeath == MOD_SUICIDE) {
@ -1775,17 +1778,30 @@ dflags these flags are used to control how T_Damage works
============ ============
*/ */
void VerifyHeadShot(vec3_t point, vec3_t dir, float height, vec3_t newpoint)
{
vec3_t normdir, normdir2;
VectorNormalize2(dir, normdir);
VectorScale(normdir, height, normdir2);
VectorAdd(point, normdir2, newpoint);
}
#define LEG_DAMAGE (height/2.2) - abs(targ->r.mins[2]) - 3 // -1.545455
#define STOMACH_DAMAGE (height/1.8) - abs(targ->r.mins[2]) // 7.111111
#define CHEST_DAMAGE (height/1.4) - abs(targ->r.mins[2]) // 16.000000
#define HEAD_HEIGHT 12.0
void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker, void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
vec3_t dir, vec3_t point, int damage, int dflags, int mod) vec3_t dir, vec3_t point, int damage, int dflags, int mod)
{ {
gclient_t *client; gclient_t *client;
int take, save, asave, knockback; //, max;
int bleeding = 0, instant_dam = 1;
vec3_t bulletPath, bulletAngle, line;
vec_t dist;
int clientHeight, clientFeetZ, clientRotation, bulletHeight;
int bulletRotation, impactRotation;
gentity_t *tent; gentity_t *tent;
int take, save, asave, knockback;
int bleeding = 0, instant_dam = 1, height;
float z_rel, targ_maxs2, from_top;
vec3_t line, new_point;
vec_t dist;
if (!targ->takedamage) { if (!targ->takedamage) {
return; return;
@ -1799,7 +1815,7 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
if (targ != attacker && attacker && targ && targ->client && attacker->client && if (targ != attacker && attacker && targ && targ->client && attacker->client &&
targ->client->sess.sessionTeam == attacker->client->sess.sessionTeam && targ->client->sess.sessionTeam == attacker->client->sess.sessionTeam &&
((g_gametype.integer == GT_TEAMPLAY && !g_friendlyFire.integer && level.team_round_going) || ((g_gametype.integer == GT_TEAMPLAY && !g_friendlyFire.integer && level.team_round_going) ||
(g_gametype.integer == GT_CTF && !g_friendlyFire.integer))) (g_gametype.integer == GT_CTF && !g_friendlyFire.integer)))
return; return;
// the intermission has allready been qualified for, so don't // the intermission has allready been qualified for, so don't
@ -1822,9 +1838,6 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
attacker = &g_entities[ENTITYNUM_WORLD]; attacker = &g_entities[ENTITYNUM_WORLD];
} }
if (targ->client)
targ->client->kevlarHit = qfalse;
/* old code /* old code
if (targ->s.eType == ET_MOVER && targ->health <= 0) { if (targ->s.eType == ET_MOVER && targ->health <= 0) {
//Makro - added //Makro - added
@ -1839,7 +1852,8 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
targ->health -= damage; targ->health -= damage;
if (targ->health <= 0) { if (targ->health <= 0) {
if (targ->use if (targ->use
&& (targ->moverState == MOVER_POS1 || targ->moverState == ROTATOR_POS1 || (targ->spawnflags & 8))) { && (targ->moverState == MOVER_POS1 || targ->moverState == ROTATOR_POS1
|| (targ->spawnflags & 8))) {
targ->use(targ, inflictor, attacker); targ->use(targ, inflictor, attacker);
} }
if (targ->wait < 0) { if (targ->wait < 0) {
@ -1952,7 +1966,7 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
// This was added when the possibility of missing was added from spherical head detection. // This was added when the possibility of missing was added from spherical head detection.
// We don't want someone flying back from a sniper to the head when it actually missed! // We don't want someone flying back from a sniper to the head when it actually missed!
// Hal: Make sure we have valid pointers before accessing them // Hal: Make sure we have valid pointers before accessing them
if ((dir != NULL) && (point != NULL) && G_HitPlayer(targ, dir, point)) { if ((dir != NULL) && (point != NULL)) {
// figure momentum add, even if the damage won't be taken // figure momentum add, even if the damage won't be taken
if (knockback && targ->client) { if (knockback && targ->client) {
vec3_t kvel, flydir; vec3_t kvel, flydir;
@ -2017,7 +2031,8 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
} }
if (g_gametype.integer == GT_CTF && g_friendlyFire.integer == 2) if (g_gametype.integer == GT_CTF && g_friendlyFire.integer == 2)
return; return;
if ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer == GT_CTF) if ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going)
|| g_gametype.integer == GT_CTF)
Add_TeamWound(attacker, targ, mod); Add_TeamWound(attacker, targ, mod);
} }
// check for godmode // check for godmode
@ -2047,12 +2062,11 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
if (g_gametype.integer == GT_CTF) { if (g_gametype.integer == GT_CTF) {
Team_CheckHurtCarrier(targ, attacker); Team_CheckHurtCarrier(targ, attacker);
} }
// aasimon: start calculations for hit location determination
if (targ->client) { if (targ->client) {
// set the last client who damaged the target // set the last client who damaged the target
targ->client->lasthurt_client = attacker->s.number; targ->client->lasthurt_client = attacker->s.number;
targ->client->lasthurt_mod = mod; targ->client->lasthurt_mod = mod;
// Begin Duffman
// Modify the damage for location damage // Modify the damage for location damage
if (point && targ && targ->health > 0 && attacker && take) { if (point && targ && targ->health > 0 && attacker && take) {
@ -2084,75 +2098,38 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
} else if (take && (mod == MOD_PISTOL || mod == MOD_M4 || } else if (take && (mod == MOD_PISTOL || mod == MOD_M4 ||
mod == MOD_SNIPER || mod == MOD_MP5 || mod == MOD_AKIMBO || mod == MOD_SNIPER || mod == MOD_MP5 || mod == MOD_AKIMBO ||
mod == MOD_KNIFE || mod == MOD_KNIFE_THROWN)) { mod == MOD_KNIFE || mod == MOD_KNIFE_THROWN)) {
bleeding = 1; bleeding = 1;
instant_dam = 0; instant_dam = 0;
// Point[2] is the REAL world Z. We want Z relative to the clients feet // JBravo: calulate where the bullet hit
// Where the feet are at [real Z] targ->client->lasthurt_location = 0;
clientFeetZ = targ->r.currentOrigin[2] + targ->r.mins[2]; targ_maxs2 = targ->r.maxs[2];
// How tall the client is [Relative Z] height = abs(targ->r.mins[2]) + targ_maxs2;
clientHeight = targ->r.maxs[2] - targ->r.mins[2]; z_rel = point[2] - targ->r.currentOrigin[2];
// Where the bullet struck [Relative Z] from_top = targ_maxs2 - z_rel;
bulletHeight = point[2] - clientFeetZ;
// Get a vector aiming from the client to the bullet hit
VectorSubtract(targ->r.currentOrigin, point, bulletPath);
// Convert it into PITCH, ROLL, YAW
vectoangles(bulletPath, bulletAngle);
clientRotation = targ->client->ps.viewangles[YAW];
bulletRotation = bulletAngle[YAW];
impactRotation = abs(clientRotation - bulletRotation); //G_Printf("z_rel = %f, height = %d, from_top = %f\n", z_rel, height, from_top);
impactRotation += 45; // just to make it easier to work with if (from_top < 2 * HEAD_HEIGHT) {
impactRotation = impactRotation % 360; // Keep it in the 0-359 range VerifyHeadShot (point, dir, HEAD_HEIGHT, new_point);
VectorSubtract (new_point, targ->r.currentOrigin, new_point);
if (impactRotation < 90) { if ((targ_maxs2 - new_point[2]) < HEAD_HEIGHT
if (attacker->client && level.team_round_going) && (abs(new_point[1])) < HEAD_HEIGHT*.8
attacker->client->pers.records[REC_BACKSHOTS]++; && (abs(new_point[0])) < HEAD_HEIGHT*.8) {
targ->client->lasthurt_location = LOCATION_BACK; targ->client->lasthurt_location = LOCATION_HEAD;
} else if (impactRotation < 180) { }
if (attacker->client && level.team_round_going) }
attacker->client->pers.records[REC_RIGHTSHOTS]++; if (z_rel < LEG_DAMAGE) {
targ->client->lasthurt_location = LOCATION_RIGHT; targ->client->lasthurt_location = LOCATION_LEG;
} else if (impactRotation < 270) { } else if (z_rel < STOMACH_DAMAGE) {
if (attacker->client && level.team_round_going) targ->client->lasthurt_location = LOCATION_STOMACH;
attacker->client->pers.records[REC_FRONTSHOTS]++; } else if (targ->client->lasthurt_location == 0){
targ->client->lasthurt_location = LOCATION_FRONT; targ->client->lasthurt_location = LOCATION_CHEST;
} else if (impactRotation < 360) {
if (attacker->client && level.team_round_going)
attacker->client->pers.records[REC_LEFTSHOTS]++;
targ->client->lasthurt_location = LOCATION_LEFT;
} else
targ->client->lasthurt_location = LOCATION_NONE;
// NiceAss: Added for better head hit-detection.
if (!G_HitPlayer(targ, dir, point) && mod != MOD_KNIFE && mod != MOD_KNIFE_THROWN) {
// NiceAss: It didn't intersect the sphere (head) and it's above the shoulders so it hit the air.
return;
} }
// The upper body never changes height, just distance from the feet
if (bulletHeight > clientHeight - 2)
targ->client->lasthurt_location |= LOCATION_HEAD;
else if (bulletHeight > clientHeight - 8)
targ->client->lasthurt_location |= LOCATION_FACE;
else if (bulletHeight > clientHeight - 10)
targ->client->lasthurt_location |= LOCATION_SHOULDER;
else if (bulletHeight > clientHeight - 16)
targ->client->lasthurt_location |= LOCATION_CHEST;
else if (bulletHeight > clientHeight - 26)
targ->client->lasthurt_location |= LOCATION_STOMACH;
else if (bulletHeight > clientHeight - 29)
targ->client->lasthurt_location |= LOCATION_GROIN;
else
// The leg is the only thing that changes size when you duck,
// so we check for every other parts RELATIVE location, and
// whats left over must be the leg.
targ->client->lasthurt_location |= LOCATION_LEG;
switch (targ->client->lasthurt_location & switch (targ->client->lasthurt_location) {
~(LOCATION_BACK | LOCATION_LEFT | LOCATION_RIGHT | LOCATION_FRONT)) {
case LOCATION_HEAD: case LOCATION_HEAD:
case LOCATION_FACE:
if (attacker->client && level.team_round_going) if (attacker->client && level.team_round_going)
attacker->client->pers.records[REC_HEADSHOTS]++; attacker->client->pers.records[REC_HEADSHOTS]++;
//save headshot time for player_die //save headshot time for player_die
@ -2176,7 +2153,6 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
} }
take *= 1.8; //+ 1; take *= 1.8; //+ 1;
break; break;
case LOCATION_SHOULDER:
case LOCATION_CHEST: case LOCATION_CHEST:
if (attacker->client && level.team_round_going) if (attacker->client && level.team_round_going)
attacker->client->pers.records[REC_CHESTSHOTS]++; attacker->client->pers.records[REC_CHESTSHOTS]++;
@ -2233,7 +2209,6 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
} }
break; break;
case LOCATION_STOMACH: case LOCATION_STOMACH:
case LOCATION_GROIN:
if (attacker->client && level.team_round_going) if (attacker->client && level.team_round_going)
attacker->client->pers.records[REC_STOMACHSHOTS]++; attacker->client->pers.records[REC_STOMACHSHOTS]++;
trap_SendServerCommand(attacker - g_entities, trap_SendServerCommand(attacker - g_entities,
@ -2247,7 +2222,6 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
} }
break; break;
case LOCATION_LEG: case LOCATION_LEG:
case LOCATION_FOOT:
if (attacker->client && level.team_round_going) if (attacker->client && level.team_round_going)
attacker->client->pers.records[REC_LEGSHOTS]++; attacker->client->pers.records[REC_LEGSHOTS]++;
trap_SendServerCommand(attacker - g_entities, trap_SendServerCommand(attacker - g_entities,
@ -2258,12 +2232,9 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
take *= 0.25; take *= 0.25;
break; break;
} }
// G_Printf("In loc damage: %d outgoing\n",take);
} }
// take = G_LocationDamage(point, targ, attacker, take);
} else } else
targ->client->lasthurt_location = LOCATION_NONE; targ->client->lasthurt_location = LOCATION_NONE;
// End Duffman
} }
// add to the damage inflicted on a player this frame // add to the damage inflicted on a player this frame
// the total will be turned into screen blends and view angle kicks // the total will be turned into screen blends and view angle kicks
@ -2301,8 +2272,9 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
} }
//Makro - crash bug fix //Makro - crash bug fix
if (targ && targ->client) { if (targ && targ->client) {
Com_sprintf(attacker->client->last_damaged_players, sizeof(attacker->client->last_damaged_players), Com_sprintf(attacker->client->last_damaged_players,
"%s^7", targ->client->pers.netname); sizeof(attacker->client->last_damaged_players), "%s^7",
targ->client->pers.netname);
} }
} }
if (instant_dam) { if (instant_dam) {
@ -2407,7 +2379,7 @@ qboolean G_HitPlayer(gentity_t * targ, vec3_t dir, vec3_t point)
VectorMA(s_origin, 3.2, s_forward, s_origin); // Move origin of sphere foreward a little (better centerage of the head) VectorMA(s_origin, 3.2, s_forward, s_origin); // Move origin of sphere foreward a little (better centerage of the head)
// JBravo: changed the head radius to 10. was 6 // JBravo: changed the head radius to 10. was 6
if (!RaySphereIntersections(s_origin, 10, point, dir, s_intersections) && bulletHeight > clientHeight - 8) { if (!RaySphereIntersections(s_origin, 8, point, dir, s_intersections) && bulletHeight > clientHeight - 8) {
// NiceAss: It didn't intersect the sphere and it's above the shoulders so it hit the air. // NiceAss: It didn't intersect the sphere and it's above the shoulders so it hit the air.
return qfalse; return qfalse;
} }