ubergames/rpg-x2-rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2-rpgxEF.git synced 2025-03-25 10:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed the issue with the last commit by building a failsave around the entire use-function's math segment.

Browse source 
I don't know why I'm calling this at this point...

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
This commit is contained in:
Harry Young 2012-10-08 10:42:20 +02:00
parent ae23187eed
commit 31d4c595c4
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
game/g_target.c
View file

@ -3007,31 +3007,35 @@ void target_shiphealth_use(gentity_t *ent, gentity_t *other, gentity_t *activato
int i, num;
double NSS, NHS, SD, HD, BT;
gentity_t *alertEnt, *warpEnt, *turboEnt, *transEnt, *client;
if(ent->splashDamage == 1){ //shields are active so we're just bleeding trough on the hull
BT = ((1 - (ent->count * pow(ent->health, -1))) / 10);
SD = (ent->damage - ceil(ent->damage * BT));
if(SD > ent->n00bCount){ //we're draining the shields...
HD = (ent->damage - ent->n00bCount);
NHS = (ent->count - HD);
ent->n00bCount = 0;
ent->splashDamage = -2;
} else { //shields will survive so let's just bleed trough
HD = floor(ent->damage * BT);
NHS = (ent->count - HD);
NSS = (ent->n00bCount - SD);
ent->n00bCount = NSS;
if(ent->damage <= 0){ //failsave
return;
}else{
if(ent->splashDamage == 1){ //shields are active so we're just bleeding trough on the hull
BT = ((1 - (ent->count * pow(ent->health, -1))) / 10);
SD = (ent->damage - ceil(ent->damage * BT));
if(SD > ent->n00bCount){ //we're draining the shields...
HD = (ent->damage - ent->n00bCount);
NHS = (ent->count - HD);
ent->n00bCount = 0;
ent->splashDamage = -2;
} else { //shields will survive so let's just bleed trough
HD = floor(ent->damage * BT);
NHS = (ent->count - HD);
NSS = (ent->n00bCount - SD);
ent->n00bCount = NSS;
}
} else { //shields are off, guess where the blow goes...
NHS = (ent->count - ent->damage);
}
} else { //shields are off, guess where the blow goes...
NHS = (ent->count - ent->damage);
ent->count = NHS;
ent->damage = 0;
}
ent->count = NHS;
//enough math, let's trigger things
//go to red alert if we are on green, this will also activate the shields
//go to red alert if we are not, this will also activate the shields
if(ent->falsename){
alertEnt = G_Find(NULL, FOFS(falsename), ent->falsename);
if(alertEnt->damage != 2){