Small func_static change.Give ammo should now give grenades/knives

This commit is contained in:
Andrei Drexler 2002-05-15 12:46:32 +00:00
parent 48fdeade66
commit 1762754b07
3 changed files with 15 additions and 21 deletions

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.111 2002/05/15 12:46:32 makro
// Small func_static change.Give ammo should now give grenades/knives
//
// Revision 1.110 2002/05/12 19:15:47 jbravo
// Added playerlist, did some cleanup on votes.
//
@ -538,6 +541,8 @@ void Cmd_Give_f (gentity_t *ent)
//Makro - I want clips, dammit !
Add_Ammo(ent, i, 100, 1);
}
//Makro - added grenade + knife
ent->client->ps.stats[STAT_WEAPONS] |= (1 << WP_GRENADE) | (1 << WP_KNIFE);
if (!give_all)
return;
}

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.30 2002/05/15 12:46:32 makro
// Small func_static change.Give ammo should now give grenades/knives
//
// Revision 1.29 2002/05/13 04:41:26 makro
// Bug with doors (mine !)
//
@ -2194,18 +2197,9 @@ void SP_func_static( gentity_t *ent ) {
VectorCopy( ent->s.origin, ent->s.pos.trBase );
VectorCopy( ent->s.origin, ent->r.currentOrigin );
//Makro - added
if ( ent->spawnflags & 1 ) {
ent->s.eFlags |= EF_NODRAW;
ent->r.contents = CONTENTS_TRIGGER;
ent->r.svFlags |= SVF_NOCLIENT;
ent->count = 0;
} else {
ent->s.eFlags &= ~EF_NODRAW;
ent->r.contents = CONTENTS_SOLID;
ent->r.svFlags &= ~SVF_NOCLIENT;
ent->count = 1;
}
ent->count = (ent->spawnflags & 1);
ent->use = use_func_static;
ent->use(ent, NULL, NULL);
//end Makro
}

View file

@ -6,15 +6,13 @@
--------------------Configuration: game - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BB.tmp" with contents
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP536.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\bg_misc.c"
"C:\Games\Quake3\rq3source\reaction\game\g_mover.c"
"C:\Games\Quake3\rq3source\reaction\game\g_weapon.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BB.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BC.tmp" with contents
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP536.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP537.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
@ -57,20 +55,17 @@ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows
\reactionoutput\zcam.obj
\reactionoutput\zcam_target.obj
]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BC.tmp"
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP537.tmp"
<h3>Output Window</h3>
Compiling...
bg_misc.c
g_mover.c
g_weapon.c
C:\Games\Quake3\rq3source\reaction\game\g_weapon.c(2690) : warning C4701: local variable 'tr' may be used without having been initialized
Linking...
Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
<h3>Results</h3>
qagamex86.dll - 0 error(s), 1 warning(s)
qagamex86.dll - 0 error(s), 0 warning(s)
</pre>
</body>
</html>