aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control/pet_conversations.h
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-28 21:07:41 -0400
committerPaul Gilbert2016-07-10 16:22:37 -0400
commit4fd482e41813f32359eb91a2b62867605af0382c (patch)
treec313e8d26fa0ae0fa00aacb051ac3f22e5f9d538 /engines/titanic/pet_control/pet_conversations.h
parentff72fc594bae10cd4ac5083d0cf2ca6c412d0f9f (diff)
downloadscummvm-rg350-4fd482e41813f32359eb91a2b62867605af0382c.tar.gz
scummvm-rg350-4fd482e41813f32359eb91a2b62867605af0382c.tar.bz2
scummvm-rg350-4fd482e41813f32359eb91a2b62867605af0382c.zip
TITANIC: Implement checks for whether NPCs can be summoned
Diffstat (limited to 'engines/titanic/pet_control/pet_conversations.h')
-rw-r--r--engines/titanic/pet_control/pet_conversations.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/titanic/pet_control/pet_conversations.h b/engines/titanic/pet_control/pet_conversations.h
index d04e9834d1..3f396c828a 100644
--- a/engines/titanic/pet_control/pet_conversations.h
+++ b/engines/titanic/pet_control/pet_conversations.h
@@ -29,8 +29,6 @@
namespace Titanic {
-enum SummonResult { SUMMON_CANT = 0, SUMMON_CAN = 1, SUMMON_ABORT = 2 };
-
class CPetConversations : public CPetSection {
private:
CPetGfxElement _scrollUp;
@@ -76,7 +74,7 @@ private:
/**
* Check whether an NPC can be summoned
*/
- SummonResult canSummonNPC(const CString &name);
+ int canSummonNPC(const CString &name);
/**
* Summon an NPC