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

Fixed last game warning and a few in q3_ui.

Browse source
This commit is contained in:
zturtleman 2011-03-08 09:12:02 +00:00
parent a02fabfad7
commit c5262d5c43
3 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
engine/code/game/g_active.c
View file

@ -316,8 +316,6 @@ void ClientImpacts( gentity_t *ent, pmove_t *pm ) {
memset( &trace, 0, sizeof( trace ) ); memset( &trace, 0, sizeof( trace ) );
for (i=0 ; i<pm->numtouch ; i++) { for (i=0 ; i<pm->numtouch ; i++) {
// STONELANCE - this should never happen, UPDATE: re-enabled
// /*
for (j=0 ; j<i ; j++) { for (j=0 ; j<i ; j++) {
if (pm->touchents[j] == pm->touchents[i] ) { if (pm->touchents[j] == pm->touchents[i] ) {
break; break;
@ -326,12 +324,13 @@ void ClientImpacts( gentity_t *ent, pmove_t *pm ) {
if (j != i) { if (j != i) {
continue; // duplicated continue; // duplicated
} }
// */ other = &g_entities[ pm->touchents[i] ];
// STONELANCE
VectorSubtract( other->s.origin, pm->touchPos[i], trace.plane.normal ); VectorSubtract( other->s.origin, pm->touchPos[i], trace.plane.normal );
VectorNormalize( trace.plane.normal ); VectorNormalize( trace.plane.normal );
VectorCopy(pm->touchPos[i], trace.endpos); VectorCopy(pm->touchPos[i], trace.endpos);
// END // END
other = &g_entities[ pm->touchents[i] ];
if ( ( ent->r.svFlags & SVF_BOT ) && ( ent->touch ) ) { if ( ( ent->r.svFlags & SVF_BOT ) && ( ent->touch ) ) {
ent->touch( ent, other, &trace ); ent->touch( ent, other, &trace );

11
engine/code/q3_ui/ui_team.c
View file

@ -56,15 +56,6 @@ typedef struct
static teammain_t s_teammain; static teammain_t s_teammain;
static menuframework_s s_teammain_menu;
static menuaction_s s_teammain_orders;
static menuaction_s s_teammain_voice;
static menuaction_s s_teammain_joinred;
static menuaction_s s_teammain_joinblue;
static menuaction_s s_teammain_joingame;
static menuaction_s s_teammain_spectate;
/* /*
=============== ===============
TeamMain_MenuEvent TeamMain_MenuEvent
@ -86,7 +77,7 @@ static void TeamMain_MenuEvent( void* ptr, int event ) {
UI_ForceMenuOff(); UI_ForceMenuOff();
break; break;
// STONELANCE // STONELANCE
case ID_JOINGREEN: case ID_JOINGREEN:
trap_Cmd_ExecuteText( EXEC_APPEND, "cmd team green\n" ); trap_Cmd_ExecuteText( EXEC_APPEND, "cmd team green\n" );
UI_ForceMenuOff(); UI_ForceMenuOff();

2
engine/code/q3_ui/ui_teamorders.c
View file

@ -296,7 +296,7 @@ static void UI_TeamOrdersMenu_BuildBotList( void ) {
int numPlayers; int numPlayers;
int isBot; int isBot;
int n; int n;
char playerTeam; char playerTeam = '3';
char botTeam; char botTeam;
char info[MAX_INFO_STRING]; char info[MAX_INFO_STRING];