rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-10 23:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

no message

Browse source
This commit is contained in:
Andrei Drexler 2003-09-07 19:51:40 +00:00
parent d99a88d885
commit 94c3d54839
6 changed files with 116 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reaction/cgame/cg_ents.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.46 2003/09/07 19:51:39 makro
// no message
//
// Revision 1.45 2003/08/26 19:28:37 makro
// target_speakers
//
@ -1089,7 +1092,7 @@ void CG_AddPacketEntities(int mode)
int num;
//Makro - if we're rendering the entities in a sky portal, we don't need this stuff
if (mode != 1) {
if (mode != ADDENTS_SKYPORTAL) {
playerState_t *ps;
// set cg.frameInterpolation
@ -1140,21 +1143,25 @@ void CG_AddPacketEntities(int mode)
}
}
if (mode != -1) {
//Makro - if we have a sky portal
if (mode != ADDENTS_NOSKYPORTAL) {
// add each entity sent over by the server
for (num = 0; num < cg.snap->numEntities; num++) {
cent = &cg_entities[cg.snap->entities[num].number];
if (mode == 1) {
//if we're adding sky portal entities
if (mode == ADDENTS_SKYPORTAL) {
if (cent->currentState.eFlags & EF_HEADLESS) {
CG_AddCEntity(cent);
}
//if not, we're adding normal entities
} else {
if (!(cent->currentState.eFlags & EF_HEADLESS) || cent->currentState.eType == ET_PLAYER) {
CG_AddCEntity(cent);
}
}
}
//no sky portal defined, just add all the entities without checking if they're
//sky portal entities or not (faster)
} else {
for (num = 0; num < cg.snap->numEntities; num++) {
cent = &cg_entities[cg.snap->entities[num].number];

6
reaction/cgame/cg_event.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.74 2003/09/07 19:51:39 makro
// no message
//
// Revision 1.73 2003/07/30 16:05:46 makro
// no message
//
@ -1426,7 +1429,8 @@ void CG_EntityEvent(centity_t * cent, vec3_t position)
case EV_PRESSURE:
DEBUGNAME("EV_PRESSURE");
ByteToDir(es->eventParm, dir);
CG_Pressure(position, dir, es->frame, es->powerups, es->constantLight);
//Makro - changed from constantLight to generic1
CG_Pressure(position, dir, es->frame, es->powerups, es->generic1);
break;
case EV_STOPLOOPINGSOUND:

6
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.152 2003/09/07 19:51:40 makro
// no message
//
// Revision 1.151 2003/09/01 15:09:48 jbravo
// Cleanups, crashbug fix and version bumped to 3.2
//
@ -2116,6 +2119,9 @@ void CG_PainEvent(centity_t * cent, int health);
void CG_SetEntitySoundPosition(centity_t * cent);
//Makro - added skyportal param
//void CG_AddPacketEntities(void);
#define ADDENTS_NOSKYPORTAL -1
#define ADDENTS_NORMAL 0
#define ADDENTS_SKYPORTAL 1
void CG_AddPacketEntities(int mode);
void CG_Beam(centity_t * cent);
void CG_AdjustPositionForMover(const vec3_t in, int moverNum, int fromTime, int toTime, vec3_t out);

9
reaction/cgame/cg_view.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.36 2003/09/07 19:51:40 makro
// no message
//
// Revision 1.35 2003/08/10 20:13:26 makro
// no message
//
@ -1007,7 +1010,7 @@ Generates and draws a game scene and status information at the given time.
void CG_DrawActiveFrame(int serverTime, stereoFrame_t stereoView, qboolean demoPlayback)
{
int inwater;
int skyPortalMode = -1;
int skyPortalMode = ADDENT_NOSKYPORTAL;
//Blaze: for cheat detection
int i;
@ -1082,8 +1085,8 @@ void CG_DrawActiveFrame(int serverTime, stereoFrame_t stereoView, qboolean demoP
//Makro - draw sky portal first
if (cgs.skyPortalSet) {
vec3_t oldOrigin;
skyPortalMode = 0;
CG_AddPacketEntities(1);
CG_AddPacketEntities(ADDENTS_SKYPORTAL);
skyPortalMode = ADDENTS_NORMAL;
VectorCopy(cg.refdef.vieworg, oldOrigin);
VectorCopy(cgs.skyPortalOrigin, cg.refdef.vieworg);
trap_R_RenderScene(&cg.refdef);

2
reaction/cgame/cgame.dsp
View file

@ -45,7 +45,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /G6 /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /G6 /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"

113
reaction/cgame/cgame.plg
View file

@ -6,13 +6,33 @@
--------------------Configuration: cgame - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B3.tmp" with contents
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP32B.tmp" with contents
[
/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"Release/cgame.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c
/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"Release/" /Fp"Release/cgame.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c
"C:\Games\Quake3\rq3source\reaction\cgame\cg_atmospheric.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_consolecmds.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_draw.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_drawtools.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_effects.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_ents.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_event.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_info.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_localents.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_main.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_marks.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_players.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_playerstate.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_predict.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_scoreboard.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_servercmds.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_snapshot.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_syscalls.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_unlagged.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_view.c"
"C:\Games\Quake3\rq3source\reaction\cgame\cg_weapons.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B3.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B4.tmp" with contents
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP32B.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP32C.tmp" with contents
[
/nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"Release/cgamex86.pdb" /map:"Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"../Release/cgamex86.dll" /implib:"Release/cgamex86.lib"
.\Release\bg_misc.obj
@ -43,35 +63,76 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B4.tmp" with conte
.\Release\q_shared.obj
.\Release\ui_shared.obj
]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B4.tmp"
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP32C.tmp"
<h3>Output Window</h3>
Compiling...
cg_atmospheric.c
cg_consolecmds.c
C:\Games\Quake3\rq3source\reaction\cgame\cg_atmospheric.c(626) : warning C4706: assignment within conditional expression
C:\Games\Quake3\rq3source\reaction\cgame\cg_atmospheric.c(638) : warning C4706: assignment within conditional expression
C:\Games\Quake3\rq3source\reaction\cgame\cg_atmospheric.c(184) : warning C4701: local variable 'tr' may be used without having been initialized
C:\Games\Quake3\rq3source\reaction\cgame\cg_atmospheric.c(334) : warning C4701: local variable 'tr' may be used without having been initialized
cg_draw.c
cg_drawtools.c
cg_effects.c
cg_ents.c
Linking...
Creating library Release/cgamex86.lib and object Release/cgamex86.exp
cg_event.c
cg_info.c
cg_localents.c
cg_main.c
cg_marks.c
cg_players.c
cg_playerstate.c
cg_predict.c
cg_scoreboard.c
C:\Games\Quake3\rq3source\reaction\cgame\cg_predict.c(805) : warning C4701: local variable 'predictCmd' may be used without having been initialized
C:\Games\Quake3\rq3source\reaction\cgame\cg_predict.c(809) : warning C4701: local variable 'stateIndex' may be used without having been initialized
cg_servercmds.c
cg_snapshot.c
cg_syscalls.c
cg_unlagged.c
cg_view.c
C:\Games\Quake3\rq3source\reaction\cgame\cg_view.c(1010) : error C2065: 'ADDENT_NOSKYPORTAL' : undeclared identifier
cg_weapons.c
Error executing cl.exe.
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP32D.tmp" with contents
[
/nologo /o"Release/cgame.bsc"
.\Release\bg_misc.sbr
.\Release\bg_pmove.sbr
.\Release\bg_slidemove.sbr
.\Release\cg_atmospheric.sbr
.\Release\cg_consolecmds.sbr
.\Release\cg_draw.sbr
.\Release\cg_drawtools.sbr
.\Release\cg_effects.sbr
.\Release\cg_ents.sbr
.\Release\cg_event.sbr
.\Release\cg_info.sbr
.\Release\cg_localents.sbr
.\Release\cg_main.sbr
.\Release\cg_marks.sbr
.\Release\cg_players.sbr
.\Release\cg_playerstate.sbr
.\Release\cg_predict.sbr
.\Release\cg_scoreboard.sbr
.\Release\cg_servercmds.sbr
.\Release\cg_snapshot.sbr
.\Release\cg_syscalls.sbr
.\Release\cg_unlagged.sbr
.\Release\cg_view.sbr
.\Release\cg_weapons.sbr
.\Release\q_math.sbr
.\Release\q_shared.sbr
.\Release\ui_shared.sbr]
Creating command line "bscmake.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP32D.tmp"
Creating browse info file...
<h3>Output Window</h3>
<h3>Results</h3>
cgamex86.dll - 0 error(s), 0 warning(s)
<h3>
--------------------Configuration: game - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
<h3>Results</h3>
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)
cgamex86.dll - 1 error(s), 6 warning(s)
</pre>
</body>
</html>