diff options
| author | piernov <piernov@piernov.org> | 2016-05-07 13:48:28 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2016-05-07 13:48:28 +0200 |
| commit | b91588134f3067c2771011c10af77cda5f9031e8 (patch) | |
| tree | a8e5f1bde0bfe9539bb5dd29e249ee8c6b1f36d6 /inc/craftmine.inc | |
| parent | 8621eae6aa5fcdba0a60f0a5f1136412c61999ec (diff) | |
| parent | 80f5826d1ac8f6d42866d5133c6f463943b96bab (diff) | |
| download | candybox-b91588134f3067c2771011c10af77cda5f9031e8.tar.gz candybox-b91588134f3067c2771011c10af77cda5f9031e8.tar.bz2 candybox-b91588134f3067c2771011c10af77cda5f9031e8.tar.xz candybox-b91588134f3067c2771011c10af77cda5f9031e8.zip | |
Merge branch 'alexichi' into feat/gui
Diffstat (limited to 'inc/craftmine.inc')
| -rw-r--r-- | inc/craftmine.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/inc/craftmine.inc b/inc/craftmine.inc index 0d6a445..f5dbbb1 100644 --- a/inc/craftmine.inc +++ b/inc/craftmine.inc @@ -3,6 +3,7 @@ require_once("mine.inc"); require_once("shop.inc"); require_once("dungeon.inc"); +require_once("perso.inc"); function sendCraftMine() { $data = array("gold" => sendMine(), @@ -10,6 +11,7 @@ function sendCraftMine() { "inventory" => Inventory::sendContent(), "miners" => sendMiners(), "dungeon" => sendDungeon(), + "perso" => sendPerso(), ); echo json_encode($data); } |