mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2025-01-31 05:40:49 +00:00
no message
This commit is contained in:
Andrei Drexler
parent
67b5a58e01
commit
84cc2dd1e8
3 changed files with 111 additions and 10 deletions
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.76 2004/03/12 15:56:46 makro
|
||||
// no message
|
||||
//
|
||||
// Revision 1.75 2004/03/09 02:19:01 makro
|
||||
// Bug in the reset function for func_trains
|
||||
//
|
||||
|
|
@ -2426,9 +2429,8 @@ void Reset_Func_Train(gentity_t *ent)
|
|||
if (!ent->nextTrain)
|
||||
return;
|
||||
VectorClear(ent->r.currentAngles);
|
||||
VectorClear(ent->s.apos.trBase);
|
||||
ent->s.apos.trType = TR_STATIONARY;
|
||||
ent->s.apos.trTime = level.time;
|
||||
VectorCopy(ent->r.currentAngles, ent->pos1);
|
||||
SetMoverState(ent, ROTATOR_POS1, level.time);
|
||||
Think_BeginMoving(ent);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.31 2004/03/12 15:56:46 makro
|
||||
// no message
|
||||
//
|
||||
// Revision 1.30 2003/09/18 00:05:06 makro
|
||||
// Lens flares. Opendoor trigger_multiple fixes
|
||||
//
|
||||
|
|
@ -514,6 +517,18 @@ NO_PROTECTION *nothing* stops the damage
|
|||
"dmg" default 5 (whole numbers only)
|
||||
|
||||
*/
|
||||
//Makro - reset function
|
||||
void hurt_reset(gentity_t *ent)
|
||||
{
|
||||
ent->timestamp = level.time;
|
||||
if (!(ent->spawnflags & 1)) {
|
||||
trap_RQ3LinkEntity(ent, __LINE__, __FILE__);
|
||||
} else {
|
||||
//Makro - added
|
||||
trap_RQ3UnlinkEntity(ent, __LINE__, __FILE__);
|
||||
}
|
||||
}
|
||||
|
||||
void hurt_use(gentity_t * self, gentity_t * other, gentity_t * activator)
|
||||
{
|
||||
if (self->r.linked) {
|
||||
|
|
@ -570,6 +585,8 @@ void SP_trigger_hurt(gentity_t * self)
|
|||
//if ( self->spawnflags & 2 ) {
|
||||
self->use = hurt_use;
|
||||
//}
|
||||
//Makro - reset function
|
||||
self->reset = hurt_reset;
|
||||
|
||||
// link in to the world if starting active
|
||||
if (!(self->spawnflags & 1)) {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,52 @@
|
|||
--------------------Configuration: game - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E7.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP506.tmp" with contents
|
||||
[
|
||||
/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"D:\Work\rq3source\reaction\Release/" /Fp"D:\Work\rq3source\reaction\Release/game.pch" /YX /Fo"D:\Work\rq3source\reaction\Release/" /Fd"D:\Work\rq3source\reaction\Release/" /FD /c
|
||||
"D:\Work\rq3source\reaction\game\ai_chat.c"
|
||||
"D:\Work\rq3source\reaction\game\ai_cmd.c"
|
||||
"D:\Work\rq3source\reaction\game\ai_dmnet.c"
|
||||
"D:\Work\rq3source\reaction\game\ai_dmq3.c"
|
||||
"D:\Work\rq3source\reaction\game\ai_main.c"
|
||||
"D:\Work\rq3source\reaction\game\ai_team.c"
|
||||
"D:\Work\rq3source\reaction\game\ai_vcmd.c"
|
||||
"D:\Work\rq3source\reaction\game\bg_misc.c"
|
||||
"D:\Work\rq3source\reaction\game\bg_pmove.c"
|
||||
"D:\Work\rq3source\reaction\game\bg_slidemove.c"
|
||||
"D:\Work\rq3source\reaction\game\g_active.c"
|
||||
"D:\Work\rq3source\reaction\game\g_arenas.c"
|
||||
"D:\Work\rq3source\reaction\game\g_bot.c"
|
||||
"D:\Work\rq3source\reaction\game\g_client.c"
|
||||
"D:\Work\rq3source\reaction\game\g_cmds.c"
|
||||
"D:\Work\rq3source\reaction\game\g_combat.c"
|
||||
"D:\Work\rq3source\reaction\game\g_fileio.c"
|
||||
"D:\Work\rq3source\reaction\game\g_items.c"
|
||||
"D:\Work\rq3source\reaction\game\g_main.c"
|
||||
"D:\Work\rq3source\reaction\game\g_matchmode.c"
|
||||
"D:\Work\rq3source\reaction\game\g_mem.c"
|
||||
"D:\Work\rq3source\reaction\game\g_misc.c"
|
||||
"D:\Work\rq3source\reaction\game\g_missile.c"
|
||||
"D:\Work\rq3source\reaction\game\g_mover.c"
|
||||
"D:\Work\rq3source\reaction\game\g_session.c"
|
||||
"D:\Work\rq3source\reaction\game\g_spawn.c"
|
||||
"D:\Work\rq3source\reaction\game\g_svcmds.c"
|
||||
"D:\Work\rq3source\reaction\game\g_syscalls.c"
|
||||
"D:\Work\rq3source\reaction\game\g_target.c"
|
||||
"D:\Work\rq3source\reaction\game\g_team.c"
|
||||
"D:\Work\rq3source\reaction\game\g_teamplay.c"
|
||||
"D:\Work\rq3source\reaction\game\g_trigger.c"
|
||||
"D:\Work\rq3source\reaction\game\g_unlagged.c"
|
||||
"D:\Work\rq3source\reaction\game\g_utils.c"
|
||||
"D:\Work\rq3source\reaction\game\g_weapon.c"
|
||||
"D:\Work\rq3source\reaction\game\q_math.c"
|
||||
"D:\Work\rq3source\reaction\game\q_shared.c"
|
||||
"D:\Work\rq3source\reaction\game\rxn_game.c"
|
||||
"D:\Work\rq3source\reaction\game\zcam.c"
|
||||
"D:\Work\rq3source\reaction\game\zcam_target.c"
|
||||
]
|
||||
Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E7.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E8.tmp" with contents
|
||||
Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP506.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP507.tmp" with contents
|
||||
[
|
||||
kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/qagamex86.pdb" /map:"D:\Work\rq3source\reaction\Release/qagamex86.map" /machine:I386 /def:".\game.def" /out:"D:\Work\rq3source\reaction\Release\qagamex86.dll" /implib:"D:\Work\rq3source\reaction\Release/qagamex86.lib"
|
||||
\Work\rq3source\reaction\Release\ai_chat.obj
|
||||
|
|
@ -56,13 +95,56 @@ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows
|
|||
\Work\rq3source\reaction\Release\zcam.obj
|
||||
\Work\rq3source\reaction\Release\zcam_target.obj
|
||||
]
|
||||
Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E8.tmp"
|
||||
Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP507.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
ai_chat.c
|
||||
ai_cmd.c
|
||||
ai_dmnet.c
|
||||
ai_dmq3.c
|
||||
ai_main.c
|
||||
ai_team.c
|
||||
ai_vcmd.c
|
||||
bg_misc.c
|
||||
bg_pmove.c
|
||||
bg_slidemove.c
|
||||
g_active.c
|
||||
g_arenas.c
|
||||
g_bot.c
|
||||
g_client.c
|
||||
g_cmds.c
|
||||
D:\Work\rq3source\reaction\game\g_client.c(1640) : warning C4701: local variable 'classname' may be used without having been initialized
|
||||
D:\Work\rq3source\reaction\game\g_cmds.c(2479) : warning C4189: 'door' : local variable is initialized but not referenced
|
||||
g_combat.c
|
||||
g_fileio.c
|
||||
D:\Work\rq3source\reaction\game\g_combat.c(2014) : warning C4700: local variable 'asave' used without having been initialized
|
||||
g_items.c
|
||||
g_main.c
|
||||
g_matchmode.c
|
||||
g_mem.c
|
||||
g_misc.c
|
||||
g_missile.c
|
||||
g_mover.c
|
||||
g_session.c
|
||||
g_spawn.c
|
||||
g_svcmds.c
|
||||
g_syscalls.c
|
||||
g_target.c
|
||||
g_team.c
|
||||
g_teamplay.c
|
||||
g_trigger.c
|
||||
g_unlagged.c
|
||||
g_utils.c
|
||||
g_weapon.c
|
||||
q_math.c
|
||||
D:\Work\rq3source\reaction\game\g_weapon.c(1954) : warning C4701: local variable 'tr' may be used without having been initialized
|
||||
q_shared.c
|
||||
rxn_game.c
|
||||
zcam.c
|
||||
zcam_target.c
|
||||
Linking...
|
||||
Creating library D:\Work\rq3source\reaction\Release/qagamex86.lib and object D:\Work\rq3source\reaction\Release/qagamex86.exp
|
||||
Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2EC.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP50B.tmp" with contents
|
||||
[
|
||||
/nologo /o"D:\Work\rq3source\reaction\Release/game.bsc"
|
||||
\Work\rq3source\reaction\Release\ai_chat.sbr
|
||||
|
|
@ -105,14 +187,14 @@ Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2EC.tmp" with conte
|
|||
\Work\rq3source\reaction\Release\rxn_game.sbr
|
||||
\Work\rq3source\reaction\Release\zcam.sbr
|
||||
\Work\rq3source\reaction\Release\zcam_target.sbr]
|
||||
Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2EC.tmp"
|
||||
Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP50B.tmp"
|
||||
Creating browse info file...
|
||||
<h3>Output Window</h3>
|
||||
|
||||
|
||||
|
||||
<h3>Results</h3>
|
||||
qagamex86.dll - 0 error(s), 0 warning(s)
|
||||
qagamex86.dll - 0 error(s), 4 warning(s)
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Reference in a new issue