From 25727244ad2437ebf424c983f6f04ef4789c45cb Mon Sep 17 00:00:00 2001 From: fgenesis Date: Thu, 20 Jun 2013 05:15:07 +0200 Subject: [PATCH] Little correction to prev commit Only handle cooking failure if the function call was successful. Otherwise, fallback to SeaLoaf. --- Aquaria/Game.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp index 6e2ddfd..3270fbc 100644 --- a/Aquaria/Game.cpp +++ b/Aquaria/Game.cpp @@ -7221,11 +7221,13 @@ void Game::onCook() const char *p2 = cookList[1]->name.c_str(); const char *p3 = cookList.size() >= 3 ? cookList[2]->name.c_str() : ""; std::string ingname; - cookingScript->call("cookFailure", p1, p2, p3, &ingname); - if(ingname.length()) - data = dsq->continuity.getIngredientDataByName(ingname); - if(!data) - goto endcook; + if(cookingScript->call("cookFailure", p1, p2, p3, &ingname)) + { + if(ingname.length()) + data = dsq->continuity.getIngredientDataByName(ingname); + if(!data) + goto endcook; + } } if(!data)