mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2024-11-10 23:32:06 +00:00
Fixed a bug in the sky portal code
This commit is contained in:
Andrei Drexler
parent
9057628f98
commit
0d5dafd250
2 changed files with 101 additions and 10 deletions
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.63 2003/01/11 17:42:18 makro
|
||||
// Fixed a bug in the sky portal code
|
||||
//
|
||||
// Revision 1.62 2002/08/30 00:00:16 makro
|
||||
// Sky portals
|
||||
//
|
||||
|
|
@ -492,16 +495,15 @@ void SP_misc_sky_portal(gentity_t * ent)
|
|||
trap_GetConfigstring(CS_SKYPORTAL, info, sizeof(info));
|
||||
|
||||
ent->r.svFlags |= SVF_PORTAL;
|
||||
VectorClear(ent->r.mins);
|
||||
VectorClear(ent->r.maxs);
|
||||
trap_LinkEntity(ent);
|
||||
|
||||
if (!info[0]) {
|
||||
gentity_t *skyportal = G_Find(NULL, FOFS(targetname), ent->target);
|
||||
|
||||
//G_Printf("^1 SKY PORTAL !!!\n");
|
||||
|
||||
VectorClear(ent->r.mins);
|
||||
VectorClear(ent->r.maxs);
|
||||
trap_LinkEntity(ent);
|
||||
|
||||
if (skyportal) {
|
||||
memset(info, 0, sizeof(info));
|
||||
Info_SetValueForKey(info, "x", va("%f", skyportal->s.origin[0]));
|
||||
|
|
@ -515,7 +517,7 @@ void SP_misc_sky_portal(gentity_t * ent)
|
|||
//ent->s.eType = ET_PORTAL;
|
||||
//ent->r.svFlags |= SVF_BROADCAST;
|
||||
} else {
|
||||
G_Printf("misc_sky_portal entity with bad target at %s\n", vtos(ent->s.origin));
|
||||
G_Printf(S_COLOR_YELLOW "WARNING: misc_sky_portal entity with bad target at %s\n", vtos(ent->s.origin));
|
||||
trap_SetConfigstring(CS_SKYPORTAL, "");
|
||||
G_FreeEntity(ent);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,16 +3,58 @@
|
|||
<pre>
|
||||
<h1>Build Log</h1>
|
||||
<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--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP81.tmp" with contents
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP14.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_chat.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\ai_cmd.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\ai_dmnet.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\ai_dmq3.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\ai_main.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\ai_team.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\ai_vcmd.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_active.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_arenas.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_bot.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_client.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_cmds.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_combat.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_fileio.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_items.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_main.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_matchmode.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_mem.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_misc.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_missile.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_mover.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_session.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_spawn.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_svcmds.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_syscalls.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_target.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_team.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_teamplay.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_trigger.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_utils.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\g_weapon.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\rxn_game.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\zcam.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\game\zcam_target.c"
|
||||
]
|
||||
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP81.tmp"
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP82.tmp" with contents
|
||||
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP14.tmp"
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP15.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
|
||||
|
|
@ -55,17 +97,64 @@ 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\RSP82.tmp"
|
||||
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP15.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
ai_chat.c
|
||||
ai_cmd.c
|
||||
ai_dmnet.c
|
||||
ai_dmq3.c
|
||||
C:\Games\Quake3\rq3source\reaction\game\ai_dmq3.c(2703) : warning C4101: 'info1' : unreferenced local variable
|
||||
C:\Games\Quake3\rq3source\reaction\game\ai_dmq3.c(2703) : warning C4101: 'info2' : unreferenced local variable
|
||||
ai_main.c
|
||||
ai_team.c
|
||||
ai_vcmd.c
|
||||
g_active.c
|
||||
g_arenas.c
|
||||
g_bot.c
|
||||
g_client.c
|
||||
g_cmds.c
|
||||
C:\Games\Quake3\rq3source\reaction\game\g_client.c(1572) : warning C4701: local variable 'classname' may be used without having been initialized
|
||||
g_combat.c
|
||||
g_fileio.c
|
||||
C:\Games\Quake3\rq3source\reaction\game\g_combat.c(2123) : 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_utils.c
|
||||
g_weapon.c
|
||||
rxn_game.c
|
||||
C:\Games\Quake3\rq3source\reaction\game\g_weapon.c(1998) : warning C4701: local variable 'tr' may be used without having been initialized
|
||||
zcam.c
|
||||
zcam_target.c
|
||||
Linking...
|
||||
Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
|
||||
|
||||
|
||||
|
||||
<h3>Results</h3>
|
||||
qagamex86.dll - 0 error(s), 0 warning(s)
|
||||
qagamex86.dll - 0 error(s), 5 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>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Reference in a new issue