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

Commented out the minimap feature. not sure if it comes back.

Browse source
This commit is contained in:
q3rally 2015-11-12 22:47:10 +00:00
parent 6135a77e57
commit f6393c97a2
6 changed files with 32 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3355,7 +3355,7 @@ void CG_DrawActive( stereoFrame_t stereoView ) {
if ( !cg.scoreBoardShowing )
CG_DrawRearviewMirror( 170, 10, 300, 75);
CG_DrawMMap( 0, 50, 160, 120); //TBB draw minimap function
// CG_DrawMMap( 0, 50, 160, 120); //TBB draw minimap function
// Q3Rally Code END

8
engine/code/cgame/cg_local.h
View file

@ -664,7 +664,7 @@ typedef struct {
refdef_t refdef;
// Q3Rally Code Start
refdef_t mirrorRefdef;
refdef_t mmapRefdef; //TBB minimap rendering
// refdef_t mmapRefdef; //TBB minimap rendering
// Q3Rally Code END
vec3_t refdefViewAngles; // will be converted to refdef.viewaxis
@ -1107,7 +1107,7 @@ typedef struct {
qhandle_t rearviewMirrorShader;
//TBB - minimap handling
qhandle_t MMapShader;
// qhandle_t MMapShader;
//TBB FIN
qhandle_t turboModel;
// Q3Rally Code END
@ -1516,7 +1516,7 @@ extern vmCvar_t cg_minSkidLength;
extern vmCvar_t cg_controlMode;
extern vmCvar_t cg_manualShift;
extern vmCvar_t cg_drawRearView;
extern vmCvar_t cg_drawMMap; //TBB - minimap
// extern vmCvar_t cg_drawMMap; //TBB - minimap
extern vmCvar_t cg_checkpointArrowMode;
extern vmCvar_t cg_atmosphericLevel;
@ -1950,7 +1950,7 @@ might have to make a cvar for displaying it plus opacity
trying to get this to work like the minimap from UrT
from scratch. must try to make it 2d bitmap
*/
void CG_DrawMMap( float x, float y, float w, float h );
// void CG_DrawMMap( float x, float y, float w, float h );
//TBB FIN
//

6
engine/code/cgame/cg_main.c
View file

@ -242,7 +242,7 @@ vmCvar_t cg_manualShift;
vmCvar_t cg_minSkidLength;
vmCvar_t cg_drawRearView;
vmCvar_t cg_checkpointArrowMode;
vmCvar_t cg_drawMMap; //TBB - minimap cvar
// vmCvar_t cg_drawMMap; //TBB - minimap cvar
vmCvar_t cg_developer;
@ -344,7 +344,7 @@ static cvarTable_t cvarTable[] = {
{ &cg_metricUnits, "cg_metricUnits", "0", CVAR_ARCHIVE },
{ &cg_minSkidLength, "cg_minSkidLength", "12", CVAR_ARCHIVE },
{ &cg_drawRearView, "cg_drawRearView", "0", CVAR_ARCHIVE },
{ &cg_drawMMap, "cg_drawMMap", "1", CVAR_ARCHIVE }, //TBB minimap - default on
// { &cg_drawMMap, "cg_drawMMap", "1", CVAR_ARCHIVE }, //TBB minimap - default on
{ &cg_controlMode, "cg_controlMode", "0", CVAR_ARCHIVE | CVAR_USERINFO },
{ &cg_manualShift, "cg_manualShift", "0", CVAR_ARCHIVE | CVAR_USERINFO },
{ &cg_checkpointArrowMode, "cg_checkpointArrowMode", "1", CVAR_ARCHIVE },
@ -1053,7 +1053,7 @@ static void CG_RegisterGraphics( void ) {
// Q3Rally Code Start
cgs.media.rearviewMirrorShader = trap_R_RegisterShaderNoMip("gfx/rearview/frame" );
cgs.media.MMapShader = trap_R_RegisterShaderNoMip("gfx/hud/minimap" ); //TBB mmap
// cgs.media.MMapShader = trap_R_RegisterShaderNoMip("gfx/hud/minimap" ); //TBB mmap
// skid shaders
cgs.media.SMAsphaltShader = trap_R_RegisterShader("gfx/skidmarks/asphalt" );

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

@ -131,7 +131,7 @@ might have to make a cvar for displaying it plus opacity
trying to get this to work like the minimap from UrT
from scratch. must try to make it 2d bitmap
================
*/
void CG_DrawMMap( float x, float y, float w, float h ) {
int i;
@ -152,7 +152,7 @@ void CG_DrawMMap( float x, float y, float w, float h ) {
return;
if ( (cgs.gametype != GT_RACING) || (cgs.gametype != GT_TEAM_RACING) )
return; */
return;
mx = x ;
my = y ;
@ -183,7 +183,7 @@ void CG_DrawMMap( float x, float y, float w, float h ) {
//TBB
/*only add players to minimap scene
add ctf flag entities later*/
add ctf flag entities later
if (cg_rearViewRenderLevel.integer & RL_MARKS){
CG_AddMarks();
}

4
engine/code/cgame/cg_view.c
View file

@ -762,7 +762,7 @@ static int CG_CalcViewValues( void ) {
and not following player movement
may have to set new standard in level design
(center the entire map to origin)
*/
if( cg_drawMMap.integer )
{
vec3_t angles;
@ -818,7 +818,7 @@ static int CG_CalcViewValues( void ) {
cg.mmapRefdef.vieworg[0] = 0; // + : forward
cg.mmapRefdef.vieworg[1] = 0; // + : left
cg.mmapRefdef.vieworg[2] = 512; // + : up
*/
VectorCopy( ps->origin, cg.mmapRefdef.vieworg );

86
q3rallycode.ppr
View file

@ -856,74 +856,26 @@ q3rallycode
engine\voip-readme.txt
engine\resync_svn.sh
[Open project files]
0=engine\code\qcommon\q_shared.h
1=engine\code\game\g_public.h
2=engine\code\game\bg_public.h
0=engine\code\cgame\cg_draw.c
1=engine\code\cgame\cg_local.h
2=engine\code\cgame\cg_main.c
3=engine\code\cgame\cg_rally_hud.c
4=engine\code\client\cl_console.c
5=engine\code\game\g_local.h
6=engine\code\qcommon\files.c
7=engine\code\q3_ui\ui_rally_servers.c
8=engine\code\server\sv_init.c
9=engine\code\ui\ui_main.c
10=engine\README
11=engine\code\botlib\be_interface.c
12=engine\ChangeLog
13=engine\code\qcommon\qcommon.h
14=engine\code\q3_ui\ui_menu.c
15=engine\code\q3_ui\ui_rally_credits.c
16=engine\code\qcommon\common.c
4=engine\code\cgame\cg_view.c
[Selected Project Files]
Main=
Selected=engine\code\q3_ui\ui_menu.c
[engine\code\qcommon\q_shared.h]
TopLine=44
Caret=1,61
[engine\code\game\g_public.h]
TopLine=1
Caret=1,1
[engine\code\game\bg_public.h]
TopLine=35
Caret=33,33
Selected=engine\code\cgame\cg_view.c
[engine\code\cgame\cg_draw.c]
TopLine=3340
Caret=4,3358
[engine\code\cgame\cg_local.h]
TopLine=1931
Caret=4,1953
[engine\code\cgame\cg_main.c]
TopLine=1038
Caret=3,1056
[engine\code\cgame\cg_rally_hud.c]
TopLine=831
Caret=1,851
[engine\code\client\cl_console.c]
TopLine=630
Caret=1,644
[engine\code\game\g_local.h]
TopLine=33
Caret=1,33
[engine\code\qcommon\files.c]
TopLine=185
Caret=34,201
[engine\code\q3_ui\ui_rally_servers.c]
TopLine=1
Caret=1,1
[engine\code\server\sv_init.c]
TopLine=1
Caret=1,1
[engine\code\ui\ui_main.c]
TopLine=289
Caret=1,1
[engine\README]
TopLine=513
Caret=1,527
[engine\code\botlib\be_interface.c]
TopLine=115
Caret=1,147
[engine\ChangeLog]
TopLine=438
Caret=1,452
[engine\code\qcommon\qcommon.h]
TopLine=252
Caret=39,263
[engine\code\q3_ui\ui_menu.c]
TopLine=428
Caret=63,438
[engine\code\q3_ui\ui_rally_credits.c]
TopLine=84
Caret=1,102
[engine\code\qcommon\common.c]
TopLine=2644
Caret=1,2644
TopLine=201
Caret=1,185
[engine\code\cgame\cg_view.c]
TopLine=832
Caret=3,821