Changeset 21 for trunk/src/hearthstone-world/QueryHandler.cpp

Timestamp:

09/20/09 20:50:14 (3 years ago)

Author:

valroft

Message:

- Fully reverted LocalizationMgr?. It wasn't being used, and really only wasted memory. Localize your own DBs.
- Run the SQL update 2009_09_20_localizations.sql.

Files:

• trunk/src/hearthstone-world/QueryHandler.cpp (modified) (4 diffs)

trunk/src/hearthstone-world/QueryHandler.cpp

@@ -94 +94 @@
                         return;
 
-                LocalizedCreatureName * lcn = (language>0) ? sLocalizationMgr.GetLocalizedCreatureName(entry, language) : NULL;
-
-                if(lcn == NULL)
-                {
-                        OUT_DEBUG("WORLD: CMSG_CREATURE_QUERY '%s'", ci->Name);
-                        data << (uint32)entry;
-                        data << ci->Name;
-                        data << uint8(0) << uint8(0) << uint8(0);
-                        data << ci->SubName;
-                }
-                else
-                {
-                        OUT_DEBUG("WORLD: CMSG_CREATURE_QUERY '%s' (localized to %s)", ci->Name, lcn->Name);
-                        data << (uint32)entry;
-                        data << lcn->Name;
-                        data << uint8(0) << uint8(0) << uint8(0);
-                        data << lcn->SubName;
-                }
+                OUT_DEBUG("WORLD: CMSG_CREATURE_QUERY '%s'", ci->Name);
+                data << (uint32)entry;
+                data << ci->Name;
+                data << uint8(0) << uint8(0) << uint8(0);
+                data << ci->SubName;
                 data << ci->info_str; //!!! this is a string in 2.3.0 Example: stormwind guard has : "Direction"
                 data << ci->Flags1;  
@@ -162 +149 @@
                 return;
 
-        LocalizedGameObjectName * lgn = (language>0) ? sLocalizationMgr.GetLocalizedGameObjectName(entryID, language) : NULL;
-    
         data << entryID;
         data << goinfo->Type;
         data << goinfo->DisplayID;
-        if(lgn)
-                data << lgn->Name;
-        else
-                data << goinfo->Name;
+        data << goinfo->Name;
 
         data << uint8(0) << uint8(0) << uint8(0) << uint8(0) << uint8(0) << uint8(0);   // new string in 1.12
@@ -271 +253 @@
                         return;
 
-                LocalizedItemPage * lpi = (language>0) ? sLocalizationMgr.GetLocalizedItemPage(pageid,language):NULL;
                 data.Clear();
                 data << pageid;
-                if(lpi)
-                        data.Write((uint8*)lpi->Text, strlen(lpi->Text) + 1);
-                else
-                        data.Write((uint8*)page->text, strlen(page->text) + 1);
+                data.Write((uint8*)page->text, strlen(page->text) + 1);
 
                 data << page->next_page;
@@ -302 +280 @@
         else
         {
-                LocalizedItem * li = (language>0) ? sLocalizationMgr.GetLocalizedItem(itemid, language) : NULL;
-                if(li)
-                        reply << li->Name;
-                else
-                        reply << proto->Name1;
+                reply << proto->Name1;
         }
         SendPacket(&reply);