Skip to content

Commit

Permalink
widescreen datapad icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@TwelveEyes
TwelveEyes committed Jun 23, 2024
1 parent 0f82931 commit 15c6052
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
30 changes: 15 additions & 15 deletions code/cgame/cg_main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4202,7 +4202,7 @@ void CG_DrawDataPadForceSelect( void )
{
int i;
int count;
int holdX;
float holdX;
int sideLeftIconCnt,sideRightIconCnt;
int holdCount,iconCnt;
char text[1024]={0};
Expand Down Expand Up @@ -4251,10 +4251,10 @@ void CG_DrawDataPadForceSelect( void )
}


const int smallIconSize = 40;
const int bigIconSize = 70;
const int bigPad = 64;
const int pad = 32;
const float smallIconSize_x = 40 * cgs.widthRatioCoef, smallIconSize_y = 40;
const float bigIconSize_x = 70 * cgs.widthRatioCoef, bigIconSize_y = 70;
const float bigPad = 64 * cgs.widthRatioCoef;
const float pad = 32 * cgs.widthRatioCoef;

const int centerXPos = 320;
const int graphicYPos = 340;
Expand All @@ -4269,7 +4269,7 @@ void CG_DrawDataPadForceSelect( void )

cgi_R_SetColor(colorTable[CT_WHITE]);
// Work backwards from current icon
holdX = centerXPos - ((bigIconSize/2) + bigPad + smallIconSize);
holdX = centerXPos - ((bigIconSize_x/2) + bigPad + smallIconSize_x);
for (iconCnt=1;iconCnt<(sideLeftIconCnt+1);i--)
{
if (i < 0)
Expand All @@ -4286,20 +4286,20 @@ void CG_DrawDataPadForceSelect( void )

if (force_icons[showDataPadPowers[i]])
{
CG_DrawPic( holdX, graphicYPos, smallIconSize, smallIconSize, force_icons[showDataPadPowers[i]] );
CG_DrawPic( holdX, graphicYPos, smallIconSize_x, smallIconSize_y, force_icons[showDataPadPowers[i]] );
}

// A new force power
if (((cg_updatedDataPadForcePower1.integer - 1) == showDataPadPowers[i]) ||
((cg_updatedDataPadForcePower2.integer - 1) == showDataPadPowers[i]) ||
((cg_updatedDataPadForcePower3.integer - 1) == showDataPadPowers[i]))
{
CG_DrawPic( holdX, graphicYPos, smallIconSize, smallIconSize, cgs.media.DPForcePowerOverlay );
CG_DrawPic( holdX, graphicYPos, smallIconSize_x, smallIconSize_y, cgs.media.DPForcePowerOverlay );
}

if (force_icons[showDataPadPowers[i]])
{
holdX -= (smallIconSize+pad);
holdX -= (smallIconSize_x+pad);
}
}

Expand All @@ -4308,14 +4308,14 @@ void CG_DrawDataPadForceSelect( void )
{

cgi_R_SetColor(colorTable[CT_WHITE]);
CG_DrawPic( centerXPos-(bigIconSize/2), (graphicYPos-((bigIconSize-smallIconSize)/2)), bigIconSize, bigIconSize, force_icons[showDataPadPowers[cg.DataPadforcepowerSelect]] );
CG_DrawPic( centerXPos-(bigIconSize_x/2), (graphicYPos-((bigIconSize_y-smallIconSize_y)/2)), bigIconSize_x, bigIconSize_y, force_icons[showDataPadPowers[cg.DataPadforcepowerSelect]] );

// New force power
if (((cg_updatedDataPadForcePower1.integer - 1) == showDataPadPowers[cg.DataPadforcepowerSelect]) ||
((cg_updatedDataPadForcePower2.integer - 1) == showDataPadPowers[cg.DataPadforcepowerSelect]) ||
((cg_updatedDataPadForcePower3.integer - 1) == showDataPadPowers[cg.DataPadforcepowerSelect]))
{
CG_DrawPic( centerXPos-(bigIconSize/2), (graphicYPos-((bigIconSize-smallIconSize)/2)), bigIconSize, bigIconSize, cgs.media.DPForcePowerOverlay );
CG_DrawPic( centerXPos-(bigIconSize_x/2), (graphicYPos-((bigIconSize_y-smallIconSize_y)/2)), bigIconSize_x, bigIconSize_y, cgs.media.DPForcePowerOverlay );
}
}

Expand All @@ -4329,7 +4329,7 @@ void CG_DrawDataPadForceSelect( void )
cgi_R_SetColor(colorTable[CT_WHITE]);

// Work forwards from current icon
holdX = centerXPos + (bigIconSize/2) + bigPad;
holdX = centerXPos + (bigIconSize_x/2) + bigPad;
for (iconCnt=1;iconCnt<(sideRightIconCnt+1);i++)
{
if (i>=MAX_DPSHOWPOWERS)
Expand All @@ -4346,20 +4346,20 @@ void CG_DrawDataPadForceSelect( void )

if (force_icons[showDataPadPowers[i]])
{
CG_DrawPic( holdX, graphicYPos, smallIconSize, smallIconSize, force_icons[showDataPadPowers[i]] );
CG_DrawPic( holdX, graphicYPos, smallIconSize_x, smallIconSize_y, force_icons[showDataPadPowers[i]] );
}

// A new force power
if (((cg_updatedDataPadForcePower1.integer - 1) == showDataPadPowers[i]) ||
((cg_updatedDataPadForcePower2.integer - 1) == showDataPadPowers[i]) ||
((cg_updatedDataPadForcePower3.integer - 1) == showDataPadPowers[i]))
{
CG_DrawPic( holdX, graphicYPos, smallIconSize, smallIconSize, cgs.media.DPForcePowerOverlay );
CG_DrawPic( holdX, graphicYPos, smallIconSize_x, smallIconSize_y, cgs.media.DPForcePowerOverlay );
}

if (force_icons[showDataPadPowers[i]])
{
holdX += (smallIconSize+pad);
holdX += (smallIconSize_x+pad);
}
}

Expand Down
34 changes: 17 additions & 17 deletions code/cgame/cg_weapons.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,7 @@ void CG_DrawDataPadWeaponSelect( void )
{
int i;
int weaponBitFlag,weaponCount,weaponSelectI;
int holdX;
float holdX;
int sideLeftIconCnt,sideRightIconCnt;
int holdCount,iconCnt;
char text[1024]={0};
Expand Down Expand Up @@ -1512,18 +1512,18 @@ void CG_DrawDataPadWeaponSelect( void )
weaponSelectI = 13;
}

const int smallIconSize = 40;
const int bigIconSize = 80;
const int bigPad = 64;
const int pad = 32;
const float smallIconSize_x = 40 * cgs.widthRatioCoef, smallIconSize_y = 40;
const float bigIconSize_x = 80 * cgs.widthRatioCoef, bigIconSize_y = 80;
const float bigPad = 64;
const float pad = 32 * cgs.widthRatioCoef;

const int centerXPos = 320;
const int graphicYPos = 340;
const float centerXPos = 320;
const float graphicYPos = 340;


// Left side ICONS
// Work backwards from current icon
holdX = centerXPos - ((bigIconSize/2) + bigPad + smallIconSize);
holdX = centerXPos - ((bigIconSize_x/2) + bigPad + smallIconSize_x);

cgi_R_SetColor( colorTable[CT_WHITE] );
for (iconCnt=1;iconCnt<(sideLeftIconCnt+1);weaponSelectI--)
Expand Down Expand Up @@ -1562,14 +1562,14 @@ void CG_DrawDataPadWeaponSelect( void )

if (!CG_WeaponCheck(weaponSelectI))
{
CG_DrawPic( holdX, graphicYPos, smallIconSize, smallIconSize, weaponInfo->weaponIconNoAmmo );
CG_DrawPic( holdX, graphicYPos, smallIconSize_x, smallIconSize_y, weaponInfo->weaponIconNoAmmo );
}
else
{
CG_DrawPic( holdX, graphicYPos, smallIconSize, smallIconSize, weaponInfo->weaponIcon );
CG_DrawPic( holdX, graphicYPos, smallIconSize_x, smallIconSize_y, weaponInfo->weaponIcon );
}

holdX -= (smallIconSize+pad);
holdX -= (smallIconSize_x+pad);
}

if ( weaponSelectI == WP_CONCUSSION )
Expand All @@ -1591,11 +1591,11 @@ void CG_DrawDataPadWeaponSelect( void )
// Draw graphic to show weapon has ammo or no ammo
if (!CG_WeaponCheck(cg.DataPadWeaponSelect))
{
CG_DrawPic( centerXPos-(bigIconSize/2), (graphicYPos-((bigIconSize-smallIconSize)/2))+10, bigIconSize, bigIconSize, weaponInfo->weaponIconNoAmmo );
CG_DrawPic( centerXPos-(bigIconSize_x/2), (graphicYPos-((bigIconSize_y-smallIconSize_y)/2))+10, bigIconSize_x, bigIconSize_y, weaponInfo->weaponIconNoAmmo );
}
else
{
CG_DrawPic( centerXPos-(bigIconSize/2), (graphicYPos-((bigIconSize-smallIconSize)/2))+10, bigIconSize, bigIconSize, weaponInfo->weaponIcon );
CG_DrawPic( centerXPos-(bigIconSize_x/2), (graphicYPos-((bigIconSize_y-smallIconSize_y)/2))+10, bigIconSize_x, bigIconSize_y, weaponInfo->weaponIcon );
}
}

Expand All @@ -1616,7 +1616,7 @@ void CG_DrawDataPadWeaponSelect( void )
// Right side ICONS
// Work forwards from current icon
cgi_R_SetColor(colorTable[CT_WHITE]);
holdX = centerXPos + (bigIconSize/2) + bigPad;
holdX = centerXPos + (bigIconSize_x/2) + bigPad;
for (iconCnt=1;iconCnt<(sideRightIconCnt+1);weaponSelectI++)
{
if ( weaponSelectI == WP_CONCUSSION )
Expand Down Expand Up @@ -1653,15 +1653,15 @@ void CG_DrawDataPadWeaponSelect( void )
// Draw graphic to show weapon has ammo or no ammo
if (!CG_WeaponCheck(i))
{
CG_DrawPic( holdX, graphicYPos, smallIconSize, smallIconSize, weaponInfo->weaponIconNoAmmo );
CG_DrawPic( holdX, graphicYPos, smallIconSize_x, smallIconSize_y, weaponInfo->weaponIconNoAmmo );
}
else
{
CG_DrawPic( holdX, graphicYPos, smallIconSize, smallIconSize, weaponInfo->weaponIcon );
CG_DrawPic( holdX, graphicYPos, smallIconSize_x, smallIconSize_y, weaponInfo->weaponIcon );
}


holdX += (smallIconSize+pad);
holdX += (smallIconSize_x+pad);
}
if ( weaponSelectI == WP_CONCUSSION )
{
Expand Down

0 comments on commit 15c6052

Please sign in to comment.