mm7: Items.cpp comparison

comparison Items.cpp @ 1231:182b910c528d

Слияние

author	Ritor1
date	Sun, 09 Jun 2013 10:18:51 +0600
parents	42b41aaecd87 8c02e6f74b29
children	5450af4f57ef

comparison

equal deleted inserted replaced

-:513a7893aa29
+:182b910c528d
 	unsigned __int16 treasure_level;
 	unsigned __int16 item_class[4];
 	};
-const char uItemsAmountPerShopType[5]={ 0, 6, 8, 12, 12};
+std::array<const char, 5> uItemsAmountPerShopType={ 0, 6, 8, 12, 12};
 const ITEM_VARIATION shopWeap_variation_ord[15] ={
 	{ 0, { 0, 0, 0, 0 }},
 	{ 1, { 23, 27, 20, 20 }},
 	{ 1, { 23, 24, 28, 20 }},
 const unsigned __int16 shopMagicSpc_treasure_lvl[14]  =  {0, 2, 2, 3, 3, 5, 5, 4, 3, 3, 3, 3, 3, 3};
 const unsigned __int16 shopAlchSpc_treasure_lvl[13]   =  {0, 2, 2, 3, 3, 4, 4, 5, 5, 3, 2, 2, 2};
-char byte_4E8168[7][14]={  //byte_4E8178
+std::array< std::array<char, 14>, 7> byte_4E8168={{  //byte_4E8178
 { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
 { 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},
 { 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
 { 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
 { 2, 2, 2, 2, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5},
 { 2, 2, 2, 2, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6},
-{ 2, 2, 2, 2, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}};
+{ 2, 2, 2, 2, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}}};
 int  sub_4BE571(int a1, int *a2, int a3, int a4);
 ItemGen *ptr_50C9A4;
 const char *format_str;
 equip_type = pItemsTable->pItems[uItemID].uEquipType;
 if ( (equip_type == EQUIP_REAGENT) || (equip_type == EQUIP_POTION) || (equip_type == EQUIP_GOLD) )
 {
-sprintf(item__getname_buffer, "%s", pItemsTable->pItems[uItemID].pName);
+sprintf(item__getname_buffer.data(), "%s", pItemsTable->pItems[uItemID].pName);
-return item__getname_buffer;
+return item__getname_buffer.data();
 }
-sprintf(item__getname_buffer, "%s", pItemsTable->pItems[uItemID].pName);
+sprintf(item__getname_buffer.data(), "%s", pItemsTable->pItems[uItemID].pName);
 if ( uItemID == ITEM_LICH_JAR )  //Lich Jar
 {
 if ( (uHolderPlayer >0 )&& (uHolderPlayer <= 4) )
 {
 player_name = pPlayers[uHolderPlayer]->pName;
 strlen(player_name);
 if ( player_name[strlen(player_name) - 1] == 's' )
 format_str = pGlobalTXT_LocalizationStrings[655]; //"%s' Jar"
 else
 format_str = pGlobalTXT_LocalizationStrings[654]; //"%s's Jar"
-sprintf(item__getname_buffer, format_str, pPlayers[uHolderPlayer]->pName);
+		sprintf(item__getname_buffer.data(), format_str, pPlayers[uHolderPlayer]->pName);
-		return item__getname_buffer;
+		return item__getname_buffer.data();
 }
 }
 if ( !pItemsTable->IsMaterialNonCommon(this) )
 {
 if ( uEnchantmentType )
 {
-strcat(item__getname_buffer, " ");
+strcat(item__getname_buffer.data(), " ");
 nameModificator = pItemsTable->pEnchantments[uEnchantmentType-1].pOfName;
 }
 else
 {
 if ( !uSpecEnchantmentType )
-return item__getname_buffer;
+return item__getname_buffer.data();
 if ( uSpecEnchantmentType == 16 //Drain Hit Points from target.
 || uSpecEnchantmentType == 39 //Double damage vs Demons.
 || uSpecEnchantmentType == 40 //Double damage vs Dragons
 || uSpecEnchantmentType == 45 //+5 Speed and Accuracy
 || uSpecEnchantmentType == 56 //+5 Might and Endurance.
 || uSpecEnchantmentType == 63 //Double Damage vs. Elves.
 || uSpecEnchantmentType == 64 //Double Damage vs. Undead.
 || uSpecEnchantmentType == 67 //Adds 5 points of Body damage and +2 Disarm skill.
 || uSpecEnchantmentType == 68 ) //Adds 6-8 points of Cold damage and +5 Armor Class.
 {  //enchantment and name positions inverted!
-sprintf( item__getname_buffer, "%s %s",
+sprintf( item__getname_buffer.data(), "%s %s",
 				  pItemsTable->pSpecialEnchantments[uSpecEnchantmentType-1].pNameAdd,
 				  pItemsTable->pItems[uItemID].pName);
-return item__getname_buffer;
+return item__getname_buffer.data();
 }
-strcat(item__getname_buffer, " ");
+strcat(item__getname_buffer.data(), " ");
 	  nameModificator = pItemsTable->pSpecialEnchantments[uSpecEnchantmentType-1].pNameAdd;
 }
-strcat(item__getname_buffer, nameModificator);
+strcat(item__getname_buffer.data(), nameModificator);
 }
-return item__getname_buffer;
+return item__getname_buffer.data();
 }
 //----- (00456620) --------------------------------------------------------
 void ItemsTable::GenerateItem(int treasure_level, unsigned int uTreasureType, ItemGen *out_item)
 Chest *v21; // [sp+1Ch] [bp-Ch]@1
 int v22; // [sp+20h] [bp-8h]@26
 signed int v23; // [sp+24h] [bp-4h]@2
 v18 = rand() % 100;  //main random
-v0 = pMapStats->GetMapInfo(pCurrentMapName);
+v0 = pMapStats->GetMapInfo(pCurrentMapName.data());
 //	v1 = pChests;
 v2 = &pMapStats->pInfos[v0];
 //v21 = pChests;
 //v20 = &pMapStats->pInfos[v0];
 for(int i=1; i<20;++i)

Mercurial > mm7

comparison Items.cpp @ 1231:182b910c528d