rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-17 01:22:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Health functionality for movers should be complete now

Browse source
This commit is contained in:
Andrei Drexler 2002-06-21 15:04:55 +00:00
parent a8a985465f
commit 9d8eef61dc
5 changed files with 35 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.100 2002/06/21 15:04:55 makro
// Health functionality for movers should be complete now
//
// Revision 1.99 2002/06/20 22:32:43 jbravo // Revision 1.99 2002/06/20 22:32:43 jbravo
// Added last damaged player and fixed a test2 model problem (atrimum my ass :) // Added last damaged player and fixed a test2 model problem (atrimum my ass :)
// Changed g_RQ3_printOwnObits to g_RQ3_showOwnKills and it also controls $K // Changed g_RQ3_printOwnObits to g_RQ3_showOwnKills and it also controls $K
@ -1796,19 +1799,13 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
// Makro - we should change some more stuff in here // Makro - we should change some more stuff in here
// shootable doors / buttons don't actually have any health // shootable doors / buttons don't actually have any health
if (targ->s.eType == ET_MOVER && targ->health < 0) { // Makro - they do now !
if (targ->s.eType == ET_MOVER && 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);
} }
/* targ->health = targ->health_saved;
//use the targets of the team master
if (targ->teammaster && targ->teammaster != targ) {
G_UseTargets(targ->teammaster, attacker);
}
//use own targets
G_UseTargets(targ, attacker);
*/
return; return;
} }
//Elder: from action source //Elder: from action source

24
reaction/game/g_mover.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.48 2002/06/21 15:04:55 makro
// Health functionality for movers should be complete now
//
// Revision 1.47 2002/06/16 20:06:14 jbravo // Revision 1.47 2002/06/16 20:06:14 jbravo
// Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap" // Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
// //
@ -1033,6 +1036,11 @@ void InitMover(gentity_t * ent)
if (G_SpawnString("noise", "100", &sound)) { if (G_SpawnString("noise", "100", &sound)) {
ent->s.loopSound = G_SoundIndex(sound); ent->s.loopSound = G_SoundIndex(sound);
} }
//Makro - added
G_SpawnInt("health", "0", &ent->health);
ent->health_saved = ent->health;
// if the "color" or "light" keys are set, setup constantLight // if the "color" or "light" keys are set, setup constantLight
lightSet = G_SpawnFloat("light", "100", &light); lightSet = G_SpawnFloat("light", "100", &light);
colorSet = G_SpawnVector("color", "1 1 1", color); colorSet = G_SpawnVector("color", "1 1 1", color);
@ -1457,11 +1465,13 @@ void SP_func_door(gentity_t * ent)
InitMover(ent); InitMover(ent);
if (!(ent->flags & FL_TEAMSLAVE)) { if (!(ent->flags & FL_TEAMSLAVE)) {
int health; //int health;
int noSpecs = 0; int noSpecs = 0;
G_SpawnInt("health", "0", &health); //G_SpawnInt("health", "0", &ent->health);
if (health) { //Makro - added
//ent->health_saved = ent->health;
if (ent->health) {
ent->takedamage = qtrue; ent->takedamage = qtrue;
} }
//Makro - some doors don't need spectator triggers //Makro - some doors don't need spectator triggers
@ -1599,11 +1609,13 @@ void SP_func_door_rotating(gentity_t * ent)
InitRotator(ent); InitRotator(ent);
if (!(ent->flags & FL_TEAMSLAVE)) { if (!(ent->flags & FL_TEAMSLAVE)) {
int health; //int health;
int noSpecs = 0; int noSpecs = 0;
G_SpawnInt("health", "0", &health); //G_SpawnInt("health", "0", &ent->health);
if (health) { //Makro - added
//ent->health_saved = ent->health;
if (ent->health) {
ent->takedamage = qtrue; ent->takedamage = qtrue;
} }
//Makro - some doors don't need spectator triggers //Makro - some doors don't need spectator triggers

7
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.112 2002/06/21 15:04:55 makro
// Health functionality for movers should be complete now
//
// Revision 1.111 2002/06/20 22:32:43 jbravo // Revision 1.111 2002/06/20 22:32:43 jbravo
// Added last damaged player and fixed a test2 model problem (atrimum my ass :) // Added last damaged player and fixed a test2 model problem (atrimum my ass :)
// Changed g_RQ3_printOwnObits to g_RQ3_showOwnKills and it also controls $K // Changed g_RQ3_printOwnObits to g_RQ3_showOwnKills and it also controls $K
@ -615,9 +618,13 @@ void CleanLevel()
if (!ent->item) { if (!ent->item) {
if (!ent->classname) if (!ent->classname)
continue; continue;
//Makro - reset func_statics each round
if (!Q_stricmp(ent->classname, "func_static")) { if (!Q_stricmp(ent->classname, "func_static")) {
ent->count = (ent->spawnflags & 1); ent->count = (ent->spawnflags & 1);
ent->use(ent, NULL, NULL); ent->use(ent, NULL, NULL);
//Makro - reset door health each round
} else if (ent->s.eType == ET_MOVER && ent->takedamage) {
ent->health = ent->health_saved;
} }
continue; continue;
} }

4
reaction/game/game.dsp
View file

@ -386,5 +386,9 @@ SOURCE=.\zcam.h
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
# End Group # End Group
# Begin Source File
SOURCE=..\ChangeLog
# End Source File
# End Target # End Target
# End Project # End Project

55
reaction/game/game.plg
View file

@ -6,61 +6,6 @@
--------------------Configuration: game - Win32 Release-------------------- --------------------Configuration: game - Win32 Release--------------------
</h3> </h3>
<h3>Command Lines</h3> <h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPA71.tmp" with contents
[
/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"c:\reactionoutput/" /Fp"c:\reactionoutput/game.pch" /YX /Fo"c:\reactionoutput/" /Fd"c:\reactionoutput/" /FD /c
"C:\Games\Quake3\rq3source\reaction\game\ai_dmq3.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPA71.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPA72.tmp" with contents
[
kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"c:\reactionoutput/qagamex86.pdb" /map:"c:\reactionoutput/qagamex86.map" /machine:I386 /def:".\game.def" /out:"..\Release/qagamex86.dll" /implib:"c:\reactionoutput/qagamex86.lib"
\reactionoutput\ai_chat.obj
\reactionoutput\ai_cmd.obj
\reactionoutput\ai_dmnet.obj
\reactionoutput\ai_dmq3.obj
\reactionoutput\ai_main.obj
\reactionoutput\ai_team.obj
\reactionoutput\ai_vcmd.obj
\reactionoutput\bg_misc.obj
\reactionoutput\bg_pmove.obj
\reactionoutput\bg_slidemove.obj
\reactionoutput\g_active.obj
\reactionoutput\g_arenas.obj
\reactionoutput\g_bot.obj
\reactionoutput\g_client.obj
\reactionoutput\g_cmds.obj
\reactionoutput\g_combat.obj
\reactionoutput\g_fileio.obj
\reactionoutput\g_items.obj
\reactionoutput\g_main.obj
\reactionoutput\g_matchmode.obj
\reactionoutput\g_mem.obj
\reactionoutput\g_misc.obj
\reactionoutput\g_missile.obj
\reactionoutput\g_mover.obj
\reactionoutput\g_session.obj
\reactionoutput\g_spawn.obj
\reactionoutput\g_svcmds.obj
\reactionoutput\g_syscalls.obj
\reactionoutput\g_target.obj
\reactionoutput\g_team.obj
\reactionoutput\g_teamplay.obj
\reactionoutput\g_trigger.obj
\reactionoutput\g_utils.obj
\reactionoutput\g_weapon.obj
\reactionoutput\q_math.obj
\reactionoutput\q_shared.obj
\reactionoutput\rxn_game.obj
\reactionoutput\zcam.obj
\reactionoutput\zcam_target.obj
]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPA72.tmp"
<h3>Output Window</h3>
Compiling...
ai_dmq3.c
Linking...
Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp