1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to reduce the number of compile warnings. Still many more to fix

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Overhaul
2007-10-20 08:32:53 +00:00
parent 4bb41616eb
commit b170dbb1e5
9 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Sound Control.cpp
+12 -11
View File
@@ -680,7 +680,7 @@ INT32 SoundDir( INT16 sGridNo )
sDif = sMiddleX - sScreenX;
if ( ( sAbsDif = abs( sDif ) ) > 64 )
if ( ( sAbsDif = (INT16) abs( sDif ) ) > 64 )
{
// OK, NOT the middle.
// Is it outside the screen?
@@ -735,8 +735,8 @@ INT32 SoundVolume( INT8 bInitialVolume, INT16 sGridNo )
sDifX = sMiddleX - sScreenX;
sDifY = sMiddleY - sScreenY;
sAbsDifX = abs( sDifX );
sAbsDifY = abs( sDifY );
sAbsDifX = (INT16) abs( sDifX );
sAbsDifY = (INT16) abs( sDifY );
if ( sAbsDifX > 64 || sAbsDifY > 64 )
{
@@ -968,7 +968,7 @@ void SetPositionSndsInActive( )
}
// == Lesh slightly changed this function ============
INT32 PositionSoundDir( INT16 sGridNo )
UINT8 PositionSoundDir( INT16 sGridNo )
{
INT16 sWorldX, sWorldY;
INT16 sScreenX, sScreenY;
@@ -991,7 +991,7 @@ INT32 PositionSoundDir( INT16 sGridNo )
sDif = sMiddleX - sScreenX;
if ( ( sAbsDif = abs( sDif ) ) > 64 )
if ( ( sAbsDif = (INT16) abs( sDif ) ) > 64 )
{
// OK, NOT the middle.
@@ -1022,7 +1022,7 @@ INT32 PositionSoundDir( INT16 sGridNo )
}
INT32 PositionSoundVolume( INT8 bInitialVolume, INT16 sGridNo )
INT8 PositionSoundVolume( INT8 bInitialVolume, INT16 sGridNo )
{
INT16 sWorldX, sWorldY;
INT16 sScreenX, sScreenY;
@@ -1050,8 +1050,8 @@ INT32 PositionSoundVolume( INT8 bInitialVolume, INT16 sGridNo )
sDifX = sMiddleX - sScreenX;
sDifY = sMiddleY - sScreenY;
sAbsDifX = abs( sDifX );
sAbsDifY = abs( sDifY );
sAbsDifX = (INT16) abs( sDifX );
sAbsDifY = (INT16) abs( sDifY );
sMaxDistX = (INT16)( ( gsBottomRightWorldX - gsTopLeftWorldX ) * 1.5 );
sMaxDistY = (INT16)( ( gsBottomRightWorldY - gsTopLeftWorldY ) * 1.5 );
@@ -1078,7 +1078,8 @@ void SetPositionSndsVolumeAndPanning( )
{
UINT32 cnt;
POSITIONSND *pPositionSnd;
INT8 bVolume, bPan;
INT8 bVolume;
UINT8 ubPan;
SOLDIERTYPE *pSoldier;
for ( cnt = 0; cnt < guiNumPositionSnds; cnt++ )
@@ -1119,9 +1120,9 @@ void SetPositionSndsVolumeAndPanning( )
SoundSetVolume( pPositionSnd->iSoundSampleID, bVolume );
bPan = PositionSoundDir( pPositionSnd->sGridNo );
ubPan = PositionSoundDir( pPositionSnd->sGridNo );
SoundSetPan( pPositionSnd->iSoundSampleID, bPan );
SoundSetPan( pPositionSnd->iSoundSampleID, ubPan );
}
}
}