Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

workers attack sounds and unorganic units death sounds from David Slimp

Browse source
This commit is contained in:
johns 2000-05-27 19:59:38 +00:00
parent 036750d1a4
commit 1b64a8c79a
2 changed files with 20 additions and 9 deletions

2
doc/ChangeLog.html
View file

@ -496,6 +496,8 @@
<LI>Fixed bug: Placement and removement of oil patch from David Slimp.
<LI>Cleanup of video code.
<LI>Fixed bug: Now starts if compiled without sound and with CCl.
<LI>Fixed workers attack sounds and unorganic units death sounds from
David Slimp.
<LI>+++
</UL>

27
src/sound/unitsound.cpp
View file

@ -1258,9 +1258,9 @@ Remap Remaps[]={
{ "grunt-attack",
"sword attack"},
{ "peasant-attack",
"fist"},
"peasant attack"},
{ "peon-attack",
"fist"},
"peasant attack"},
{ "ballista-attack",
"catapult-ballista attack"},
{ "catapult-attack",
@ -1351,13 +1351,13 @@ Remap Remaps[]={
//{ "orc-cannon-tower-attack",
//},
{ "peon-with-gold-attack",
"fist"},
"peasant attack"},
{ "peasant-with-gold-attack",
"fist"},
"peasant attack"},
{ "peon-with-wood-attack",
"fist"},
"peasant attack"},
{ "peasant-with-wood-attack",
"fist"}
"peasant attack"}
// { "",
// ""},
};
@ -1502,7 +1502,7 @@ global void MapUnitSounds(void) {
int i;
int nb;
SoundId HumanHelp,HumanCityHelp,OrcHelp,OrcCityHelp;
SoundId HumanDead,OrcDead,BuildingDestroyed,ShipSinking;
SoundId HumanDead,OrcDead,BuildingDestroyed,ShipSinking,NonOrganicDead;
if( SoundFildes!=-1 ) {
SetSoundRange(SoundIdForName("tree chopping"),32);
@ -1522,6 +1522,7 @@ global void MapUnitSounds(void) {
OrcDead=SoundIdForName("basic orc voices dead");
BuildingDestroyed=SoundIdForName("building destroyed");
ShipSinking=SoundIdForName("ship sinking");
NonOrganicDead=SoundIdForName("explosion");
for(i=0;i<nb;i++) {
UnitTypes[i].Sound.Selected.Sound=
SoundIdForName(UnitTypes[i].Sound.Selected.Name);
@ -1551,7 +1552,11 @@ global void MapUnitSounds(void) {
if (UnitTypes[i].SeaUnit) {
UnitTypes[i].Sound.Dead.Sound=ShipSinking;
} else {
UnitTypes[i].Sound.Dead.Sound=OrcDead;
if (UnitTypes[i].Organic) {
UnitTypes[i].Sound.Dead.Sound=OrcDead;
} else {
UnitTypes[i].Sound.Dead.Sound=NonOrganicDead;
}
}
}
} else {
@ -1564,7 +1569,11 @@ global void MapUnitSounds(void) {
if (UnitTypes[i].SeaUnit) {
UnitTypes[i].Sound.Dead.Sound=ShipSinking;
} else {
UnitTypes[i].Sound.Dead.Sound=HumanDead;
if (UnitTypes[i].Organic) {
UnitTypes[i].Sound.Dead.Sound=HumanDead;
} else {
UnitTypes[i].Sound.Dead.Sound=NonOrganicDead;
}
}
}
}