marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent jump action during crew creation to avoid command failure sounds in intro sequences with contained clonks.

objectmenu
Sven Eberhardt 2016-01-17 23:01:57 -05:00
parent 2c834e6993
commit 38dad0dd9d
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
planet/Objects.ocd/Clonk.ocd/Script.c
View File

@ -30,19 +30,19 @@
protected func Construction()
{
_inherited(...);
SetAction("Walk");
SetDir(Random(2));
// Broadcast for rules
GameCallEx("OnClonkCreation", this);
SetSkin(0);
AddEffect("IntTurn", this, 1, 1, this);
AddEffect("IntEyes", this, 1, 35+Random(4), this);
AttachBackpack();
iHandMesh = [0,0];
SetSkin(0);
SetAction("Walk");
SetDir(Random(2));
// Broadcast for rules
GameCallEx("OnClonkCreation", this);
}
/* When adding to the crew of a player */
@ -661,7 +661,12 @@ func SetSkin(int new_skin)
RemoveBackpack(); //add a backpack
AttachBackpack();
if (!Contained()) SetAction("Jump"); //refreshes animation (unless contained, in which case this would cause the object to fall out)
//refreshes animation (whatever that means?)
// Go back to original action afterwards and hope
// that noone calls SetSkin during more compex activities
var prev_action = GetAction();
SetAction("Jump");
SetAction(prev_action);
return skin;
}