summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-20 00:24:57 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-20 00:24:57 +0300
commit226331a5e5399ef447bf4eb161d79dfc69a01c5c (patch)
tree4c81bdc026488480ddd6604248447975276d3ac1
parente7b0eec60bdd4b2a6cd33077c069e90a1aab7ad3 (diff)
downloadplus-226331a5e5399ef447bf4eb161d79dfc69a01c5c.tar.gz
plus-226331a5e5399ef447bf4eb161d79dfc69a01c5c.tar.bz2
plus-226331a5e5399ef447bf4eb161d79dfc69a01c5c.tar.xz
plus-226331a5e5399ef447bf4eb161d79dfc69a01c5c.zip
Add chat command /adoptchild.
-rw-r--r--src/actions/commands.cpp16
-rw-r--r--src/actions/commands.h1
-rw-r--r--src/dyetool/actions/commands.cpp1
-rw-r--r--src/enums/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h6
5 files changed, 25 insertions, 0 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index a91e6f244..1c57bd677 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -62,6 +62,7 @@
#include "net/chathandler.h"
#include "net/guildhandler.h"
#ifdef EATHENA_SUPPORT
+#include "net/familyhandler.h"
#include "net/homunculushandler.h"
#include "net/mailhandler.h"
#include "net/net.h"
@@ -1576,4 +1577,19 @@ impHandler(mailTo)
#endif
}
+impHandler(adoptChild)
+{
+#ifdef EATHENA_SUPPORT
+ const std::string nick = getNick(event);
+ Being *const being = actorManager->findBeingByName(
+ nick, ActorType::Player);
+ if (!being)
+ return true;
+ familyHandler->askForChild(being);
+ return true;
+#else
+ return false;
+#endif
+}
+
} // namespace Actions
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 76dc683e9..d2b6e5eeb 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -139,6 +139,7 @@ namespace Actions
decHandler(commandBreakGuild);
decHandler(commandGuildRecall);
decHandler(mailTo);
+ decHandler(adoptChild);
} // namespace Actions
#undef decHandler
diff --git a/src/dyetool/actions/commands.cpp b/src/dyetool/actions/commands.cpp
index bc61b1a3d..5fa4c2c4b 100644
--- a/src/dyetool/actions/commands.cpp
+++ b/src/dyetool/actions/commands.cpp
@@ -139,5 +139,6 @@ impHandlerVoid(commandPartyRecall)
impHandlerVoid(commandBreakGuild)
impHandlerVoid(commandGuildRecall)
impHandlerVoid(mailTo)
+impHandlerVoid(adoptChild)
} // namespace Actions
diff --git a/src/enums/input/inputaction.h b/src/enums/input/inputaction.h
index f7663ae7f..1996602da 100644
--- a/src/enums/input/inputaction.h
+++ b/src/enums/input/inputaction.h
@@ -668,6 +668,7 @@ enumStart(InputAction)
COMMAND_BREAK_GUILD,
COMMAND_GUILD_RECALL,
MAIL_TO,
+ ADOPT_CHILD,
TOTAL
}
enumEnd(InputAction);
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 16869cbd0..426eb3ae7 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -5497,6 +5497,12 @@ static const InputActionData inputActionData
"mailto",
UseArgs_true,
Protected_false},
+ {"keyAdoptChild",
+ defaultAction(&Actions::adoptChild),
+ InputCondition::INGAME,
+ "adoptchild|childadopt|askforchild",
+ UseArgs_true,
+ Protected_true},
};
#undef defaultAction