ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2024-11-10 07:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

A few fixes for shiphealth stuff

Browse source 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
This commit is contained in:
Harry Young 2012-12-04 00:43:04 +01:00
parent 75ec1fce7b
commit 5d2ecf6520
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/game/g_mover.c
View file

@ -1499,7 +1499,6 @@ q3map2:
"_castShadows" OR "_cs" - sets whether the entity casts shadows
"_receiveShadows" OR "_rs" - sets whether the entity receives shadows
*/
*/
void SP_func_door (gentity_t *ent) {
vec3_t abs_movedir;
float distance;

8
code/game/g_ui.c
View file

@ -153,11 +153,11 @@ void ui_msd_use(gentity_t *ent, gentity_t *other, gentity_t *activator) {
if(!Q_stricmp(temp->classname, "target_warp")) break;
}
if(temp){
if(temp->sound1to2)//warp active
if(temp->sound2to1)//core ejected, we don't really care if it is online
warpstate = 2;
if(!temp->sound2to1 && temp->sound1to2)//not ejected and not deactivated -> core active
warpstate = 1;
else if(temp->sound2to1)//warp ejected
warpstate = -1;
else//not online && not ejected -->offline
if(!temp->sound2to1 && !temp->sound1to2)//not ejected and deactivated -> core inactive
warpstate = 0;
temp = NULL;
}

16
code/ui/ui_msd.c
View file

@ -227,12 +227,12 @@ static void M_msdMenu_Graphics (void)
UI_DrawHandlePic( 196, 381, 88, 43, uis.whiteShader);
UI_DrawProportionalString(197, 382, "Warp Drive is", UI_TINYFONT, colorTable[CT_MDGREY]);
UI_DrawProportionalString(197, 397, "offline", UI_TINYFONT, colorTable[CT_MDGREY]);
} else if(s_msd.warpstate == -1){
} else if(s_msd.warpstate == 2){
trap_R_SetColor( colorTable[CT_RED] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 196, 381, 88, 43, uis.whiteShader);
UI_DrawProportionalString(197, 382, "Warp Core is", UI_TINYFONT, colorTable[CT_MDGREY]);
UI_DrawProportionalString(197, 397, "ejected", UI_TINYFONT, colorTable[CT_MDGREY]);
} else {//-2, no info available
} else if(s_msd.warpstate == -2){//-2, no info available
trap_R_SetColor( colorTable[CT_YELLOW] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 196, 381, 88, 43, uis.whiteShader);
UI_DrawProportionalString(197, 382, "Warp-Core-ODN-", UI_TINYFONT, colorTable[CT_MDGREY]);
@ -242,17 +242,17 @@ static void M_msdMenu_Graphics (void)
//Turbolift
trap_R_SetColor( colorTable[CT_WHITE] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 290, 380, 90, 45, uis.whiteShader);
if(s_msd.warpstate == 1){
if(s_msd.turbostate == 1){
trap_R_SetColor( colorTable[CT_GREEN] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 291, 381, 88, 43, uis.whiteShader);
UI_DrawProportionalString(292, 382, "Turbolifts are", UI_TINYFONT, colorTable[CT_MDGREY]);
UI_DrawProportionalString(292, 397, "online", UI_TINYFONT, colorTable[CT_MDGREY]);
} else if(s_msd.warpstate == 0){
} else if(s_msd.turbostate == 0){
trap_R_SetColor( colorTable[CT_RED] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 291, 381, 88, 43, uis.whiteShader);
UI_DrawProportionalString(292, 382, "Turbolifts are", UI_TINYFONT, colorTable[CT_MDGREY]);
UI_DrawProportionalString(292, 397, "offline", UI_TINYFONT, colorTable[CT_MDGREY]);
} else {//-2, no info available
} else if(s_msd.turbostate == -2){//-2, no info available
trap_R_SetColor( colorTable[CT_YELLOW] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 291, 381, 88, 43, uis.whiteShader);
UI_DrawProportionalString(292, 382, "Turbolift-ODN-", UI_TINYFONT, colorTable[CT_MDGREY]);
@ -262,17 +262,17 @@ static void M_msdMenu_Graphics (void)
//Transporter
trap_R_SetColor( colorTable[CT_WHITE] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 385, 380, 90, 45, uis.whiteShader);
if(s_msd.warpstate == 1){
if(s_msd.transstate == 1){
trap_R_SetColor( colorTable[CT_GREEN] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 386, 381, 88, 43, uis.whiteShader);
UI_DrawProportionalString(387, 382, "Transporters are", UI_TINYFONT, colorTable[CT_MDGREY]);
UI_DrawProportionalString(387, 397, "online", UI_TINYFONT, colorTable[CT_MDGREY]);
} else if(s_msd.warpstate == 0){
} else if(s_msd.transstate == 0){
trap_R_SetColor( colorTable[CT_RED] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 386, 381, 88, 43, uis.whiteShader);
UI_DrawProportionalString(387, 382, "Transporters are", UI_TINYFONT, colorTable[CT_MDGREY]);
UI_DrawProportionalString(387, 397, "offline", UI_TINYFONT, colorTable[CT_MDGREY]);
} else {//-2, no info available
} else if(s_msd.transstate == -2){//-2, no info available
trap_R_SetColor( colorTable[CT_YELLOW] ); //colorTable[CT_VDKPURPLE2]
UI_DrawHandlePic( 386, 381, 88, 43, uis.whiteShader);
UI_DrawProportionalString(386, 382, "Transporter-ODN-", UI_TINYFONT, colorTable[CT_MDGREY]);