summaryrefslogtreecommitdiffstats
path: root/source/cMonster.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-19 21:42:32 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-19 21:42:32 +0200
commit427e582d5fcbd5025a81a4e89ccada47877ccc64 (patch)
tree1196585a1a6fdc39c6a05aa117cfa2766f7dca2f /source/cMonster.h
parentAndroid: Do not create an input thread for Android (diff)
downloadcuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar
cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.gz
cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.bz2
cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.lz
cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.xz
cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.zst
cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.zip
Diffstat (limited to 'source/cMonster.h')
-rw-r--r--source/cMonster.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/cMonster.h b/source/cMonster.h
index ab247fcfa..d46cd9205 100644
--- a/source/cMonster.h
+++ b/source/cMonster.h
@@ -41,7 +41,7 @@ public:
virtual bool ReachedDestination();
const char *GetState();
- void SetState(const char* str);
+ void SetState(const AString & str);
static void ListMonsters();
virtual void CheckEventSeePlayer();
@@ -93,7 +93,7 @@ protected:
float m_AttackRange;
float m_AttackInterval;
- void AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, ENUM_ITEM_ID a_Item, short a_ItemHealth = 0);
+ void AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, short a_Item, short a_ItemHealth = 0);
}; //tolua_export