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

no message

Browse source
This commit is contained in:
Andrei Drexler 2003-01-06 00:23:29 +00:00
parent 0e72a8b949
commit b94dbab647
4 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.134 2003/01/06 00:23:29 makro
// no message
//
// Revision 1.133 2003/01/05 22:36:50 makro // Revision 1.133 2003/01/05 22:36:50 makro
// Added "inactive" field for entities // Added "inactive" field for entities
// New "target_activate" entity // New "target_activate" entity
@ -516,6 +519,7 @@ struct gentity_s {
//Blaze: Holds the target set by a button //Blaze: Holds the target set by a button
char *pathtarget; char *pathtarget;
//Makro - added //Makro - added
char *activatename;
int inactive; int inactive;
}; };

6
reaction/game/g_spawn.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.42 2003/01/06 00:23:29 makro
// no message
//
// Revision 1.41 2003/01/05 22:36:50 makro // Revision 1.41 2003/01/05 22:36:50 makro
// Added "inactive" field for entities // Added "inactive" field for entities
// New "target_activate" entity // New "target_activate" entity
@ -222,7 +225,8 @@ field_t fields[] = {
{"targetShaderNewName", FOFS(targetShaderNewName), F_LSTRING}, {"targetShaderNewName", FOFS(targetShaderNewName), F_LSTRING},
{"distance", FOFS(distance), F_FLOAT}, // VALKYRIE: for rotating doors {"distance", FOFS(distance), F_FLOAT}, // VALKYRIE: for rotating doors
{"pathtarget", FOFS(pathtarget), F_LSTRING}, // Makro - for func_trains {"pathtarget", FOFS(pathtarget), F_LSTRING}, // Makro - for func_trains
{"inactive", FOFS(inactive), F_INT}, // Makro - for func_trains {"inactive", FOFS(inactive), F_INT}, // Makro - added
{"activatename", FOFS(activatename), F_LSTRING},
{NULL} {NULL}
}; };

20
reaction/game/g_target.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.10 2003/01/06 00:23:29 makro
// no message
//
// Revision 1.9 2003/01/05 22:36:50 makro // Revision 1.9 2003/01/05 22:36:50 makro
// Added "inactive" field for entities // Added "inactive" field for entities
// New "target_activate" entity // New "target_activate" entity
@ -447,13 +450,15 @@ void target_activate_use(gentity_t * self, gentity_t * other, gentity_t * activa
gentity_t *loop = NULL; gentity_t *loop = NULL;
int action = 0; int action = 0;
if (!Q_stricmp(self->pathtarget, "on")) { if (self->pathtarget) {
action = 1; if (!Q_stricmp(self->pathtarget, "on")) {
} else if (!Q_stricmp(self->pathtarget, "off")) { action = 1;
action = 2; } else if (!Q_stricmp(self->pathtarget, "off")) {
action = 2;
}
} }
for (loop = G_Find(NULL, FOFS(targetname), self->target); loop; G_Find(loop, FOFS(targetname), self->target)) { for (loop = G_Find(NULL, FOFS(activatename), self->target); loop; loop = G_Find(loop, FOFS(activatename), self->target)) {
switch (action) { switch (action) {
case 1: case 1:
loop->inactive = 0; loop->inactive = 0;
@ -470,6 +475,11 @@ void target_activate_use(gentity_t * self, gentity_t * other, gentity_t * activa
void SP_target_activate(gentity_t * self) void SP_target_activate(gentity_t * self)
{ {
if (!self->target) {
G_Printf(S_COLOR_YELLOW "WARNING: target_activate with no target at %s^7\n", vtos(self->s.origin));
G_FreeEntity(self);
return;
}
self->use = target_activate_use; self->use = target_activate_use;
} }

30
reaction/game/game.plg
View file

@ -3,25 +3,16 @@
<pre> <pre>
<h1>Build Log</h1> <h1>Build Log</h1>
<h3> <h3>
--------------------Configuration: cgame - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
<h3>Results</h3>
cgamex86.dll - 0 error(s), 0 warning(s)
<h3>
--------------------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\RSP2D.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP81.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 /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\g_spawn.c" "C:\Games\Quake3\rq3source\reaction\game\g_target.c"
] ]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2D.tmp" Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP81.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP82.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" 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_chat.obj
@ -64,10 +55,10 @@ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows
\reactionoutput\zcam.obj \reactionoutput\zcam.obj
\reactionoutput\zcam_target.obj \reactionoutput\zcam_target.obj
] ]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E.tmp" Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP82.tmp"
<h3>Output Window</h3> <h3>Output Window</h3>
Compiling... Compiling...
g_spawn.c g_target.c
Linking... Linking...
Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
@ -75,15 +66,6 @@ Linking...
<h3>Results</h3> <h3>Results</h3>
qagamex86.dll - 0 error(s), 0 warning(s) qagamex86.dll - 0 error(s), 0 warning(s)
<h3>
--------------------Configuration: ui - Win32 Release TA--------------------
</h3>
<h3>Command Lines</h3>
<h3>Results</h3>
uix86.dll - 0 error(s), 0 warning(s)
</pre> </pre>
</body> </body>
</html> </html>