q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-28 14:42:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

make quad glow purple

Browse source 
quad purple glow
some preparations for 0.5
This commit is contained in:
P3rlE 2022-03-02 05:55:45 +01:00
parent da3fe95b71
commit 738bc1b80c
4 changed files with 56 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
engine/code/cgame/cg_players.c
View file

@ -2380,7 +2380,8 @@ static void CG_PlayerPowerups( centity_t *cent, refEntity_t *torso ) {
// quad gives a dlight // quad gives a dlight
if ( powerups & ( 1 << PW_QUAD ) ) { if ( powerups & ( 1 << PW_QUAD ) ) {
trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 0.2f, 1 ); // trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 0.2f, 1.0 );
trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.63f, 0.13f, 0.94f );
} }
// flight plays a looped sound // flight plays a looped sound
@ -2415,6 +2416,33 @@ static void CG_PlayerPowerups( centity_t *cent, refEntity_t *torso ) {
trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 0.2f, 1.0 ); trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 0.2f, 1.0 );
} }
/* finish in 0.5
// greenflag
if ( powerups & ( 1 << PW_GREENFLAG ) ) {
if (ci->newAnims){
CG_PlayerFlag( cent, cgs.media.greenFlagFlapSkin, torso );
}
else {
CG_TrailItem( cent, cgs.media.greenFlagModel );
}
trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 1.0, 0.2f );
}
// yellowflag
if ( powerups & ( 1 << PW_YELLOWFLAG ) ) {
if (ci->newAnims){
CG_PlayerFlag( cent, cgs.media.yellowFlagFlapSkin, torso );
}
else {
CG_TrailItem( cent, cgs.media.yellowFlagModel );
}
trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 1.0, 1.0, 0.2f );
}
// end finish in 0.5
*/
// neutralflag // neutralflag
if ( powerups & ( 1 << PW_NEUTRALFLAG ) ) { if ( powerups & ( 1 << PW_NEUTRALFLAG ) ) {
if (ci->newAnims) { if (ci->newAnims) {

2
engine/code/game/bg_public.h
View file

@ -404,6 +404,8 @@ typedef enum {
PW_REDFLAG, PW_REDFLAG,
PW_BLUEFLAG, PW_BLUEFLAG,
// PW_GREENFLAG,
// PW_YELLOWFLAG,
PW_NEUTRALFLAG, PW_NEUTRALFLAG,
#ifdef MISSIONPACK #ifdef MISSIONPACK

2
engine/code/qcommon/q_shared.h
View file

@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.4_r493" #define PRODUCT_VERSION "v0.4_r494"
#endif #endif

52
q3rallycode.ppr
View file

@ -886,37 +886,33 @@ q3rallycode
engine\cross-make-mingw64.sh engine\cross-make-mingw64.sh
[Open project files] [Open project files]
0=engine\code\qcommon\q_shared.h 0=engine\code\qcommon\q_shared.h
1=engine\code\qcommon\files.c 1=engine\code\cgame\cg_ents.c
2=engine\code\q3_ui\ui_menu.c 2=engine\code\cgame\cg_local.h
3=engine\code\q3_ui\ui_rally_credits.c 3=engine\code\cgame\cg_main.c
4=engine\code\cgame\cg_rally_hud.c 4=engine\code\cgame\cg_players.c
5=engine\code\cgame\cg_rally_hud2.c 5=engine\code\cgame\cg_draw.c
6=engine\code\cgame\cg_draw.c 6=engine\code\game\bg_public.h
7=engine\code\cgame\cg_main.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\cgame\cg_main.c Selected=engine\code\game\bg_public.h
[engine\code\qcommon\q_shared.h] [engine\code\qcommon\q_shared.h]
TopLine=58 TopLine=58
Caret=35,70 Caret=35,70
[engine\code\qcommon\files.c] [engine\code\cgame\cg_ents.c]
TopLine=4189 TopLine=144
Caret=3,4205 Caret=1,160
[engine\code\q3_ui\ui_menu.c] [engine\code\cgame\cg_local.h]
TopLine=417 TopLine=420
Caret=77,440 Caret=1,436
[engine\code\q3_ui\ui_rally_credits.c]
TopLine=90
Caret=79,106
[engine\code\cgame\cg_rally_hud.c]
TopLine=609
Caret=14,550
[engine\code\cgame\cg_rally_hud2.c]
TopLine=378
Caret=33,422
[engine\code\cgame\cg_draw.c]
TopLine=3052
Caret=3,3095
[engine\code\cgame\cg_main.c] [engine\code\cgame\cg_main.c]
TopLine=2166 TopLine=1086
Caret=22,2174 Caret=1,1116
[engine\code\cgame\cg_players.c]
TopLine=2407
Caret=37,2422
[engine\code\cgame\cg_draw.c]
TopLine=320
Caret=1,336
[engine\code\game\bg_public.h]
TopLine=390
Caret=3,408