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

Objects: Removed superfluous parameters in function calls 

Caused a few warnings recently.
Maikel de Vries 2011-05-12 17:01:54 +02:00
parent 207576a058
commit 971b330288
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1832,7 +1832,7 @@ func StartPushing()
{
// if(GetEffect("IntTumble", this)) return;
// Close eyes
PlayAnimation("Push", 5, Anim_AbsX(0, 0, GetAnimationLength("Push"), 20, ANIM_Loop), Anim_Linear(0, 0, 1000, 5, ANIM_Remove));
PlayAnimation("Push", 5, Anim_AbsX(0, 0, GetAnimationLength("Push"), 20), Anim_Linear(0, 0, 1000, 5, ANIM_Remove));
// Update carried items
UpdateAttach();
// Set proper turn type

4
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
View File

@ -496,8 +496,8 @@ private func ClearButtons(int start)
actionbar[j]->Clear();
}
if(deco->GetSlotNumber() != -1)
if(deco->GetSlotNumber() != GetRealActionbarLength(actionbar))
deco->SlideTo(GetRealActionbarLength(actionbar) );
if(deco->GetSlotNumber() != GetRealActionbarLength())
deco->SlideTo(GetRealActionbarLength());
}
private func GetRealActionbarLength()

2
planet/Objects.ocd/HUD.ocd/Elements.ocd/ObjectSelector.ocd/ExtraSlot.ocd/Script.c
View File

@ -124,7 +124,7 @@ public func FxIntRemoveGuardStop(object target, effect, int reason, bool temp)
{
if(reason == 3)
if(target == myobject)
SetObject(nil,0);
SetObject(nil);
}
public func Update()

4
planet/Objects.ocd/Libraries.ocd/Base.ocd/Script.c
View File

@ -199,7 +199,7 @@ func UpdateClonkBuyMenus()
aClonkBuyList[iIndex-1] = 0;
continue;
}
OpenBuyMenu(pClonk, nil, pClonk->GetMenuSelection(), 1);
OpenBuyMenu(pClonk, nil, pClonk->GetMenuSelection());
}
}
@ -253,7 +253,7 @@ func DoBuy(id idDef, int iForPlr, int iPayPlr, object pClonk, bool bRight, bool
if(pObj->GetOCF() & OCF_Collectible) pClonk->Collect(pObj);
// is right clicked? then buy another object
if(bRight)
DoBuy(idDef, iForPlr, iPayPlr, pClonk, bRight, iValue, 1);
DoBuy(idDef, iForPlr, iPayPlr, pClonk, bRight, false);
return pObj;
}

4
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
View File

@ -80,8 +80,8 @@ public func GetItemPos(object item)
public func Switch2Items(int one, int two)
{
// no valid inventory index: cancel
if (!Inside(one,0,MaxContentsCount(one)-1)) return;
if (!Inside(two,0,MaxContentsCount(two)-1)) return;
if (!Inside(one,0,MaxContentsCount()-1)) return;
if (!Inside(two,0,MaxContentsCount()-1)) return;
// switch them around
var temp = inventory[one];

2
planet/System.ocg/Explode.c
View File

@ -12,7 +12,7 @@
global func Explode(int level)
{
// Shake the viewport.
ShakeViewPort(level, nil, GetX(), GetY());
ShakeViewPort(level, GetX(), GetY());
// Sound must be created before object removal, for it to be played at the right position.
var grade = BoundBy(level / 10 - 1, 1, 3);