Mercurial > mm7

comparison mm7_3.cpp @ 1411:2423bc2af692

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
+InitializaDialogueOptions +InitializaDialogueOptions_Shops +InitializaDialogueOptions_Tavern
author Nomad
date Fri, 26 Jul 2013 23:35:34 +0200
parents 38df78aba732
children 182d58b2a34c b67a3e0d6fc3
comparison
equal deleted inserted replaced
1410:38df78aba732 1411:2423bc2af692
6523 { 6523 {
6524 case 2: 6524 case 2:
6525 { 6525 {
6526 if ( !_strnicmp(test_string, "wea", 3) ) 6526 if ( !_strnicmp(test_string, "wea", 3) )
6527 { 6527 {
6528 p2DEvents[i].uType = BildingType_WeaponShop; 6528 p2DEvents[i].uType = BuildingType_WeaponShop;
6529 break; 6529 break;
6530 } 6530 }
6531 if ( !_strnicmp(test_string, "arm", 3) ) 6531 if ( !_strnicmp(test_string, "arm", 3) )
6532 { 6532 {
6533 p2DEvents[i].uType = BildingType_ArmorShop; 6533 p2DEvents[i].uType = BuildingType_ArmorShop;
6534 break; 6534 break;
6535 } 6535 }
6536 if ( !_strnicmp(test_string, "mag", 3) ) 6536 if ( !_strnicmp(test_string, "mag", 3) )
6537 { 6537 {
6538 p2DEvents[i].uType = BildingType_MagicShop; 6538 p2DEvents[i].uType = BuildingType_MagicShop;
6539 break; 6539 break;
6540 } 6540 }
6541 if ( !_strnicmp(test_string, "alc", 3) ) 6541 if ( !_strnicmp(test_string, "alc", 3) )
6542 { 6542 {
6543 p2DEvents[i].uType = BildingType_AlchemistShop; 6543 p2DEvents[i].uType = BuildingType_AlchemistShop;
6544 break; 6544 break;
6545 } 6545 }
6546 if ( !_strnicmp(test_string, "sta", 3) ) 6546 if ( !_strnicmp(test_string, "sta", 3) )
6547 { 6547 {
6548 p2DEvents[i].uType = BildingType_Stables; 6548 p2DEvents[i].uType = BuildingType_Stables;
6549 break; 6549 break;
6550 } 6550 }
6551 if ( !_strnicmp(test_string, "boa", 3) ) 6551 if ( !_strnicmp(test_string, "boa", 3) )
6552 { 6552 {
6553 p2DEvents[i].uType = BildingType_Boats; 6553 p2DEvents[i].uType = BuildingType_Boats;
6554 break; 6554 break;
6555 } 6555 }
6556 if ( !_strnicmp(test_string, "tem", 3) ) 6556 if ( !_strnicmp(test_string, "tem", 3) )
6557 { 6557 {
6558 p2DEvents[i].uType = BildingType_Temple; 6558 p2DEvents[i].uType = BuildingType_Temple;
6559 break; 6559 break;
6560 } 6560 }
6561 if ( !_strnicmp(test_string, "tra", 3) ) 6561 if ( !_strnicmp(test_string, "tra", 3) )
6562 { 6562 {
6563 p2DEvents[i].uType = BildingType_Training; 6563 p2DEvents[i].uType = BuildingType_Training;
6564 break; 6564 break;
6565 } 6565 }
6566 if ( !_strnicmp(test_string, "tow", 3) ) 6566 if ( !_strnicmp(test_string, "tow", 3) )
6567 { 6567 {
6568 p2DEvents[i].uType = BildingType_TownHall; 6568 p2DEvents[i].uType = BuildingType_TownHall;
6569 break; 6569 break;
6570 } 6570 }
6571 6571
6572 if ( !_strnicmp(test_string, "tav", 3) ) 6572 if ( !_strnicmp(test_string, "tav", 3) )
6573 { 6573 {
6574 p2DEvents[i].uType = BildingType_Tavern; 6574 p2DEvents[i].uType = BuildingType_Tavern;
6575 break; 6575 break;
6576 } 6576 }
6577 if ( !_strnicmp(test_string, "ban", 3) ) 6577 if ( !_strnicmp(test_string, "ban", 3) )
6578 { 6578 {
6579 p2DEvents[i].uType = BildingType_Bank; 6579 p2DEvents[i].uType = BuildingType_Bank;
6580 break; 6580 break;
6581 } 6581 }
6582 if ( !_strnicmp(test_string, "fir", 3) ) 6582 if ( !_strnicmp(test_string, "fir", 3) )
6583 { 6583 {
6584 p2DEvents[i].uType = BildingType_FireGuild; 6584 p2DEvents[i].uType = BuildingType_FireGuild;
6585 break; 6585 break;
6586 } 6586 }
6587 if ( !_strnicmp(test_string, "air", 3) ) 6587 if ( !_strnicmp(test_string, "air", 3) )
6588 { 6588 {
6589 p2DEvents[i].uType = BildingType_AirGuild; 6589 p2DEvents[i].uType = BuildingType_AirGuild;
6590 break; 6590 break;
6591 } 6591 }
6592 if ( !_strnicmp(test_string, "wat", 3) ) 6592 if ( !_strnicmp(test_string, "wat", 3) )
6593 { 6593 {
6594 p2DEvents[i].uType = BildingType_WaterGuild; 6594 p2DEvents[i].uType = BuildingType_WaterGuild;
6595 break; 6595 break;
6596 } 6596 }
6597 if ( !_strnicmp(test_string, "ear", 3) ) 6597 if ( !_strnicmp(test_string, "ear", 3) )
6598 { 6598 {
6599 p2DEvents[i].uType = BildingType_EarthGuild; 6599 p2DEvents[i].uType = BuildingType_EarthGuild;
6600 break; 6600 break;
6601 } 6601 }
6602 if ( !_strnicmp(test_string, "spi", 3) ) 6602 if ( !_strnicmp(test_string, "spi", 3) )
6603 { 6603 {
6604 p2DEvents[i].uType = BildingType_SpiritGuild; 6604 p2DEvents[i].uType = BuildingType_SpiritGuild;
6605 break; 6605 break;
6606 } 6606 }
6607 if ( !_strnicmp(test_string, "min", 3) ) 6607 if ( !_strnicmp(test_string, "min", 3) )
6608 { 6608 {
6609 p2DEvents[i].uType = BildingType_MindGuild; 6609 p2DEvents[i].uType = BuildingType_MindGuild;
6610 break; 6610 break;
6611 } 6611 }
6612 if ( !_strnicmp(test_string, "bod", 3) ) 6612 if ( !_strnicmp(test_string, "bod", 3) )
6613 { 6613 {
6614 p2DEvents[i].uType = BildingType_BodyGuild; 6614 p2DEvents[i].uType = BuildingType_BodyGuild;
6615 break; 6615 break;
6616 } 6616 }
6617 if ( !_strnicmp(test_string, "lig", 3) ) 6617 if ( !_strnicmp(test_string, "lig", 3) )
6618 { 6618 {
6619 p2DEvents[i].uType = BildingType_LightGuild; 6619 p2DEvents[i].uType = BuildingType_LightGuild;
6620 break; 6620 break;
6621 } 6621 }
6622 if ( !_strnicmp(test_string, "dar", 3) ) 6622 if ( !_strnicmp(test_string, "dar", 3) )
6623 { 6623 {
6624 p2DEvents[i].uType = BildingType_DarkGuild; 6624 p2DEvents[i].uType = BuildingType_DarkGuild;
6625 break; 6625 break;
6626 } 6626 }
6627 if ( !_strnicmp(test_string, "ele", 3) ) 6627 if ( !_strnicmp(test_string, "ele", 3) )
6628 { 6628 {
6629 p2DEvents[i].uType = BildingType_14; 6629 p2DEvents[i].uType = BuildingType_14;
6630 break; 6630 break;
6631 } 6631 }
6632 if ( !_strnicmp(test_string, "sel", 3) ) 6632 if ( !_strnicmp(test_string, "sel", 3) )
6633 { 6633 {
6634 p2DEvents[i].uType = BildingType_15; 6634 p2DEvents[i].uType = BuildingType_15;
6635 break; 6635 break;
6636 } 6636 }
6637 if ( !_strnicmp(test_string, "mir", 3) ) 6637 if ( !_strnicmp(test_string, "mir", 3) )
6638 { 6638 {
6639 p2DEvents[i].uType = BildingType_16; 6639 p2DEvents[i].uType = BuildingType_16;
6640 break; 6640 break;
6641 } 6641 }
6642 if ( !_strnicmp(test_string, "mer", 3) ) 6642 if ( !_strnicmp(test_string, "mer", 3) )
6643 { 6643 {
6644 p2DEvents[i].uType = BildingType_TownHall; 6644 p2DEvents[i].uType = BuildingType_TownHall;
6645 break; 6645 break;
6646 } 6646 }
6647 p2DEvents[i].uType = BildingType_18; 6647 p2DEvents[i].uType = BuildingType_18;
6648 } 6648 }
6649 break; 6649 break;
6650 6650
6651 case 4: 6651 case 4:
6652 p2DEvents[i].uAnimationID = atoi(test_string); 6652 p2DEvents[i].uAnimationID = atoi(test_string);
6931 } 6931 }
6932 } 6932 }
6933 } 6933 }
6934 6934
6935 //----- (00444360) -------------------------------------------------------- 6935 //----- (00444360) --------------------------------------------------------
6936 void __thiscall Level_LoadEvtAndStr(const char *pLevelName) 6936 void Level_LoadEvtAndStr(const char *pLevelName)
6937 { 6937 {
6938 char pContainerName[120]; // [sp+8h] [bp-98h]@1 6938 char pContainerName[120]; // [sp+8h] [bp-98h]@1
6939 6939
6940 sprintf(pContainerName, "%s.evt", pLevelName); 6940 sprintf(pContainerName, "%s.evt", pLevelName);
6941 uLevelEVT_Size = LoadEventsToBuffer(pContainerName, pLevelEVT.data(), 0x2400u); 6941 uLevelEVT_Size = LoadEventsToBuffer(pContainerName, pLevelEVT.data(), 0x2400u);
7029 } 7029 }
7030 return result; 7030 return result;
7031 } 7031 }
7032 7032
7033 //----- (00444D80) -------------------------------------------------------- 7033 //----- (00444D80) --------------------------------------------------------
7034 signed int __cdecl GetTravelTime() 7034 int GetTravelTime()
7035 { 7035 {
7036 signed int v0; // esi@1 7036 signed int v0; // esi@1
7037 7037
7038 v0 = uDefaultTravelTime_ByFoot; 7038 v0 = uDefaultTravelTime_ByFoot;
7039 if ( CheckHiredNPCSpeciality(Guide) ) 7039 if ( CheckHiredNPCSpeciality(Guide) )