[10948] Fixed typo in enum names

This commit is contained in:
VladimirMangos 2011-01-02 00:23:32 +03:00
parent bf0ecf6e71
commit 20e7cdb55e
5 changed files with 13 additions and 13 deletions

View file

@ -940,14 +940,14 @@ bool ChatHandler::HandleLoadScriptsCommand(char* args)
switch(sScriptMgr.LoadScriptLibrary(args)) switch(sScriptMgr.LoadScriptLibrary(args))
{ {
case SCRIPT_LOAR_OK: case SCRIPT_LOAD_OK:
sWorld.SendWorldText(LANG_SCRIPTS_RELOADED_ANNOUNCE); sWorld.SendWorldText(LANG_SCRIPTS_RELOADED_ANNOUNCE);
SendSysMessage(LANG_SCRIPTS_RELOADED_OK); SendSysMessage(LANG_SCRIPTS_RELOADED_OK);
break; break;
case SCRIPT_LOAR_ERR_NOT_FOUND: case SCRIPT_LOAD_ERR_NOT_FOUND:
SendSysMessage(LANG_SCRIPTS_NOT_FOUND); SendSysMessage(LANG_SCRIPTS_NOT_FOUND);
break; break;
case SCRIPT_LOAR_ERR_WRONG_API: case SCRIPT_LOAD_ERR_WRONG_API:
SendSysMessage(LANG_SCRIPTS_WRONG_API); SendSysMessage(LANG_SCRIPTS_WRONG_API);
break; break;
} }

View file

@ -1042,7 +1042,7 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
m_hScriptLib = MANGOS_LOAD_LIBRARY(name.c_str()); m_hScriptLib = MANGOS_LOAD_LIBRARY(name.c_str());
if (!m_hScriptLib) if (!m_hScriptLib)
return SCRIPT_LOAR_ERR_NOT_FOUND; return SCRIPT_LOAD_ERR_NOT_FOUND;
GetScriptHookPtr(m_pOnInitScriptLibrary, "InitScriptLibrary"); GetScriptHookPtr(m_pOnInitScriptLibrary, "InitScriptLibrary");
GetScriptHookPtr(m_pOnFreeScriptLibrary, "FreeScriptLibrary"); GetScriptHookPtr(m_pOnFreeScriptLibrary, "FreeScriptLibrary");
@ -1082,7 +1082,7 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
!m_pGetGODialogStatus || !m_pOnGOUse || !m_pOnItemUse || !m_pGetGODialogStatus || !m_pOnGOUse || !m_pOnItemUse ||
!m_pOnAreaTrigger || !m_pOnProcessEvent || !m_pOnEffectDummyCreature || !m_pOnAreaTrigger || !m_pOnProcessEvent || !m_pOnEffectDummyCreature ||
!m_pOnEffectDummyGO || !m_pOnEffectDummyItem || !m_pOnAuraDummy) !m_pOnEffectDummyGO || !m_pOnEffectDummyItem || !m_pOnAuraDummy)
return SCRIPT_LOAR_ERR_WRONG_API; return SCRIPT_LOAD_ERR_WRONG_API;
if (m_pOnInitScriptLibrary) if (m_pOnInitScriptLibrary)
m_pOnInitScriptLibrary(); m_pOnInitScriptLibrary();
@ -1090,7 +1090,7 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
if (m_pGetScriptLibraryVersion) if (m_pGetScriptLibraryVersion)
sWorld.SetScriptsVersion(m_pGetScriptLibraryVersion()); sWorld.SetScriptsVersion(m_pGetScriptLibraryVersion());
return SCRIPT_LOAR_OK; return SCRIPT_LOAD_OK;
} }
void ScriptMgr::UnloadScriptLibrary() void ScriptMgr::UnloadScriptLibrary()

View file

@ -306,9 +306,9 @@ extern ScriptMapMap sCreatureMovementScripts;
enum ScriptLoadResult enum ScriptLoadResult
{ {
SCRIPT_LOAR_OK, SCRIPT_LOAD_OK,
SCRIPT_LOAR_ERR_NOT_FOUND, SCRIPT_LOAD_ERR_NOT_FOUND,
SCRIPT_LOAR_ERR_WRONG_API SCRIPT_LOAD_ERR_WRONG_API
}; };
class ScriptMgr class ScriptMgr

View file

@ -1252,13 +1252,13 @@ void World::SetInitialWorldSettings()
sLog.outString("Initializing Scripts..."); sLog.outString("Initializing Scripts...");
switch(sScriptMgr.LoadScriptLibrary(MANGOS_SCRIPT_NAME)) switch(sScriptMgr.LoadScriptLibrary(MANGOS_SCRIPT_NAME))
{ {
case SCRIPT_LOAR_OK: case SCRIPT_LOAD_OK:
sLog.outString("Scripting library loaded."); sLog.outString("Scripting library loaded.");
break; break;
case SCRIPT_LOAR_ERR_NOT_FOUND: case SCRIPT_LOAD_ERR_NOT_FOUND:
sLog.outError("Scripting library not found or not accessable."); sLog.outError("Scripting library not found or not accessable.");
break; break;
case SCRIPT_LOAR_ERR_WRONG_API: case SCRIPT_LOAD_ERR_WRONG_API:
sLog.outError("Scripting library has wrong list functions (outdated?)."); sLog.outError("Scripting library has wrong list functions (outdated?).");
break; break;
} }

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10947" #define REVISION_NR "10948"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__