q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-24 12:51:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed rear view mirror bug where the mirror disappears sometimes

Browse source
This commit is contained in:
q3rally 2021-09-28 21:05:40 +00:00
parent ffad5677c5
commit c73f893280
4 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
engine/code/cgame/cg_draw.c
View file

@ -568,7 +568,6 @@ void CG_DrawSigilHUD( void ) {
/* /*
================ ================
CG_DrawStatusBar CG_DrawStatusBar
================ ================
*/ */
#ifndef MISSIONPACK #ifndef MISSIONPACK
@ -706,10 +705,9 @@ static void CG_DrawStatusBar( void ) {
/* /*
================ =====================
CG_DrawRallyStatusBar CG_DrawRallyStatusBar
=====================
================
*/ */
static void CG_DrawRallyStatusBar( void ) { static void CG_DrawRallyStatusBar( void ) {
int color; int color;
@ -975,7 +973,6 @@ static void CG_DrawRallyStatusBar( void ) {
/* /*
================ ================
CG_DrawAttacker CG_DrawAttacker
================ ================
*/ */
static float CG_DrawAttacker( float y ) { static float CG_DrawAttacker( float y ) {
@ -1030,9 +1027,9 @@ static float CG_DrawAttacker( float y ) {
} }
/* /*
================== ===============
CG_DrawSnapshot CG_DrawSnapshot
================== ===============
*/ */
static float CG_DrawSnapshot( float y ) { static float CG_DrawSnapshot( float y ) {
char *s; char *s;
@ -1048,9 +1045,9 @@ static float CG_DrawSnapshot( float y ) {
} }
/* /*
================== ==========
CG_DrawFPS CG_DrawFPS
================== ==========
*/ */
#define FPS_FRAMES 4 #define FPS_FRAMES 4
static float CG_DrawFPS( float y ) { static float CG_DrawFPS( float y ) {

8
engine/code/cgame/cg_rally_hud.c
View file

@ -26,9 +26,9 @@ CG_DrawRearviewMirror
===================== =====================
*/ */
void CG_DrawRearviewMirror( float x, float y, float w, float h) { void CG_DrawRearviewMirror( float x, float y, float w, float h) {
static int lastLowFPSTime; // static int lastLowFPSTime;
int i; int i;
int fps; // int fps;
float mx, my, mw, mh; float mx, my, mw, mh;
int tmp; int tmp;
@ -41,6 +41,8 @@ void CG_DrawRearviewMirror( float x, float y, float w, float h) {
if (cgs.clientinfo[cg.snap->ps.clientNum].team == TEAM_SPECTATOR) if (cgs.clientinfo[cg.snap->ps.clientNum].team == TEAM_SPECTATOR)
return; return;
/*
if (cg_fpsLimit.integer >= 100) if (cg_fpsLimit.integer >= 100)
return; return;
@ -60,6 +62,8 @@ void CG_DrawRearviewMirror( float x, float y, float w, float h) {
} }
} }
*/
mx = x - 8; mx = x - 8;
my = y - 7; my = y - 7;
mw = w * 1.0534F; mw = w * 1.0534F;

8
engine/code/q3_ui/ui_rally_gfxloading.c
View file

@ -35,9 +35,9 @@ static gfxloading_t s_gfxloading;
/* /*
=============== ============================
UI_GFX_Loading_HandleCaching UI_GFX_Loading_HandleCaching
=============== ============================
*/ */
#define NUM_OF_CACHES 7 #define NUM_OF_CACHES 7
static void UI_GFX_Loading_HandleCaching( void ) { static void UI_GFX_Loading_HandleCaching( void ) {
@ -103,9 +103,9 @@ static void UI_GFX_Loading_HandleCaching( void ) {
/* /*
=============== =======================
UI_GFX_Loading_MenuDraw UI_GFX_Loading_MenuDraw
=============== =======================
*/ */
static void UI_GFX_Loading_MenuDraw( void ) { static void UI_GFX_Loading_MenuDraw( void ) {
Menu_Draw( &s_gfxloading.menu ); Menu_Draw( &s_gfxloading.menu );

16
q3rallycode.ppr
View file

@ -454,7 +454,7 @@ q3rallycode
engine\code\null\null_main.c engine\code\null\null_main.c
engine\code\null\null_net.c engine\code\null\null_net.c
engine\code\null\null_snddma.c engine\code\null\null_snddma.c
-q3_ui +q3_ui
engine\code\q3_ui\ui.def engine\code\q3_ui\ui.def
engine\code\q3_ui\ui_addbots.c engine\code\q3_ui\ui_addbots.c
engine\code\q3_ui\ui_atoms.c engine\code\q3_ui\ui_atoms.c
@ -892,15 +892,16 @@ q3rallycode
4=engine\code\cgame\cg_main.c 4=engine\code\cgame\cg_main.c
5=engine\code\cgame\cg_draw.c 5=engine\code\cgame\cg_draw.c
6=engine\code\cgame\cg_newdraw.c 6=engine\code\cgame\cg_newdraw.c
7=engine\code\q3_ui\ui_rally_gfxloading.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\cgame\cg_draw.c Selected=engine\code\cgame\cg_rally_hud.c
[engine\code\qcommon\q_shared.h] [engine\code\qcommon\q_shared.h]
TopLine=57 TopLine=57
Caret=36,70 Caret=36,70
[engine\code\cgame\cg_rally_hud.c] [engine\code\cgame\cg_rally_hud.c]
TopLine=929 TopLine=44
Caret=1,755 Caret=1,45
[engine\code\cgame\cg_rally_hud2.c] [engine\code\cgame\cg_rally_hud2.c]
TopLine=1 TopLine=1
Caret=1,1 Caret=1,1
@ -911,8 +912,11 @@ Caret=1,1677
TopLine=348 TopLine=348
Caret=35,364 Caret=35,364
[engine\code\cgame\cg_draw.c] [engine\code\cgame\cg_draw.c]
TopLine=798 TopLine=3369
Caret=17,815 Caret=1,3385
[engine\code\cgame\cg_newdraw.c] [engine\code\cgame\cg_newdraw.c]
TopLine=524 TopLine=524
Caret=1,540 Caret=1,540
[engine\code\q3_ui\ui_rally_gfxloading.c]
TopLine=99
Caret=24,108