ubergames/rpg-x2-rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2-rpgxEF.git synced 2025-02-12 15:15:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some fixes, however it won't compile due to a bug the compiler tells me about but taht I don't understand.

Browse source 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
This commit is contained in:
Harry Young 2012-07-25 18:22:43 +02:00
parent bb1797ba5c
commit 31d1c720de
2 changed files with 40 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
game/g_cmds.c
View file

@ -6292,7 +6292,7 @@ UNTESTED
static void Cmd_selfdestruct_f(gentity_t *ent) {
gentity_t *destructEnt;
char arg[16], arg2[16], arg3[16], arg4[16], arg5[16], arg6[16], arg7[16];
float ETAmin, ETAsec;
double ETAmin, ETAsec;
if(!ent || !ent->client)
return;
@ -6325,9 +6325,10 @@ static void Cmd_selfdestruct_f(gentity_t *ent) {
Usage: selfdestruct abort\n\
This will abort any self destruct running");
return;
}
trap_Argv(1, arg, sizeof(arg));
if (!Q_stricmp(arg, "start") {
if (!Q_stricmp(arg, "start")) {
//Is there sth running alrerady?
destructEnt = G_Find(NULL, FOFS(classname), "target_selfdestruct");
if(destructEnt) {
@ -6347,14 +6348,14 @@ static void Cmd_selfdestruct_f(gentity_t *ent) {
trap_Argv(5, arg5, sizeof(arg5));
destructEnt->health = atoi(arg5);
trap_Argv(6, arg6, sizeof(arg6));
destructEnt->oldHealth = atoi(arg6);
destructEnt->flags = atoi(arg6);
if(trap_Argc() == 7) {
trap_Argv(7, arg7, sizeof(arg7));
destructEnt->target = atoi(arg7);
destructEnt->target = arg7;
}
destructEnt->spawnflags = 1 //tells ent to free once aborted.
destructEnt->spawnflags = 1; //tells ent to free once aborted.
G_CallSpawn(destructEnt); //Spawn-Function will also manage init, so we need to call that.
} else if (!Q_stricmp(arg, "remaining") {
} else if (!Q_stricmp(arg, "remaining")) {
//Is there sth running alrerady?
destructEnt = G_Find(NULL, FOFS(classname), "target_selfdestruct");
if(!destructEnt) {
@ -6363,12 +6364,12 @@ static void Cmd_selfdestruct_f(gentity_t *ent) {
}
//we need the remaining time in minutes and seconds from taht entity. Just ask them off and have the command do the math.
ETAsec = floor(modf(((destructEnt->moverstate - level.time)/60000), &ETAmin)*60); //break it apart, put off the minutes and return the floored secs
ETAsec = floor(modf(((destructEnt->damage - level.time)/60000), &ETAmin)*60); //break it apart, put off the minutes and return the floored secs
if (ETAsec > 0) //If we don't have secs we don't need to state that. Need to do a language-switch here...
trap_SendServerCommand( -1, va("servermsg \"Self Destruct in %s minutes and %s seconds.\"", ETAmin, ETAsec));
else
trap_SendServerCommand( -1, va("servermsg \"Self Destruct in %s minutes.\"", ETAmin));
} else if (!Q_stricmp(arg, "abort") {
} else if (!Q_stricmp(arg, "abort")) {
//Is there sth running alrerady?
destructEnt = G_Find(NULL, FOFS(classname), "target_selfdestruct");
if(!destructEnt) {

59
game/g_target.c
View file

@ -2568,26 +2568,27 @@ wait: total Countdown-Time in secs
count: warning intervall up to 60 secs in secs
n00bCount: warning intervall within 60 secs in secs
health: warning intervall within 10 secs in secs
oldHealth: are audio warnings 1 or 0?
flags: are audio warnings 1 or 0?
target: Things to fire once the countdown hits 0
moverstate: leveltime of countdowns end
damage: leveltime of countdowns end
spawnflags: 1 tells ent to free once aborted
*/
void target_selfdestruct_use(gentity_t *ent) {
void target_selfdestruct_use(gentity_t *ent, gentity_t *other, gentity_t *activator) {
//with the use-function we're going to init aborts in a fairly simple manner: Fire warning notes...
trap_SendServerCommand( -1, va("servermsg \"Self Destruct sequence aborted.\""));
trap_SendServerCommand( -1, va("playSnd sound/voice/selfdestruct/abort.mp3\n" ) );
//set wait to -1...
ent->wait = -1
ent->wait = -1;
//and arrange for a think in a sec
ent->nextthink = level.time + 1000
ent->nextthink = level.time + 1000;
return;
}
void target_selfdestruct_think(gentity_t *ent) {
gentity_t* client;
float ETAmin, ETAsec, temp;
double ETAmin, ETAsec, temp;
int i = 0;
//now we have 3 destinct stages the entity can think about.
@ -2602,13 +2603,13 @@ void target_selfdestruct_think(gentity_t *ent) {
temp = ent->wait - ent->health;
}
}
ent->wait = temp
ent->wait = temp;
if (ent->wait > 0){
//The first is the intervall-warning-loop
//We're doing this to give a new warning, so let's do that. I'll need to do a language switch here sometime...
ETAsec = floor(modf((ent->wait / 60000), &ETAmin)*60);
if (ent->oldHealth == 1) {
if (ent->flags == 1) {
if (ETAsec > 0) //If we don't have secs we don't need to state that.
trap_SendServerCommand( -1, va("servermsg \"Self Destruct in %s minutes and %s seconds.\"", ETAmin, ETAsec));
else
@ -2627,27 +2628,28 @@ void target_selfdestruct_think(gentity_t *ent) {
}
//fail horribly if an intervall overshoots bang-time
if (ent->nextthink > ent->moverstate)
ent->nextthink = ent->moverstate;
if (ent->nextthink > ent->damage)
ent->nextthink = ent->damage;
} else if (ent->wait == 0) { //bang time ^^
//Loop trough all clients on the server.
for(i = 0; i < level.numConnectedClients; i++) {
client = = &g_entities[i];
if (!client->flags &= FL_ESCAPEPOD) //anyone knowing how to set up this flag?
G_Damage (NULL, NULL, NULL, NULL, NULL, 999999, NULL, MOD_TRIGGER_HURT); //maybe a new message ala "[Charname] did not abandon ship."
}
client = &g_entities[i];
//if (!client->flags &= FL_ESCAPEPOD) //anyone knowing how to set up this flag?
G_Damage (NULL, NULL, NULL, NULL, NULL, 999999, 0, MOD_TRIGGER_HURT); //maybe a new message ala "[Charname] did not abandon ship."
//}
//let's hear it
trap_SendServerCommand( -1, va("playSnd sound/weapons/explosions/explode2.wav\n" ) );
//let's be shakey for a sec... I hope lol ^^
trap_SetConfigstring( CS_CAMERA_SHAKE, va( "%f %i", 999999, (level.time + 1000) );
trap_SetConfigstring( CS_CAMERA_SHAKE, va( "%f %i", 999999, (level.time + 1000) ) );
}
} else if (ent->wait < 0) {
//we have aborted and the note should be out so let's reset
ent->nextthink = -1
ent->wait = ent->splashDamage
ent->nextthink = -1;
ent->wait = ent->splashDamage;
//free ent if it was command-spawned
if (ent->spawnflags == 1)
G_FreeEntity(ent);
@ -2657,13 +2659,14 @@ void target_selfdestruct_think(gentity_t *ent) {
}
void SP_target_selfdestruct(gentity_t *ent) {
float ETAmin, ETAsec, temp;
double ETAmin, ETAsec;
float temp;
//I'd like a failsave-check here at some point...
//There's a little bit of math to do here so let's do that.
//convert all times from secs to millisecs if that hasn't been done in an earlier pass.
if (!ent->painDebounceTime){
if (!ent->splashRadius){
temp = ent->wait * 1000;
ent->wait = temp;
temp = ent->count * 1000;
@ -2672,18 +2675,18 @@ void SP_target_selfdestruct(gentity_t *ent) {
ent->n00bCount = temp;
temp = ent->health * 1000;
ent->health = temp;
ent->painDebounceTime = 1;
ent->splashRadius = 1;
}
//we'll need to back up the total for a possible reset.
ent->splashDamage = ent->wait
ent->splashDamage = ent->wait;
//let's find out when this thing will hit hard
ent->moverstate = ent->wait + level.time
ent->damage = ent->wait + level.time;
//time's set so let's let everyone know that we're counting. I'll need to do a language switch here sometime...
ETAsec = floor(modf((ent->wait / 60000), &ETAmin)*60);
if (ent->oldHealth == 1) {
if (ent->flags == 1) {
if (ETAsec > 0) //If we don't have secs we don't need to state that.
trap_SendServerCommand( -1, va("servermsg \"Self Destruct in %s minutes and %s seconds.\"", ETAmin, ETAsec));
else
@ -2699,19 +2702,19 @@ void SP_target_selfdestruct(gentity_t *ent) {
if (ent->wait == 1200000) {
trap_SendServerCommand( -1, va("playSnd sound/voice/selfdestruct/20-a1.mp3\n" ) );
} else if (ent->wait == 900000) {
if (ent->oldHealth == 1)
if (ent->flags == 1)
trap_SendServerCommand( -1, va("playSnd sound/voice/selfdestruct/15-a1.mp3\n" ) );
else
trap_SendServerCommand( -1, va("playSnd sound/voice/selfdestruct/15-a0.mp3\n" ) );
} else if (ent->wait == 600000) {
trap_SendServerCommand( -1, va("playSnd sound/voice/selfdestruct/10-a1.mp3\n" ) );
} else if (ent->wait == 300000) {
if (ent->oldHealth == 1)
if (ent->flags == 1)
trap_SendServerCommand( -1, va("playSnd sound/voice/selfdestruct/5-a1.mp3\n" ) );
else
trap_SendServerCommand( -1, va("playSnd sound/voice/selfdestruct/5-a0.mp3\n" ) );
} else {
if (ent->oldHealth == 1)
if (ent->flags == 1)
trap_SendServerCommand( -1, va("playSnd sound/voice/selfdestruct/X-a1.mp3\n" ) );
else
trap_SendServerCommand( -1, va("playSnd sound/voice/selfdestruct/X-a0.mp3\n" ) );
@ -2734,8 +2737,8 @@ void SP_target_selfdestruct(gentity_t *ent) {
}
//fail horribly if an intervall overshoots bang-time
if (ent->nextthink > ent->moverstate)
ent->nextthink = ent->moverstate;
if (ent->nextthink > ent->damage)
ent->nextthink = ent->damage;
trap_LinkEntity(ent);
}