mm7: mm7_4.cpp comparison

comparison mm7_4.cpp @ 720:05f7a11f4f20

Слияние

author	Ritor1
date	Tue, 19 Mar 2013 23:41:29 +0600
parents	a5ee769b02c6 ef4d646d738d
children	f39d5902c85a

comparison

equal deleted inserted replaced

-:d394cc892106
+:05f7a11f4f20
 Abortf("TileTable::load - Unable to open file: %s.");
 v4 = 0;
 for ( i = v3; fgets(&Buf, 490, i); i = File )
 {
 *strchr(&Buf, 10) = 0;
-memcpy(&v84, texture_frame_table_txt_parser(&Buf, &v85), sizeof(v84));
+memcpy(&v84, txt_file_frametable_parser(&Buf, &v85), sizeof(v84));
-if ( v84.field_0 && *v84.pProperties[0] != 47 )
+if ( v84.uPropCount && *v84.pProperties[0] != 47 )
 ++v4;
 }
 v2->uNumTiles = v4;
 v5 = pAllocator->AllocNamedChunk(v2->pTiles, 26 * v4, "Tile Descrip");
 v2->pTiles = (TileDesc *)v5;
 if ( fgets(&Buf, 490, File) )
 {
 while ( 1 )
 {
 *strchr(&Buf, 10) = 0;
-memcpy(&v84, texture_frame_table_txt_parser(&Buf, &v85), sizeof(v84));
+memcpy(&v84, txt_file_frametable_parser(&Buf, &v85), sizeof(v84));
-if ( v84.field_0 )
+if ( v84.uPropCount )
 {
 if ( *v84.pProperties[0] != 47 )
 break;
 }
 LABEL_173:
 v2->pTiles[v2->uNumTiles].uAttributes = 0;
 if ( !_strcmpi(v35, "TTsect_NULL") )
 {
 LOBYTE(v2->pTiles[v2->uNumTiles].uSection) = -1;
 LABEL_152:
-for ( j = 5; j < v84.field_0; ++j )
+for ( j = 5; j < v84.uPropCount; ++j )
 {
 v72 = v84.pProperties[j];
 if ( _strcmpi(v84.pProperties[j], "TTattr_Burn") )
 {
 if ( _strcmpi(v72, "TTattr_Water") )
 if ( fgets(&Buf, 490, v3) )
 {
 do
 {
 *strchr(&Buf, 10) = 0;
-memcpy(&v24, texture_frame_table_txt_parser(&Buf, &v23), sizeof(v24));
+memcpy(&v24, txt_file_frametable_parser(&Buf, &v23), sizeof(v24));
-if ( v24.field_0 && *v24.pProperties[0] != 47 )
+if ( v24.uPropCount && *v24.pProperties[0] != 47 )
 {
-if ( v24.field_0 < 3 )
+if ( v24.uPropCount < 3 )
 Abortf("PlayerFrameTable::load, too few arguments, %s line %i.", Args, v26);
 ++v25;
 }
 ++v26;
 }
 v2->uNumFrames = 0;
 fseek(v6, 0, 0);
 for ( i = fgets(&Buf, 490, File); i; i = fgets(&Buf, 490, File) )
 {
 *strchr(&Buf, 10) = 0;
-memcpy(&v24, texture_frame_table_txt_parser(&Buf, &v23), sizeof(v24));
+memcpy(&v24, txt_file_frametable_parser(&Buf, &v23), sizeof(v24));
-if ( v24.field_0 && *v24.pProperties[0] != 47 )
+if ( v24.uPropCount && *v24.pProperties[0] != 47 )
 {
 v8 = atoi(v24.pProperties[0]);
 v9 = v24.pProperties[1];
 v2->pFrames[v2->uNumFrames].expression = (CHARACTER_EXPRESSION_ID)v8;
 v10 = atoi(v9);
 v11 = v24.pProperties[2];
 v2->pFrames[v2->uNumFrames].uTextureID = v10;
 v2->pFrames[v2->uNumFrames].uAnimTime = atoi(v11);
 v2->pFrames[v2->uNumFrames].uAnimLength = 0;
 v2->pFrames[v2->uNumFrames].uFlags = 0;
-for ( j = 3; j < v24.field_0; ++j )
+for ( j = 3; j < v24.uPropCount; ++j )
 {
 if ( !_strcmpi(v24.pProperties[j], "New") )
 {
 v13 = (int)&v2->pFrames[v2->uNumFrames].uFlags;
 *(char *)v13 |= 4u;
 {
 do
 {
 *strchr(&Buf, 10) = 0;
 memcpy(&v20, frame_table_txt_parser(&Buf, &v19), sizeof(v20));
-if ( v20.field_0 && *v20.pProperties[0] != 47 )
+if ( v20.uPropCount && *v20.pProperties[0] != 47 )
 {
-if ( v20.field_0 < 3 )
+if ( v20.uPropCount < 3 )
 Abortf("IconFrameTable::loadText, too few arguments, %s line %i.", Args, v22);
 ++v21;
 }
 ++v22;
 }
 fseek(v6, 0, 0);
 for ( i = fgets(&Buf, 490, File); i; i = fgets(&Buf, 490, File) )
 {
 *strchr(&Buf, 10) = 0;
 memcpy(&v20, frame_table_txt_parser(&Buf, &v19), sizeof(v20));
-if ( v20.field_0 && *v20.pProperties[0] != 47 )
+if ( v20.uPropCount && *v20.pProperties[0] != 47 )
 {
 strcpy(v2->pIcons[v2->uNumIcons].pAnimationName, v20.pProperties[0]);
 strcpy(v2->pIcons[v2->uNumIcons].pTextureName, v20.pProperties[1]);
 v8 = v20.pProperties[2];
 v2->pIcons[v2->uNumIcons].uFlags = 0;
 int v7; // edx@9
 int v8; // edx@10
 unsigned __int8 v9; // zf@16
 char v10; // sf@16
 unsigned __int8 v11; // of@16
+bool test;
 auto a2 = _2da_idx;
 //v2 = p2DEvents_minus1___00[26 * a2];
 v2 = p2DEvents[a2 - 1].uType;
 v3 = a1->uItemID;
 v4 = a1->uItemID;
 v5 = pItemsTable->pItems[v4].uEquipType;
 if ( (v2 != 4 || (signed int)v3 < 740 || (signed int)v3 > 771)
 && ((signed int)v3 >= 600 || (signed int)v3 >= 529 && (signed int)v3 <= 599) || a1->Stolen())
 return 0;
-v6 = v2 - 1;
+switch( p2DEvents[a2 - 1].uType )
-if ( !v6 )
+{
+	case BildingType_WeaponShop:
+		{
+		test = v5 <= 2;
+		break;
+		}
+	case BildingType_ArmorShop:
+		{
+		test = v5 >= 3;
+		break;
+		}
+	case BildingType_MagicShop:
+		{
+		test = pItemsTable->pItems[v4].uSkillType == 38 || v5 == 16;
+		break;
+		}
+	case BildingType_AlchemistShop:
+		{
+		__debugbreak(); // need to test
+		test = v5 == 13 || v5 == 14 || (v5 > 14 && !(v5 != 17 || (signed int)v3 < 740) && v3 != 771);
+		break;
+		}
+	default:
+		{
+		test = 0;
+		break;
+		}
+}
+return test;
+/*
+if ( p2DEvents[a2 - 1].uType == 1 )
 {
 v11 = __OFSUB__(v5, 2);
 v9 = v5 == 2;
 v10 = v5 - 2 < 0;
 goto LABEL_23;
 }
-v7 = v6 - 1;
+if ( p2DEvents[a2 - 1].uType > 2 )
-if ( v7 )
+{
-{
+if ( p2DEvents[a2 - 1].uType == 3 )
-v8 = v7 - 1;
-if ( !v8 )
 {
 if ( pItemsTable->pItems[v4].uSkillType != 38 )
 return v5 == 16;
 return 1;
 }
-if ( v8 != 1 || v5 < 13 )
+if ( p2DEvents[a2 - 1].uType != 4 || v5 < 13 )
 return 0;
-if ( v5 <= 14 )
+	if ( p2DEvents[a2 - 1].uType == 4)
-return 1;
+	{
-if ( v5 != 17 || (signed int)v3 < 740 )
+		if ( v5 < 13 )
-return 0;
+		  return 0;
-v11 = __OFSUB__(v3, 771);
+		if ( v5 <= 14 )
-v9 = v3 == 771;
+		  return 1;
-v10 = ((v3 - 771) & 0x80000000u) != 0;
+		if ( v5 != 17 || (signed int)v3 < 740 )
+		  return 0;
+		v11 = __OFSUB__(v3, 771);
+		v9 = v3 == 771;
+		v10 = ((v3 - 771) & 0x80000000u) != 0;
 LABEL_23:
-if ( !((unsigned __int8)(v10 ^ v11) | v9) )
+		if ( !((unsigned __int8)(v10 ^ v11) | v9) )
-return 0;
+		  return 0;
-return 1;
+		return 1;
-}
+	}
-if ( v5 >= 3 )
+}
-{
+if ( p2DEvents[a2 - 1].uType == 2 )
-v11 = __OFSUB__(v5, 9);
+{
-v9 = v5 == 9;
+	  if ( v5 >= 3 )
-v10 = v5 - 9 < 0;
+	  {
-goto LABEL_23;
+		v11 = __OFSUB__(v5, 9);
+		v9 = v5 == 9;
+		v10 = v5 - 9 < 0;
+		goto LABEL_23;
+	  }
 }
 return 0;
+*/
 }

Mercurial > mm7

comparison mm7_4.cpp @ 720:05f7a11f4f20