mirror of
https://github.com/edubart/otclient.git
synced 2025-10-15 20:14:54 +02:00
use with
This commit is contained in:
@@ -37,6 +37,7 @@ void Game::loginWorld(const std::string& account, const std::string& password, c
|
||||
m_online = false;
|
||||
m_dead = false;
|
||||
m_walkFeedback = true;
|
||||
m_selectedThing = nullptr;
|
||||
m_walkPing = 0;
|
||||
m_protocolGame = ProtocolGamePtr(new ProtocolGame);
|
||||
m_protocolGame->login(account, password, worldHost, (uint16)worldPort, characterName);
|
||||
@@ -251,6 +252,16 @@ void Game::use(const ThingPtr& thing)
|
||||
m_protocolGame->sendUseItem(thing->getPos(), thing->getId(), stackpos, 0);// last 0 has something to do with container
|
||||
}
|
||||
|
||||
void Game::useWith(const ThingPtr& fromThing, const ThingPtr& toThing)
|
||||
{
|
||||
if(!m_online || !fromThing || !toThing || !checkBotProtection())
|
||||
return;
|
||||
|
||||
int fromStackpos = getThingStackpos(fromThing), toStackpos = getThingStackpos(toThing);
|
||||
if(fromStackpos != -1 && toStackpos != -1)
|
||||
m_protocolGame->sendUseItemEx(fromThing->getPos(), fromThing->getId(), fromStackpos, toThing->getPos(), toThing->getId(), toStackpos);
|
||||
}
|
||||
|
||||
void Game::attack(const CreaturePtr& creature)
|
||||
{
|
||||
if(!m_online || !creature || !checkBotProtection())
|
||||
|
@@ -57,6 +57,7 @@ public:
|
||||
void turn(Otc::Direction direction);
|
||||
void look(const ThingPtr& thing);
|
||||
void use(const ThingPtr& thing);
|
||||
void useWith(const ThingPtr& fromThing, const ThingPtr& toThing);
|
||||
void attack(const CreaturePtr& creature);
|
||||
void cancelAttack();
|
||||
void follow(const CreaturePtr& creature);
|
||||
@@ -82,6 +83,9 @@ public:
|
||||
bool isOnline() { return m_online; }
|
||||
bool isDead() { return m_dead; }
|
||||
|
||||
void setSelectedThing(const ThingPtr& thing) { m_selectedThing = thing; }
|
||||
ThingPtr getSelectedThing() { return m_selectedThing; }
|
||||
|
||||
void setServerBeat(int serverBeat) { m_serverBeat = serverBeat; }
|
||||
int getServerBeat() { return m_serverBeat; }
|
||||
|
||||
@@ -101,6 +105,7 @@ private:
|
||||
Timer m_walkPingTimer;
|
||||
int m_walkPing;
|
||||
int m_serverBeat;
|
||||
ThingPtr m_selectedThing;
|
||||
};
|
||||
|
||||
extern Game g_game;
|
||||
|
@@ -179,6 +179,7 @@ void OTClient::registerLuaFunctions()
|
||||
g_lua.bindClassStaticFunction<Game>("setOutfit", std::bind(&Game::setOutfit, &g_game, _1));
|
||||
g_lua.bindClassStaticFunction<Game>("look", std::bind(&Game::look, &g_game, _1));
|
||||
g_lua.bindClassStaticFunction<Game>("use", std::bind(&Game::use, &g_game, _1));
|
||||
g_lua.bindClassStaticFunction<Game>("useWith", std::bind(&Game::useWith, &g_game, _1, _2));
|
||||
g_lua.bindClassStaticFunction<Game>("attack", std::bind(&Game::attack, &g_game, _1));
|
||||
g_lua.bindClassStaticFunction<Game>("cancelAttack", std::bind(&Game::cancelAttack, &g_game));
|
||||
g_lua.bindClassStaticFunction<Game>("follow", std::bind(&Game::follow, &g_game, _1));
|
||||
@@ -199,6 +200,8 @@ void OTClient::registerLuaFunctions()
|
||||
g_lua.bindClassStaticFunction<Game>("talkPrivate", std::bind(&Game::talkPrivate, &g_game, _1, _2, _3));
|
||||
g_lua.bindClassStaticFunction<Game>("getLocalPlayer", std::bind(&Game::getLocalPlayer, &g_game));
|
||||
g_lua.bindClassStaticFunction<Game>("getProtocolVersion", std::bind(&Game::getProtocolVersion, &g_game));
|
||||
g_lua.bindClassStaticFunction<Game>("setSelectedThing", std::bind(&Game::setSelectedThing, &g_game, _1));
|
||||
g_lua.bindClassStaticFunction<Game>("getSelectedThing", std::bind(&Game::getSelectedThing, &g_game));
|
||||
|
||||
g_lua.registerClass<UIItem, UIWidget>();
|
||||
g_lua.bindClassStaticFunction<UIItem>("create", []{ return UIItemPtr(new UIItem); } );
|
||||
|
Reference in New Issue
Block a user