diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp index 9f0e9b1..f82db21 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp @@ -3578,7 +3578,6 @@ static float CG_DrawSnapshot( float y ) { int tempX = 635 - w; int tempY = y+2; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, s, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, FONT_SCALE); return y + BIGCHAR_HEIGHT + 10; @@ -3626,7 +3625,6 @@ static float CG_DrawFPS( float y ) { int tempX = 635-xOffset - w; int tempY = y+2; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, s, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, FONT_SCALE); return y + BIGCHAR_HEIGHT + 10; @@ -3654,7 +3652,6 @@ static float CG_DrawTimer( float y ) { int tempX = 635 - w; int tempY = y+2; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, s, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, FONT_SCALE); return y + BIGCHAR_HEIGHT + 10; @@ -3694,7 +3691,6 @@ static void CG_DrawAmmoWarning( void ) { int offset = w / 2; int tempX = SCREEN_WIDTH / 2; int tempY = 64; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, FONT_SCALE); } @@ -4416,7 +4412,6 @@ static void CG_Draw2D( void ) int tempX = x_pos; int tempY = y_pos; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, text, colorTable[CT_LTRED1], cgs.media.qhFontSmall, -1, FONT_SCALE); } } @@ -4434,7 +4429,6 @@ static void CG_Draw2D( void ) int tempX = x_pos; int tempY = y_pos; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, text, colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, FONT_SCALE); } diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_text.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_text.cpp index a711597..56a6004 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_text.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_text.cpp @@ -458,7 +458,6 @@ void CG_DrawCaptionText( bool inImmersiveCamera ) int offset = w / 2; int tempX = SCREEN_WIDTH / 2; int tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, cg.captionText[i], textcolor_caption, cgs.media.qhFontSmall, -1, fFontScale * FONT_SCALE); y += fontHeight; } @@ -655,7 +654,6 @@ void CG_DrawScrollText(void) int offset = giScrollTextPixelWidth / 2; int tempX = SCREEN_WIDTH / 2; int tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, cg.printText[i], textcolor_scroll, cgs.media.qhFontSmall, -1, FONT_SCALE); y += fontHeight; } @@ -785,7 +783,6 @@ void CG_DrawCenterString( void ) int offset = w / 2; int tempX = SCREEN_WIDTH / 2; int tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY,linebuffer, textcolor_center, cgs.media.qhFontSmall, -1, FONT_SCALE); y += fontHeight; diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp index 49a3b68..7568331 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp @@ -2208,7 +2208,6 @@ void CG_DrawWeaponSelect( void ) int w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 1.0f); int x = ( SCREEN_WIDTH - w ) / 2; int y = (SCREEN_HEIGHT - 24); - CG_AdjustFrom640Int(&x, &y, NULL, NULL); cgi_R_Font_DrawString(x, y, text, textColor, cgs.media.qhFontSmall, -1, FONT_SCALE); } } diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp index 7a638c8..c6af3db 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp @@ -2408,7 +2408,6 @@ static float CG_DrawSnapshot( float y ) { int tempX = 635 - w; int tempY = y+2; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, s, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, FONT_SCALE); return y + BIGCHAR_HEIGHT + 10; @@ -2455,7 +2454,6 @@ static float CG_DrawFPS( float y ) { int tempX = 635 - w; int tempY = y+2; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, s, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, FONT_SCALE); return y + BIGCHAR_HEIGHT + 10; @@ -2483,7 +2481,6 @@ static float CG_DrawTimer( float y ) { int tempX = 635 - w; int tempY = y+2; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, s, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, FONT_SCALE); return y + BIGCHAR_HEIGHT + 10; } @@ -2522,7 +2519,6 @@ static void CG_DrawAmmoWarning( void ) { int offset = w / 2; int tempX = SCREEN_WIDTH / 2; int tempY = 64; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, FONT_SCALE); } @@ -2870,7 +2866,6 @@ static void CG_Draw2D( void ) int tempX = x_pos; int tempY = y_pos; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, text, colorTable[CT_LTRED1], cgs.media.qhFontSmall, -1, FONT_SCALE); if (cg_updatedDataPadForcePower1.integer) @@ -2886,7 +2881,6 @@ static void CG_Draw2D( void ) tempX = x_pos; tempY = y_pos; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, text, colorTable[CT_LTRED1], cgs.media.qhFontSmall, -1, FONT_SCALE); } @@ -2903,7 +2897,6 @@ static void CG_Draw2D( void ) tempX = x_pos; tempY = y_pos; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, text, colorTable[CT_LTRED1], cgs.media.qhFontSmall, -1, FONT_SCALE); } diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp index b9a0823..9394eb4 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp @@ -3601,7 +3601,6 @@ void CG_DrawForceSelect( void ) int w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 1.0f); int x = ( SCREEN_WIDTH - w ) / 2; int y = (SCREEN_HEIGHT / 2 + 50); - CG_AdjustFrom640Int(&x, &y, NULL, NULL); cgi_R_Font_DrawString(x, y, text, colorTable[CT_ICON_BLUE], cgs.media.qhFontSmall, -1, 1.0f); } } diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_scoreboard.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_scoreboard.cpp index 5b26b7c..6e09752 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_scoreboard.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_scoreboard.cpp @@ -101,7 +101,6 @@ void CG_MissionFailed(void) int tempX = 320 - w/2; int tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_HUD_RED], cgs.media.qhFontSmall, -1, 1.2f * FONT_SCALE); switch (statusTextIndex) @@ -147,7 +146,6 @@ void CG_MissionFailed(void) w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 1.2f * FONT_SCALE); tempX = 320 - w/2; tempY = y+30; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_HUD_RED], cgs.media.qhFontSmall, -1, 1.2f * FONT_SCALE); /* cgi_SP_GetStringTextString( "INGAME_RELOADMISSION", text, sizeof(text) ); @@ -155,7 +153,6 @@ void CG_MissionFailed(void) tempX = 320 - w/2; tempY = 450; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_CYAN], cgs.media.qhFontSmall, -1, FONT_SCALE); */ } @@ -177,7 +174,6 @@ void CG_MissionCompletion(void) int tempX = 320 - w/2; int tempY = 53; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 1.2f * FONT_SCALE); x = 75; @@ -186,12 +182,10 @@ void CG_MissionCompletion(void) w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); cgi_SP_GetStringTextString( "INGAME_SECRETAREAS_OF", text, sizeof(text) ); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d %s %d", cg_entities[0].gent->client->sess.missionStats.secretsFound, text, @@ -204,11 +198,9 @@ void CG_MissionCompletion(void) w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.enemiesKilled), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); /* cgi_SP_GetStringTextString( "INGAME_SECRETAREAS_OF", text, sizeof(text) ); @@ -226,7 +218,6 @@ void CG_MissionCompletion(void) w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); int wpn=0,i; @@ -247,7 +238,6 @@ void CG_MissionCompletion(void) // cgi_R_Font_DrawString(tempX, tempY, va("%d",wpn), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); } @@ -257,11 +247,9 @@ void CG_MissionCompletion(void) w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.shotsFired), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); @@ -270,11 +258,9 @@ void CG_MissionCompletion(void) w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.hits), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); @@ -283,12 +269,10 @@ void CG_MissionCompletion(void) w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); const float percent = cg_entities[0].gent->client->sess.missionStats.shotsFired? 100.0f * (float)cg_entities[0].gent->client->sess.missionStats.hits / cg_entities[0].gent->client->sess.missionStats.shotsFired : 0; tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%.2f%%",percent), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); if ( cg_entities[0].gent->client->sess.missionStats.weaponUsed[WP_SABER] <= 0 ) @@ -300,7 +284,6 @@ void CG_MissionCompletion(void) cgi_SP_GetStringTextString( "INGAME_FORCEUSE", text, sizeof(text) ); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -308,11 +291,9 @@ void CG_MissionCompletion(void) w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.forceUsed[FP_HEAL]), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -320,11 +301,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.forceUsed[FP_SPEED]), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -332,11 +311,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.forceUsed[FP_PULL]), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -344,11 +321,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.forceUsed[FP_PUSH]), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -356,11 +331,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.forceUsed[FP_TELEPATHY]), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -368,11 +341,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.forceUsed[FP_GRIP]), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -380,11 +351,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.forceUsed[FP_LIGHTNING]), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); //second column, LIGHT SABER @@ -393,7 +362,6 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); cgi_SP_GetStringTextString( "INGAME_LIGHTSABERUSE", text, sizeof(text) ); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -401,11 +369,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.saberThrownCnt), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -413,11 +379,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.saberBlocksCnt), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -425,11 +389,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.legAttacksCnt), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -437,11 +399,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.armAttacksCnt), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -449,11 +409,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.torsoAttacksCnt), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); y +=pad; @@ -461,11 +419,9 @@ w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 0.8f * FONT_SCALE); tempX = x; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, text, colorTable[CT_LTGOLD1], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); tempX = x+w; tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX, tempY, va("%d",cg_entities[0].gent->client->sess.missionStats.otherAttacksCnt), colorTable[CT_WHITE], cgs.media.qhFontSmall, -1, 0.8f * FONT_SCALE); } diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_text.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_text.cpp index f6b767e..6437540 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_text.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_text.cpp @@ -454,7 +454,6 @@ void CG_DrawCaptionText( bool inImmersiveCamera ) int offset = w / 2; int tempX = SCREEN_WIDTH / 2; int tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, cg.captionText[i], textcolor_caption, cgs.media.qhFontSmall, -1, fFontScale * FONT_SCALE); y += fontHeight; } @@ -649,7 +648,6 @@ void CG_DrawScrollText(void) int offset = giScrollTextPixelWidth / 2; int tempX = SCREEN_WIDTH / 2; int tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY, cg.printText[i], textcolor_scroll, cgs.media.qhFontSmall, -1, FONT_SCALE); y += fontHeight; } @@ -773,7 +771,6 @@ void CG_DrawCenterString( void ) int offset = w / 2; int tempX = SCREEN_WIDTH / 2; int tempY = y; - CG_AdjustFrom640Int( &tempX, &tempY, NULL, NULL ); cgi_R_Font_DrawString(tempX - offset, tempY,linebuffer, textcolor_center, cgs.media.qhFontSmall, -1, FONT_SCALE); y += fontHeight; diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp index 05b5cb4..8aab0a1 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp @@ -2181,7 +2181,6 @@ void CG_DrawWeaponSelect( void ) int w = cgi_R_Font_StrLenPixels(text, cgs.media.qhFontSmall, 1.0f); int x = ( SCREEN_WIDTH - w ) / 2; int y = (SCREEN_HEIGHT - 24); - CG_AdjustFrom640Int(&x, &y, NULL, NULL); cgi_R_Font_DrawString(x, y, text, textColor, cgs.media.qhFontSmall, -1, FONT_SCALE); } }