teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-21 19:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small fixes to things missed for the weapon scope

Browse source
This commit is contained in:
Simon 2023-12-19 21:27:56 +00:00
parent 59117e3081
commit e5313e1b36
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp
View file

@ -1634,18 +1634,18 @@ static void CG_DrawWeapReticle( void )
vec4_t light_color = {0.7, 0.7, 0.7, 1}; vec4_t light_color = {0.7, 0.7, 0.7, 1};
vec4_t black = {0.0, 0.0, 0.0, 1}; vec4_t black = {0.0, 0.0, 0.0, 1};
float indent = 0.16; float indent = 0.1;
float X_WIDTH=640; float X_WIDTH=640;
float Y_HEIGHT=480; float Y_HEIGHT=480;
float x = (X_WIDTH * indent), y = (Y_HEIGHT * indent), w = (X_WIDTH * (1-(2*indent))) / 2.0f, h = (Y_HEIGHT * (1-(2*indent))) / 2; float x = (X_WIDTH * indent), y = (Y_HEIGHT * indent), w = (X_WIDTH * (1-(2*indent))) / 2.0f, h = (Y_HEIGHT * (1-(2*indent))) / 2;
// sides // sides
CG_FillRect( 0, 0, (X_WIDTH * indent), Y_HEIGHT, black ); CG_FillRect( 0, 0, (X_WIDTH * indent)+1, Y_HEIGHT, black );
CG_FillRect( X_WIDTH * (1 - indent), 0, (X_WIDTH * indent), Y_HEIGHT, black ); CG_FillRect( X_WIDTH * (1 - indent) - 1, 0, (X_WIDTH * indent) + 2, Y_HEIGHT, black );
// top/bottom // top/bottom
CG_FillRect( X_WIDTH * indent, 0, X_WIDTH * (1-indent), Y_HEIGHT * indent, black ); CG_FillRect( X_WIDTH * indent, 0, X_WIDTH * (1-indent), Y_HEIGHT * indent + 1, black );
CG_FillRect( X_WIDTH * indent, Y_HEIGHT * (1-indent), X_WIDTH * (1-indent), Y_HEIGHT * indent, black ); CG_FillRect( X_WIDTH * indent, Y_HEIGHT * (1-indent) - 1, X_WIDTH * (1-indent), Y_HEIGHT * indent + 2, black );
{ {
// center // center

16
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp
View file

@ -728,18 +728,18 @@ static void CG_DrawWeapReticle( void )
vec4_t light_color = {0.7, 0.7, 0.7, 1}; vec4_t light_color = {0.7, 0.7, 0.7, 1};
vec4_t black = {0.0, 0.0, 0.0, 1}; vec4_t black = {0.0, 0.0, 0.0, 1};
float indent = 0.16; float indent = 0.1;
float X_WIDTH=640; float X_WIDTH=640;
float Y_HEIGHT=480; float Y_HEIGHT=480;
float x = (X_WIDTH * indent), y = (Y_HEIGHT * indent), w = (X_WIDTH * (1-(2*indent))) / 2.0f, h = (Y_HEIGHT * (1-(2*indent))) / 2; float x = (X_WIDTH * indent), y = (Y_HEIGHT * indent), w = (X_WIDTH * (1-(2*indent))) / 2.0f, h = (Y_HEIGHT * (1-(2*indent))) / 2;
// sides // sides
CG_FillRect( 0, 0, (X_WIDTH * indent), Y_HEIGHT, black ); CG_FillRect(0, 0, (X_WIDTH * indent) + 1, Y_HEIGHT, black);
CG_FillRect( X_WIDTH * (1 - indent), 0, (X_WIDTH * indent), Y_HEIGHT, black ); CG_FillRect(X_WIDTH * (1 - indent) - 1, 0, (X_WIDTH * indent) + 2, Y_HEIGHT, black);
// top/bottom // top/bottom
CG_FillRect( X_WIDTH * indent, 0, X_WIDTH * (1-indent), Y_HEIGHT * indent, black ); CG_FillRect(X_WIDTH * indent, 0, X_WIDTH * (1 - indent), Y_HEIGHT * indent + 1, black);
CG_FillRect( X_WIDTH * indent, Y_HEIGHT * (1-indent), X_WIDTH * (1-indent), Y_HEIGHT * indent, black ); CG_FillRect(X_WIDTH * indent, Y_HEIGHT * (1 - indent) - 1, X_WIDTH * (1 - indent), Y_HEIGHT * indent + 2, black);
{ {
// center // center
@ -2739,7 +2739,7 @@ static void CG_Draw2D( void )
if (cg.stereoView == STEREO_LEFT) if (cg.stereoView == STEREO_LEFT)
{ {
//Left Gap //Left Gap
CG_FillRect(0, 0, xOffset, 480, color); CG_FillRect(0, 0, -xOffset, 480, color);
if (yOffset < 0) if (yOffset < 0)
{ {
//Bottom Gap //Bottom Gap