From 4db6300789cd990b87cf9b8076ac7f88d7ce954e Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 15 Jan 2018 22:19:05 +0100 Subject: [PATCH] Test #1974: Improved test The test can now actually reproduce the bug before it was fixed, and proves that it does not appear anymore now that it is fixed. --- .../ClonkAttachments.ocs/Dummy.ocd/DefCore.txt | 15 +++++++++++++++ .../Dummy.ocd/Graphics.mesh | Bin 0 -> 12279 bytes .../Dummy.ocd/Hammer.skeleton | Bin 0 -> 70 bytes .../ClonkAttachments.ocs/Dummy.ocd/Script.c | 16 ++++++++++++++++ planet/Tests.ocf/ClonkAttachments.ocs/Script.c | 10 +++++----- 5 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/DefCore.txt create mode 100644 planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/Graphics.mesh create mode 100644 planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/Hammer.skeleton create mode 100644 planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/Script.c diff --git a/planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/DefCore.txt b/planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/DefCore.txt new file mode 100644 index 000000000..d3752b050 --- /dev/null +++ b/planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/DefCore.txt @@ -0,0 +1,15 @@ +[DefCore] +id=Attacher +Version=8,0 +Category=C4D_Object +Width=8 +Height=12 +Offset=-4,-6 +Vertices=4 +VertexX=-1,-1,-3,3 +VertexY=1,5,-2,-2 +VertexFriction=80,80,80,80 +Value=8 +Mass=15 +Rotate=1 + diff --git a/planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/Graphics.mesh b/planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/Graphics.mesh new file mode 100644 index 0000000000000000000000000000000000000000..989382cd4225133d1d394d6ab0b26ced64609109 GIT binary patch literal 12279 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 o=o^kg0vz)GfCCc*i3pG~0#!vs2?0@93q(1JhX^ KFx+D?wFdwn77bDW literal 0 HcmV?d00001 diff --git a/planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/Script.c b/planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/Script.c new file mode 100644 index 000000000..3f791cbcf --- /dev/null +++ b/planet/Tests.ocf/ClonkAttachments.ocs/Dummy.ocd/Script.c @@ -0,0 +1,16 @@ +/** + Attachment dummy +*/ + + +/*-- Display --*/ + +public func GetCarryMode(object clonk, bool idle) +{ + return CARRY_Belt; +} + +func Definition(def) +{ + SetProperty("PictureTransformation", Trans_Rotate(20, 1, 0, 1), def); +} diff --git a/planet/Tests.ocf/ClonkAttachments.ocs/Script.c b/planet/Tests.ocf/ClonkAttachments.ocs/Script.c index ebfbae9d5..1e6f70132 100644 --- a/planet/Tests.ocf/ClonkAttachments.ocs/Script.c +++ b/planet/Tests.ocf/ClonkAttachments.ocs/Script.c @@ -257,7 +257,7 @@ global func Test1_Run() if (corpse) corpse.Visibility = VIS_None; if (collector) collector.Visibility = VIS_None; if (item) item->Enter(test.test1_store); - RemoveAll(Find_ID(Rock)); + RemoveAll(Find_ID(Attacher)); test.test1_index += 1; return; } @@ -302,7 +302,7 @@ global func Test1_Run() if (test.test1_corpse_display[index] == nil) { - test.test1_corpse_display[index] = Test1_IsAttached(corpse, attachment_id); + test.test1_corpse_display[index] = Test1_IsAttached(corpse, attachment_id + 1); // the corpse also had the attacher } if (item->Contained() != collector) @@ -327,9 +327,9 @@ global func Test1_Run() test.test1_corpse[index] = corpse = CreateObject(Clonk, cursor->GetX() + 100, cursor->GetY(), script_plr); item->SetPosition(corpse->GetX(), corpse->GetY()); corpse->Collect(test.test1_item[index]); - corpse->CreateContents(Rock); // Create something else, so that the item is not displayed as a hand item - corpse->ShiftContents(nil, Rock); - corpse->FindContents(Rock).Visibility = VIS_None; + corpse->CreateContents(Attacher); // Create something else, so that the actual item is displayed in the quick slot + corpse->ShiftContents(nil, Attacher); + //corpse->FindContents(Attacher).Visibility = VIS_None; Wait(collect_delay); } }