Mercurial > mm7
comparison mm7_3.cpp @ 502:dd5124185551
Слияние
author | Ritor1 |
---|---|
date | Fri, 01 Mar 2013 17:38:04 +0600 |
parents | 6fa3ff8ef729 90fdb47bfcba |
children | 7c86030324a5 |
comparison
equal
deleted
inserted
replaced
501:6fa3ff8ef729 | 502:dd5124185551 |
---|---|
13955 { | 13955 { |
13956 case 2: | 13956 case 2: |
13957 { | 13957 { |
13958 if ( !_strnicmp(test_string, "wea", 3) ) | 13958 if ( !_strnicmp(test_string, "wea", 3) ) |
13959 { | 13959 { |
13960 p2DEvents[i].uType = 1; | 13960 p2DEvents[i].uType = BildingType_WeaponShop; |
13961 break; | 13961 break; |
13962 } | 13962 } |
13963 if ( !_strnicmp(test_string, "arm", 3) ) | 13963 if ( !_strnicmp(test_string, "arm", 3) ) |
13964 { | 13964 { |
13965 p2DEvents[i].uType = 2; | 13965 p2DEvents[i].uType = BildingType_ArmorShop; |
13966 break; | 13966 break; |
13967 } | 13967 } |
13968 if ( !_strnicmp(test_string, "mag", 3) ) | 13968 if ( !_strnicmp(test_string, "mag", 3) ) |
13969 { | 13969 { |
13970 p2DEvents[i].uType = 3; | 13970 p2DEvents[i].uType = BildingType_MagicShop; |
13971 break; | 13971 break; |
13972 } | 13972 } |
13973 if ( !_strnicmp(test_string, "alc", 3) ) | 13973 if ( !_strnicmp(test_string, "alc", 3) ) |
13974 { | 13974 { |
13975 p2DEvents[i].uType = 4; | 13975 p2DEvents[i].uType = BildingType_AlchemistShop; |
13976 break; | 13976 break; |
13977 } | 13977 } |
13978 if ( !_strnicmp(test_string, "sta", 3) ) | 13978 if ( !_strnicmp(test_string, "sta", 3) ) |
13979 { | 13979 { |
13980 p2DEvents[i].uType = 27; | 13980 p2DEvents[i].uType = BildingType_Stables; |
13981 break; | 13981 break; |
13982 } | 13982 } |
13983 if ( !_strnicmp(test_string, "boa", 3) ) | 13983 if ( !_strnicmp(test_string, "boa", 3) ) |
13984 { | 13984 { |
13985 p2DEvents[i].uType = 28; | 13985 p2DEvents[i].uType = BildingType_Boats; |
13986 break; | 13986 break; |
13987 } | 13987 } |
13988 if ( !_strnicmp(test_string, "tem", 3) ) | 13988 if ( !_strnicmp(test_string, "tem", 3) ) |
13989 { | 13989 { |
13990 p2DEvents[i].uType = 23; | 13990 p2DEvents[i].uType = BildingType_Temple; |
13991 break; | 13991 break; |
13992 } | 13992 } |
13993 if ( !_strnicmp(test_string, "tra", 3) ) | 13993 if ( !_strnicmp(test_string, "tra", 3) ) |
13994 { | 13994 { |
13995 p2DEvents[i].uType = 30; | 13995 p2DEvents[i].uType = BildingType_Training; |
13996 break; | 13996 break; |
13997 } | 13997 } |
13998 if ( !_strnicmp(test_string, "tow", 3) ) | 13998 if ( !_strnicmp(test_string, "tow", 3) ) |
13999 { | 13999 { |
14000 p2DEvents[i].uType = 17; | 14000 p2DEvents[i].uType = BildingType_TownHall; |
14001 break; | 14001 break; |
14002 } | 14002 } |
14003 | 14003 |
14004 if ( !_strnicmp(test_string, "tav", 3) ) | 14004 if ( !_strnicmp(test_string, "tav", 3) ) |
14005 { | 14005 { |
14006 p2DEvents[i].uType = 21; | 14006 p2DEvents[i].uType = BildingType_Tavern; |
14007 break; | 14007 break; |
14008 } | 14008 } |
14009 if ( !_strnicmp(test_string, "ban", 3) ) | 14009 if ( !_strnicmp(test_string, "ban", 3) ) |
14010 { | 14010 { |
14011 p2DEvents[i].uType = 22; | 14011 p2DEvents[i].uType = BildingType_Bank; |
14012 break; | 14012 break; |
14013 } | 14013 } |
14014 if ( !_strnicmp(test_string, "fir", 3) ) | 14014 if ( !_strnicmp(test_string, "fir", 3) ) |
14015 { | 14015 { |
14016 p2DEvents[i].uType = 5; | 14016 p2DEvents[i].uType = BildingType_FireGuild; |
14017 break; | 14017 break; |
14018 } | 14018 } |
14019 if ( !_strnicmp(test_string, "air", 3) ) | 14019 if ( !_strnicmp(test_string, "air", 3) ) |
14020 { | 14020 { |
14021 p2DEvents[i].uType = 6; | 14021 p2DEvents[i].uType = BildingType_AirGuild; |
14022 break; | 14022 break; |
14023 } | 14023 } |
14024 if ( !_strnicmp(test_string, "wat", 3) ) | 14024 if ( !_strnicmp(test_string, "wat", 3) ) |
14025 { | 14025 { |
14026 p2DEvents[i].uType = 7; | 14026 p2DEvents[i].uType = BildingType_WaterGuild; |
14027 break; | 14027 break; |
14028 } | 14028 } |
14029 if ( !_strnicmp(test_string, "ear", 3) ) | 14029 if ( !_strnicmp(test_string, "ear", 3) ) |
14030 { | 14030 { |
14031 p2DEvents[i].uType = 8; | 14031 p2DEvents[i].uType = BildingType_EarthGuild; |
14032 break; | 14032 break; |
14033 } | 14033 } |
14034 if ( !_strnicmp(test_string, "spi", 3) ) | 14034 if ( !_strnicmp(test_string, "spi", 3) ) |
14035 { | 14035 { |
14036 p2DEvents[i].uType = 9; | 14036 p2DEvents[i].uType = BildingType_SpiritGuild; |
14037 break; | 14037 break; |
14038 } | 14038 } |
14039 if ( !_strnicmp(test_string, "min", 3) ) | 14039 if ( !_strnicmp(test_string, "min", 3) ) |
14040 { | 14040 { |
14041 p2DEvents[i].uType = 10; | 14041 p2DEvents[i].uType = BildingType_MindGuild; |
14042 break; | 14042 break; |
14043 } | 14043 } |
14044 if ( !_strnicmp(test_string, "bod", 3) ) | 14044 if ( !_strnicmp(test_string, "bod", 3) ) |
14045 { | 14045 { |
14046 p2DEvents[i].uType = 11; | 14046 p2DEvents[i].uType = BildingType_BodyGuild; |
14047 break; | 14047 break; |
14048 } | 14048 } |
14049 if ( !_strnicmp(test_string, "lig", 3) ) | 14049 if ( !_strnicmp(test_string, "lig", 3) ) |
14050 { | 14050 { |
14051 p2DEvents[i].uType = 12; | 14051 p2DEvents[i].uType = BildingType_LightGuild; |
14052 break; | 14052 break; |
14053 } | 14053 } |
14054 if ( !_strnicmp(test_string, "dar", 3) ) | 14054 if ( !_strnicmp(test_string, "dar", 3) ) |
14055 { | 14055 { |
14056 p2DEvents[i].uType = 13; | 14056 p2DEvents[i].uType = BildingType_DarkGuild; |
14057 break; | 14057 break; |
14058 } | 14058 } |
14059 if ( !_strnicmp(test_string, "ele", 3) ) | 14059 if ( !_strnicmp(test_string, "ele", 3) ) |
14060 { | 14060 { |
14061 p2DEvents[i].uType = 14; | 14061 p2DEvents[i].uType = BildingType_14; |
14062 break; | 14062 break; |
14063 } | 14063 } |
14064 if ( !_strnicmp(test_string, "sel", 3) ) | 14064 if ( !_strnicmp(test_string, "sel", 3) ) |
14065 { | 14065 { |
14066 p2DEvents[i].uType = 15; | 14066 p2DEvents[i].uType = BildingType_15; |
14067 break; | 14067 break; |
14068 } | 14068 } |
14069 if ( !_strnicmp(test_string, "mir", 3) ) | 14069 if ( !_strnicmp(test_string, "mir", 3) ) |
14070 { | 14070 { |
14071 p2DEvents[i].uType = 16; | 14071 p2DEvents[i].uType = BildingType_16; |
14072 break; | 14072 break; |
14073 } | 14073 } |
14074 if ( !_strnicmp(test_string, "mer", 3) ) | 14074 if ( !_strnicmp(test_string, "mer", 3) ) |
14075 { | 14075 { |
14076 p2DEvents[i].uType = 17; | 14076 p2DEvents[i].uType = BildingType_TownHall; |
14077 break; | 14077 break; |
14078 } | 14078 } |
14079 p2DEvents[i].uType = 18; | 14079 p2DEvents[i].uType = BildingType_18; |
14080 } | 14080 } |
14081 break; | 14081 break; |
14082 | 14082 |
14083 case 4: | 14083 case 4: |
14084 p2DEvents[i].uAnimationID = atoi(test_string); | 14084 p2DEvents[i].uAnimationID = atoi(test_string); |