Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a sound for beacons (based on ecmtower.ogg). Use f12 to make wz take you to the beacon location. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4450 4a71c877-e1ca-e34f-864e-861f7616d084
master
Roman C 2008-03-31 18:25:58 +00:00
parent 8a12c396f4
commit 35233a1f9b
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/audio/multi/beacon.ogg Normal file
View File

Binary file not shown.

1
lib/sound/audio_id.c
View File

@ -491,6 +491,7 @@ static AUDIO_ID_MAP asAudioID[] =
{ID_SOUND_PLASMA_FLAMER, "plasflm.ogg"},
{ID_SOUND_UPLINK, "uplink.ogg"},
{ID_SOUND_LAS_SAT_COUNTDOWN, "lasstrk.ogg"},
{ID_SOUND_BEACON, "beacon.ogg"},
};
/***************************************************************************/

2
lib/sound/audio_id.h
View File

@ -491,6 +491,8 @@ typedef enum
/* added for upgrade - 2/9/99 AB*/
ID_SOUND_LAS_SAT_COUNTDOWN,
ID_SOUND_BEACON,
/* Last ID */
ID_SOUND_NEXT, // Thanks to this dummy we don't have to redefine ID_MAX_SOUND every time in terms of the preceding enum value
ID_MAX_SOUND = ID_SOUND_NEXT - 1,

13
src/scriptfuncs.c
View File

@ -10101,25 +10101,17 @@ BOOL addHelpBlip(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char
MESSAGE *psMessage;
VIEWDATA *pTempData;
//debug(LOG_WZ, "addHelpBlip: forPlayer=%d, sender=%d", forPlayer, sender);
if (forPlayer >= MAX_PLAYERS)
{
debug(LOG_ERROR, "addHelpBlip: player number is too high");
return false;
}
//add the beacon for the sender so he can see where he put it
//but only if he's not already adding this one for himself
//if(forPlayer != sender)
// addHelpBlip(locX, locY, sender, sender, textMsg);
//find the message if was already added previously
psMessage = findHelpMsg(forPlayer, sender);
if (psMessage)
{
//remove it
//debug(LOG_WZ, "addHelpBlip: removing previous message from sender=%d",sender);
removeMessage(psMessage, forPlayer);
}
@ -10127,8 +10119,6 @@ BOOL addHelpBlip(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char
psMessage = addMessage(MSG_PROXIMITY, false, forPlayer);
if (psMessage)
{
//debug(LOG_WZ, "created new blip for player %d from %d", forPlayer, sender);
//set the data
pTempData = HelpViewData(sender, textMsg, locX, locY);
ASSERT(pTempData != NULL, "Empty help data for radar beacon");
@ -10160,6 +10150,9 @@ BOOL addHelpBlip(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char
debug(LOG_ERROR, "addHelpBlip() - msgStackPush - stack failed");
return false;
}
// play audio
audio_QueueTrackPos( ID_SOUND_BEACON, locX, locY, 0);
}
return true;