Changeset 6 for trunk/src/game/Level3.cpp

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Files:

• trunk/src/game/Level3.cpp (modified) (12 diffs)

trunk/src/game/Level3.cpp

@@ -62 +62 @@
 {
     HandleReloadAreaTriggerTeleportCommand("");
-    //HandleReloadAreaTriggerTavernCommand(""); -- reloaded in HandleReloadAreaTriggerTavernCommand
-    //HandleReloadQuestAreaTriggersCommand(""); -- reloaded in HandleReloadAllQuestCommand
     HandleReloadSkillFishingBaseLevelCommand("");
 
+    HandleReloadAllAreaCommand("");
     HandleReloadAllLootCommand("");
+    HandleReloadAllNpcCommand("");
     HandleReloadAllQuestCommand("");
     HandleReloadAllSpellCommand("");
@@ -74 +74 @@
     HandleReloadReservedNameCommand("");
     HandleReloadMangosStringCommand("");
+    HandleReloadGameTeleCommand("");
     return true;
 }
@@ -79 +80 @@
 bool ChatHandler::HandleReloadAllAreaCommand(const char*)
 {
+    //HandleReloadQuestAreaTriggersCommand(""); -- reloaded in HandleReloadAllQuestCommand
     HandleReloadAreaTriggerTeleportCommand("");
-    //HandleReloadAreaTriggerTavernCommand(""); -- reloaded in HandleReloadAreaTriggerTavernCommand
+    HandleReloadAreaTriggerTavernCommand("");
+    HandleReloadGameGraveyardZoneCommand("");
+    return true;
+}
+
+bool ChatHandler::HandleReloadAllLootCommand(const char*)
+{
+    sLog.outString( "Re-Loading Loot Tables..." );
+    LoadLootTables();
+    SendGlobalSysMessage("DB tables `*_loot_template` reloaded.");
+    return true;
+}
+
+bool ChatHandler::HandleReloadAllNpcCommand(const char* /*args*/)
+{
+    HandleReloadNpcGossipCommand("a");
+    HandleReloadNpcTrainerCommand("a");
+    HandleReloadNpcVendorCommand("a");
     return true;
 }
@@ -92 +111 @@
     objmgr.LoadQuestRelations();
     SendGlobalSysMessage("DB tables `*_questrelation` and `*_involvedrelation` reloaded.");
-    return true;
-}
-
-bool ChatHandler::HandleReloadAllLootCommand(const char*)
-{
-    sLog.outString( "Re-Loading Loot Tables..." );
-    LoadLootTables();
-    SendGlobalSysMessage("DB tables `*_loot_template` reloaded.");
     return true;
 }
@@ -321 +332 @@
 }
 
+bool ChatHandler::HandleReloadNpcGossipCommand(const char*)
+{
+    sLog.outString( "Re-Loading `npc_gossip` Table!" );
+    objmgr.LoadNpcTextId();
+    SendGlobalSysMessage("DB table `npc_gossip` reloaded.");
+    return true;
+}
+
+bool ChatHandler::HandleReloadNpcTrainerCommand(const char*)
+{
+    sLog.outString( "Re-Loading `npc_trainer` Table!" );
+    objmgr.LoadTrainerSpell();
+    SendGlobalSysMessage("DB table `npc_trainer` reloaded.");
+    return true;
+}
+
+bool ChatHandler::HandleReloadNpcVendorCommand(const char*)
+{
+    sLog.outString( "Re-Loading `npc_vendor` Table!" );
+    objmgr.LoadVendors();
+    SendGlobalSysMessage("DB table `npc_vendor` reloaded.");
+    return true;
+}
+
 bool ChatHandler::HandleReloadReservedNameCommand(const char*)
 {
@@ -548 +583 @@
 
     SendGlobalSysMessage("DB table `game_graveyard_zone` reloaded.");
+
+    return true;
+}
+
+bool ChatHandler::HandleReloadGameTeleCommand(const char* /*arg*/)
+{
+    sLog.outString( "Re-Loading Game Tele coordinates...");
+
+    objmgr.LoadGameTele();
+
+    SendGlobalSysMessage("DB table `game_tele` reloaded.");
 
     return true;
@@ -3870 +3916 @@
     if(!*args)
         return false;
-    QueryResult *result;
+
     Player *player=m_session->GetPlayer();
-    if (!player) return false;
+    if (!player)
+        return false;
 
     std::string name = args;
-    WorldDatabase.escape_string(name);
-    result = WorldDatabase.PQuery("SELECT id FROM game_tele WHERE name = '%s'",name.c_str());
-    if (result)
+
+    if(objmgr.GetGameTele(name))
     {
         SendSysMessage(LANG_COMMAND_TP_ALREADYEXIST);
-        delete result;
-        SetSentErrorMessage(true);
-        return false;
-    }
-
-    float x = player->GetPositionX();
-    float y = player->GetPositionY();
-    float z = player->GetPositionZ();
-    float ort = player->GetOrientation();
-    int mapid = player->GetMapId();
-
-    if(WorldDatabase.PExecuteLog("INSERT INTO game_tele (position_x,position_y,position_z,orientation,map,name) VALUES (%f,%f,%f,%f,%d,'%s')",x,y,z,ort,mapid,name.c_str()))
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    GameTele tele;
+    tele.position_x  = player->GetPositionX();
+    tele.position_y  = player->GetPositionY();
+    tele.position_z  = player->GetPositionZ();
+    tele.orientation = player->GetOrientation();
+    tele.mapId       = player->GetMapId();
+    tele.name        = name;
+
+    if(objmgr.AddGameTele(tele))
     {
         SendSysMessage(LANG_COMMAND_TP_ADDED);
@@ -3911 +3958 @@
 
     std::string name = args;
-    WorldDatabase.escape_string(name);
-
-    QueryResult *result=WorldDatabase.PQuery("SELECT id FROM game_tele WHERE name = '%s'",name.c_str());
-    if (!result)
+
+    if(!objmgr.DeleteGameTele(name))
     {
         SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
@@ -3920 +3965 @@
         return false;
     }
-    delete result;
-
-    if(WorldDatabase.PExecuteLog("DELETE FROM game_tele WHERE name = '%s'",name.c_str()))
-    {
-        SendSysMessage(LANG_COMMAND_TP_DELETED);
-    }
-    else
-    {
-        SendSysMessage(LANG_COMMAND_TP_DELETEERR);
-        SetSentErrorMessage(true);
-        return false;
-    }
+
+    SendSysMessage(LANG_COMMAND_TP_DELETED);
     return true;
 }
@@ -4759 +4794 @@
     if(Type == "ip")
     {
-        result = loginDatabase.PQuery("SELECT ip FROM ip_banned WHERE ip "_LIKE_" '""%%%s%%""'",Filter.c_str());
+        result = loginDatabase.PQuery("SELECT ip FROM ip_banned WHERE ip "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"),Filter.c_str());
         if(!result)
         {
@@ -4778 +4813 @@
     if(Type == "account")
     {
-        result = loginDatabase.PQuery("SELECT id FROM account WHERE username "_LIKE_" '""%%%s%%""' ",Filter.c_str());
+        result = loginDatabase.PQuery("SELECT id FROM account WHERE username "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"),Filter.c_str());
         if (!result)
         {
@@ -4788 +4823 @@
     else if(Type == "characters")
     {
-        result = CharacterDatabase.PQuery("SELECT account FROM characters, WHERE name "_LIKE_" '""%%%s%%""' ",Filter.c_str());
+        result = CharacterDatabase.PQuery("SELECT account FROM characters, WHERE name "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"),Filter.c_str());
         if (!result)
         {