Fix rsa change, messagebox and remove lua variable from c++

This commit is contained in:
Henrique Santiago
2012-08-14 17:37:07 -03:00
parent d0b3c04853
commit 4e8afab335
5 changed files with 21 additions and 7 deletions

View File

@@ -265,6 +265,9 @@ std::string Crypt::sha512Encode(const std::string& decoded_string, bool upperCas
void Crypt::rsaSetPublicKey(const std::string& n, const std::string& e)
{
RSA_free(m_rsa);
m_rsa = RSA_new();
BN_dec2bn(&m_rsa->n, n.c_str());
BN_dec2bn(&m_rsa->e, e.c_str());
}

View File

@@ -1203,7 +1203,7 @@ void Game::setFollowingCreature(const CreaturePtr& creature)
std::string Game::formatCreatureName(const std::string& name)
{
std::string formatedName = name;
if(g_lua.callGlobalField<bool>("g_game", "isCreatureNameFormatEnabled") && name.length() > 0)
if(m_isCreatureNameFormatEnabled && name.length() > 0)
formatedName[0] = stdext::upchar(formatedName[0]);
return formatedName;
}

View File

@@ -269,6 +269,8 @@ public:
std::vector<uint8> getGMActions() { return m_gmActions; }
std::string formatCreatureName(const std::string &name);
void enableCreatureNameFormat() { m_isCreatureNameFormatEnabled = true; }
void disableCreatureNameFormat() { m_isCreatureNameFormatEnabled = false; }
protected:
void enableBotCall() { m_denyBotCall = false; }
@@ -285,6 +287,7 @@ private:
std::map<int, ContainerPtr> m_containers;
std::map<int, Vip> m_vips;
stdext::boolean<true> m_isCreatureNameFormatEnabled;
bool m_online;
bool m_denyBotCall;
bool m_dead;

View File

@@ -206,6 +206,8 @@ void OTClient::registerLuaFunctions()
g_lua.bindSingletonFunction("g_game", "getFeature", &Game::getFeature, &g_game);
g_lua.bindSingletonFunction("g_game", "setFeature", &Game::setFeature, &g_game);
g_lua.bindSingletonFunction("g_game", "enableFeature", &Game::enableFeature, &g_game);
g_lua.bindSingletonFunction("g_game", "enableCreatureNameFormat", &Game::enableCreatureNameFormat, &g_game);
g_lua.bindSingletonFunction("g_game", "disableCreatureNameFormat", &Game::disableCreatureNameFormat, &g_game);
g_lua.registerSingletonClass("g_shaders");
g_lua.bindSingletonFunction("g_shaders", "createShader", &ShaderManager::createShader, &g_shaders);