Skip to content

Commit

Permalink
Merge pull request #2 from Bucky21659/master
Browse files Browse the repository at this point in the history
Ratiofix demo recording message. Hide forcespec callvote menu on non jaPRO servers.
  • Loading branch information
eternalcodes authored Dec 4, 2017
2 parents e9b415d + 200cc50 commit 3679ba5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 28 deletions.
30 changes: 3 additions & 27 deletions assets/ui/jamp/ingame_callvote.menu
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,9 @@
textstyle 3
textalign ITEM_ALIGN_RIGHT
forecolor 1 .682 0 1
cvarTest "ui_isJAPro"
showCvar
{ "1" }
visible 1
action
{
Expand Down Expand Up @@ -1206,30 +1209,3 @@
}
}
}



























2 changes: 1 addition & 1 deletion codemp/client/cl_scrn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ void SCR_DrawDemoRecording( void ) {
pos = FS_FTell( clc.demofile );
Com_sprintf( string, sizeof(string), "RECORDING %s: %ik", clc.demoName, pos / 1024 );

SCR_DrawStringExt( 320 - strlen( string ) * 4, 20, 8, string, g_color_table[7], qtrue, qfalse );
SCR_DrawStringExt2(SCREEN_WIDTH / 2.0f - strlen(string)*(8.0f / 2.0f)*ratio, 20.0f, 8.0f*ratio, 8.0f, string, g_color_table[7], qtrue, qfalse);
}


Expand Down

0 comments on commit 3679ba5

Please sign in to comment.