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

new ctb marker shader names

Browse source
This commit is contained in:
Bryce Hutchings 2002-08-27 05:10:42 +00:00
parent b8a3f3a123
commit 116ec5e169
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reaction/cgame/cg_ents.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.31 2002/08/27 05:10:42 niceass
// new ctb marker shader names
//
// Revision 1.30 2002/07/19 04:33:52 niceass // Revision 1.30 2002/07/19 04:33:52 niceass
// laser fog fix and ctb markers // laser fog fix and ctb markers
// //
@ -980,10 +983,10 @@ static void CG_DrawDecal(centity_t * cent)
CG_Trace(&trace, cent->lerpOrigin, NULL, NULL, end, 0, CONTENTS_SOLID | CONTENTS_PLAYERCLIP); CG_Trace(&trace, cent->lerpOrigin, NULL, NULL, end, 0, CONTENTS_SOLID | CONTENTS_PLAYERCLIP);
if (cent->currentState.modelindex == TEAM_RED) if (cent->currentState.modelindex == TEAM_RED)
CG_ImpactMark(cgs.media.ctbXMark1, trace.endpos, trace.plane.normal, 45.0f, CG_ImpactMark(cgs.media.ctbXMarkSilver, trace.endpos, trace.plane.normal, 45.0f,
1, 1, 1, 1, qfalse, radius, qtrue); 1, 1, 1, 1, qfalse, radius, qtrue);
else else
CG_ImpactMark(cgs.media.ctbXMark2, trace.endpos, trace.plane.normal, 45.0f, CG_ImpactMark(cgs.media.ctbOMarkBlack, trace.endpos, trace.plane.normal, 45.0f,
1, 1, 1, 1, qfalse, radius, qtrue); 1, 1, 1, 1, qfalse, radius, qtrue);
} }
} }

7
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.120 2002/08/27 05:10:42 niceass
// new ctb marker shader names
//
// Revision 1.119 2002/08/25 07:08:41 niceass // Revision 1.119 2002/08/25 07:08:41 niceass
// added "life" setting to func_pressure // added "life" setting to func_pressure
// //
@ -1169,8 +1172,8 @@ typedef struct {
// wall mark shaders // wall mark shaders
qhandle_t wakeMarkShader; qhandle_t wakeMarkShader;
qhandle_t bloodMarkShader; qhandle_t bloodMarkShader;
qhandle_t ctbXMark1; qhandle_t ctbXMarkSilver;
qhandle_t ctbXMark2; qhandle_t ctbOMarkBlack;
qhandle_t bulletMarkShader; qhandle_t bulletMarkShader;
qhandle_t burnMarkShader; qhandle_t burnMarkShader;
qhandle_t holeMarkShader; qhandle_t holeMarkShader;

7
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.104 2002/08/27 05:10:05 niceass
// new ctb marker shader names
//
// Revision 1.103 2002/08/25 00:45:24 niceass // Revision 1.103 2002/08/25 00:45:24 niceass
// q3f atmosphere // q3f atmosphere
// //
@ -1867,8 +1870,8 @@ static void CG_RegisterGraphics(void)
cgs.media.shadowMarkShader = trap_R_RegisterShader("markShadow"); cgs.media.shadowMarkShader = trap_R_RegisterShader("markShadow");
cgs.media.wakeMarkShader = trap_R_RegisterShader("wake"); cgs.media.wakeMarkShader = trap_R_RegisterShader("wake");
cgs.media.bloodMarkShader = trap_R_RegisterShader("bloodMark"); cgs.media.bloodMarkShader = trap_R_RegisterShader("bloodMark");
cgs.media.ctbXMark1 = trap_R_RegisterShader("ctbXMark1"); cgs.media.ctbXMarkSilver = trap_R_RegisterShader("ctbXMarkSilver");
cgs.media.ctbXMark2 = trap_R_RegisterShader("ctbXMark2"); cgs.media.ctbOMarkBlack = trap_R_RegisterShader("ctbOMarkBlack");
//Blaze: added for explosive boxes and grenades //Blaze: added for explosive boxes and grenades
cgs.media.grenadeExplosionShader = trap_R_RegisterShader("grenadeExplosion"); cgs.media.grenadeExplosionShader = trap_R_RegisterShader("grenadeExplosion");
// Elder: added // Elder: added