From fb322701064a91a37e3cb9be8d6ab31da81e1be8 Mon Sep 17 00:00:00 2001 From: David Dormagen Date: Sun, 22 Nov 2015 11:18:59 +0100 Subject: [PATCH] various foodstuff: handle ControlUse properly Otherwise other things might happen after consumption. Like, collecting rocks. --- planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c | 1 + .../Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c | 1 + .../Objects.ocd/Items.ocd/Foodstuff.ocd/Sproutberry.ocd/Script.c | 1 + planet/Objects.ocd/Vegetation.ocd/Coral.ocd/Script.c | 1 + planet/Objects.ocd/Vegetation.ocd/Mushroom.ocd/Script.c | 1 + 5 files changed, 5 insertions(+) diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c index 7351880cf..bf7ed7f38 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c @@ -10,6 +10,7 @@ protected func Hit() protected func ControlUse(object clonk, int iX, int iY) { clonk->Eat(this); + return true; } public func NutritionalValue() { return 50; } diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c index 91232abee..02f78a892 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c @@ -16,6 +16,7 @@ func Hit() protected func ControlUse(object clonk) { clonk->Eat(this); + return true; } public func NutritionalValue() { return 25; } diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Sproutberry.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Sproutberry.ocd/Script.c index d8d335f8f..618940b0e 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Sproutberry.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Sproutberry.ocd/Script.c @@ -15,6 +15,7 @@ public func Construction() protected func ControlUse(object clonk, int iX, int iY) { clonk->Eat(this); + return true; } public func NutritionalValue() { return 5; } diff --git a/planet/Objects.ocd/Vegetation.ocd/Coral.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Coral.ocd/Script.c index 3d1813739..12ee33815 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Coral.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Coral.ocd/Script.c @@ -179,6 +179,7 @@ func IsPlant(){return true;} protected func ControlUse(object clonk, int iX, int iY) { clonk->Eat(this); + return true; } func NutritionalValue_() { return 5; } diff --git a/planet/Objects.ocd/Vegetation.ocd/Mushroom.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Mushroom.ocd/Script.c index b5f8d9536..eb3180b34 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Mushroom.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Mushroom.ocd/Script.c @@ -41,6 +41,7 @@ public func RootSurface() protected func ControlUse(object clonk) { clonk->Eat(this); + return true; } // Nutritional value depends on the completion of the mushroom.