q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 18:30:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mismerge.

Browse Source
This commit is contained in:
Ryan C. Gordon 2016-03-30 01:36:03 -04:00
parent aa8d0216db
commit 6ac856824f
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Sources/SeriousSam/Menu.cpp
View File

@ -2700,19 +2700,6 @@ BOOL DoMenu( CDrawPort *pdp)
PIX2D( pixCenterI, pixHeightJ),PIX2D( pixCenterI+pixSizeI, pixHeightJ+pixSizeJ))); PIX2D( pixCenterI, pixHeightJ),PIX2D( pixCenterI+pixSizeI, pixHeightJ+pixSizeJ)));
} }
} else if (pgmCurrentMenu==&gmServersMenu) {
if( _ptoLogoGSpy!=NULL) {
CTextureData &td = (CTextureData&)*_ptoLogoGSpy->GetData();
#define LOGOSIZE 120
const PIX pixLogoWidth = (PIX) (LOGOSIZE * dpMenu.dp_fWideAdjustment);
const PIX pixLogoHeight = (PIX) (LOGOSIZE* td.GetHeight() / td.GetWidth());
pixI0 = (PIX) ((640-pixLogoWidth -50)*fScaleW);
pixJ0 = (PIX) ((480-pixLogoHeight-40)*fScaleH);
pixI1 = (PIX) (pixI0+ pixLogoWidth *fScaleW);
pixJ1 = (PIX) (pixJ0+ pixLogoHeight*fScaleH);
dpMenu.PutTexture( _ptoLogoGSpy, PIXaabbox2D( PIX2D( pixI0, pixJ0),PIX2D( pixI1, pixJ1)));
#undef LOGOSIZE
}
} else if (pgmCurrentMenu==&gmAudioOptionsMenu) { } else if (pgmCurrentMenu==&gmAudioOptionsMenu) {
if( _ptoLogoEAX!=NULL) { if( _ptoLogoEAX!=NULL) {
CTextureData &td = (CTextureData&)*_ptoLogoEAX->GetData(); CTextureData &td = (CTextureData&)*_ptoLogoEAX->GetData();