forked from Mirrors/openclonk
Add missing sounds for Grab/UnGrab #1585
parent
bdc0274e3d
commit
e2acb8b9bb
|
@ -112,17 +112,20 @@ protected func CatchBlow()
|
||||||
|
|
||||||
protected func Grab(object pTarget, bool fGrab)
|
protected func Grab(object pTarget, bool fGrab)
|
||||||
{
|
{
|
||||||
Sound("Grab");
|
if (fGrab)
|
||||||
|
Sound("Clonk::Action::Grab");
|
||||||
|
else
|
||||||
|
Sound("Clonk::Action::UnGrab");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected func Get()
|
protected func Get()
|
||||||
{
|
{
|
||||||
Sound("Grab");
|
Sound("Clonk::Action::Grab");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected func Put()
|
protected func Put()
|
||||||
{
|
{
|
||||||
Sound("Grab");
|
Sound("Clonk::Action::Grab");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected func Death(int killed_by)
|
protected func Death(int killed_by)
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -73,7 +73,7 @@ Sven2 - Structures/StoneGate/GateMove (adapted from GateHit), IceHit*
|
||||||
DiamondDigOut (adapted from GlassHit), FishMunch1 (adapted from Munch), Wallkit/Klick, Wallkit/Lock, UI::Open, UI::Close
|
DiamondDigOut (adapted from GlassHit), FishMunch1 (adapted from Munch), Wallkit/Klick, Wallkit/Lock, UI::Open, UI::Close
|
||||||
CloseViewport (based on WaterBottleBoing by empraetorius (https://freesound.org/people/empraetorius/sounds/201260/)
|
CloseViewport (based on WaterBottleBoing by empraetorius (https://freesound.org/people/empraetorius/sounds/201260/)
|
||||||
Corrode (based on Pshshsh from Mirors_ http://www.freesound.org/people/Mirors_/sounds/81205/)
|
Corrode (based on Pshshsh from Mirors_ http://www.freesound.org/people/Mirors_/sounds/81205/)
|
||||||
UI::Select
|
UI::Select, Clonk::Action::Grab, Clonk::Action::UnGrab
|
||||||
Zapper - Breathing
|
Zapper - Breathing
|
||||||
zimbot - Animals/Chippie/EggCrack1-3 (modified) (http://www.freesound.org/people/zimbot/sounds/244480/)
|
zimbot - Animals/Chippie/EggCrack1-3 (modified) (http://www.freesound.org/people/zimbot/sounds/244480/)
|
||||||
xerana - Environemnt/Lightning/Thunder1 (https://www.freesound.org/people/xerana/sounds/199638/ adapted by Maikel)
|
xerana - Environemnt/Lightning/Thunder1 (https://www.freesound.org/people/xerana/sounds/199638/ adapted by Maikel)
|
||||||
|
|
|
@ -4397,7 +4397,7 @@ void C4Object::DirectComContents(C4Object *pTarget, bool fDoCalls)
|
||||||
// default action
|
// default action
|
||||||
if (!(Contents.ShiftContents(pTarget))) return;
|
if (!(Contents.ShiftContents(pTarget))) return;
|
||||||
// Selection sound
|
// Selection sound
|
||||||
if (fDoCalls) if (!Contents.GetObject()->Call("~Selection", &C4AulParSet(C4VObj(this)))) StartSoundEffect("Grab",false,100,this);
|
if (fDoCalls) if (!Contents.GetObject()->Call("~Selection", &C4AulParSet(C4VObj(this)))) StartSoundEffect("Clonk::Action::Grab",false,100,this);
|
||||||
// update menu with the new item in "put" entry
|
// update menu with the new item in "put" entry
|
||||||
if (Menu && Menu->IsActive() && Menu->IsContextMenu())
|
if (Menu && Menu->IsActive() && Menu->IsContextMenu())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue