@@ -1019,6 +1019,8 @@ valid examples: ItemPrototype const* linkedItem; Quest const* linkedQuest; SpellEntry const *linkedSpell; + ItemRandomPropertiesEntry const* itemProperty; + ItemRandomSuffixEntry const* itemSuffix; while(!reader.eof()) { @@ -1027,6 +1029,8 @@ valid examples: linkedItem = NULL; linkedQuest = NULL; linkedSpell = NULL; + itemProperty = NULL; + itemSuffix = NULL; reader.ignore(255, '|'); } @@ -1143,10 +1147,48 @@ valid examples: return false; } - char c = reader.peek(); + // the itementry is followed by several integers which describe an instance of this item + + // position relative after itemEntry + const uint8 randomPropertyPosition = 6; + + int32 propertyId = 0; + bool negativeNumber = false; + char c; + for(uint8 i=0; i<randomPropertyPosition; ++i) + { + propertyId = 0; + negativeNumber = false; + while((c = reader.get())!=':') + { + if(c >='0' && c<='9') + { + propertyId*=10; + propertyId += c-'0'; + } else if(c == '-') + negativeNumber = true; + else + return false; + } + } + if (negativeNumber) + propertyId *= -1; + + if (propertyId > 0) + { + itemProperty = sItemRandomPropertiesStore.LookupEntry(propertyId); + if (!itemProperty) + return false; + } + else if(propertyId < 0) + { + itemSuffix = sItemRandomSuffixStore.LookupEntry(-propertyId); + if (!itemSuffix) + return false; + } - // ignore enchants etc. - while(c >='0' && c <='9' || c==':') + // ignore other integers + while ((c >= '0' && c <= '9') || c== ':') { reader.ignore(1); c = reader.peek(); @@ -1351,22 +1393,34 @@ valid examples: } else if(linkedItem) { - if (strcmp(linkedItem->Name1, buffer) != 0) + char* const* suffix = itemSuffix?itemSuffix->nameSuffix:(itemProperty?itemProperty->nameSuffix:NULL); + + std::string expectedName = std::string(linkedItem->Name1); + if (suffix) { - ItemLocale const *il = objmgr.GetItemLocale(linkedItem->ItemId); + expectedName += " "; + expectedName += suffix[LOCALE_enUS]; + } - if (!il) - { -#ifdef MANGOS_DEBUG - sLog.outBasic("ChatHandler::isValidChatMessage linked item name doesn't is wrong and there is no localization"); -#endif - return false; - } + if (expectedName != buffer) + { + ItemLocale const *il = objmgr.GetItemLocale(linkedItem->ItemId); bool foundName = false; - for(uint8 i=0; i<il->Name.size(); ++i) + for(uint8 i=LOCALE_koKR; i<MAX_LOCALE; ++i) { - if (il->Name[i] == buffer) + int8 dbIndex = objmgr.GetIndexForLocale(LocaleConstant(i)); + if (dbIndex == -1 || il == NULL || dbIndex >= il->Name.size()) + // using strange database/client combinations can lead to this case + expectedName = linkedItem->Name1; + else + expectedName = il->Name[dbIndex]; + if (suffix) + { + expectedName += " "; + expectedName += suffix[i]; + } + if ( expectedName == buffer) { foundName = true; break; @@ -2075,4 +2129,4 @@ LocaleConstant CliHandler::GetSessionDbcLocale() const int CliHandler::GetSessionDbLocaleIndex() const { return objmgr.GetDBCLocaleIndex(); -} \ No newline at end of file +} src/game/Chat.cpp @@ -431,14 +431,14 @@ struct ItemRandomPropertiesEntry //char* internalName // 1 unused uint32 enchant_id[3]; // 2-4 // 5-6 unused, 0 only values, reserved for additional enchantments? - //char* nameSuffix[16] // 7-22, unused + char* nameSuffix[16]; // 7-22 // 23 nameSufix flags, unused }; struct ItemRandomSuffixEntry { uint32 ID; // 0 - //char* name[16] // 1-16 unused + char* nameSuffix[16]; // 1-16 // 17, name flags, unused // 18 unused uint32 enchant_id[3]; // 19-21 src/game/DBCStructure.h @@ -58,8 +58,8 @@ const char ItemBagFamilyfmt[]="nxxxxxxxxxxxxxxxxx"; //const char ItemDisplayTemplateEntryfmt[]="nxxxxxxxxxxixxxxxxxxxxx"; //const char ItemCondExtCostsEntryfmt[]="xiii"; const char ItemExtendedCostEntryfmt[]="niiiiiiiiiiiii"; -const char ItemRandomPropertiesfmt[]="nxiiixxxxxxxxxxxxxxxxxxx"; -const char ItemRandomSuffixfmt[]="nxxxxxxxxxxxxxxxxxxiiiiii"; +const char ItemRandomPropertiesfmt[]="nxiiixxssssssssssssssssx"; +const char ItemRandomSuffixfmt[]="nssssssssssssssssxxiiiiii"; const char ItemSetEntryfmt[]="dssssssssssssssssxxxxxxxxxxxxxxxxxxiiiiiiiiiiiiiiiiii"; const char LockEntryfmt[]="niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx"; const char MailTemplateEntryfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; src/game/DBCfmt.h 491160c9a45d3c8c71390c239dd2b98909d7f663 arrai array.of.intellect@gmail.com http://github.com/mangos/mangos/commit/41cc487576d6c520136698a5294899837f91b2e6 41cc487576d6c520136698a5294899837f91b2e6 2009-10-08T17:34:19-07:00 2009-10-08T17:18:12-07:00 Consider random enchants in chatmessage validation (backported from commit 30908e0) 778e4744fd1f6ee8d86cc7cfbd8b0a4210192a42 arrai array.of.intellect@gmail.com