Mercurial > mm7
comparison mm7_data.cpp @ 1219:85bdbaa539f4
Merge
author | Gloval |
---|---|
date | Sun, 09 Jun 2013 21:42:01 +0400 |
parents | eb687c8529ee 68655becb94b |
children | 6279bf7a4d1a |
comparison
equal
deleted
inserted
replaced
1218:eb687c8529ee | 1219:85bdbaa539f4 |
---|---|
641 {2, 1, 1, 1, 2, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 2, 2, 1, 2, 1, 2, 2},//45 | 641 {2, 1, 1, 1, 2, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 2, 2, 1, 2, 1, 2, 2},//45 |
642 {1, 1, 1, 2, 2, 2, 1, 1, 2, 1, 2, 1, 2, 2, 2, 2, 2, 1, 1, 2, 1, 2, 1, 2, 2},//46 | 642 {1, 1, 1, 2, 2, 2, 1, 1, 2, 1, 2, 1, 2, 2, 2, 2, 2, 1, 1, 2, 1, 2, 1, 2, 2},//46 |
643 {1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1},//47 | 643 {1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1},//47 |
644 {1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1},//48 | 644 {1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1},//48 |
645 }}; | 645 }}; |
646 unsigned char SoundSetAction[110][8] = // 4ED3D8 | 646 std::array<std::array<unsigned char, 8>, 110> SoundSetAction = // 4ED3D8 |
647 { | 647 {{ |
648 { 0, 0, 0, 0, 0, 0, 0, 0}, | 648 { 0, 0, 0, 0, 0, 0, 0, 0}, |
649 {38, 0, 0, 37, 38, 45, 0, 0}, | 649 {38, 0, 0, 37, 38, 45, 0, 0}, |
650 {37, 0, 0, 47, 53, 0, 0, 0}, | 650 {37, 0, 0, 47, 53, 0, 0, 0}, |
651 { 2, 0, 0, 25, 0, 0, 0, 0}, | 651 { 2, 0, 0, 25, 0, 0, 0, 0}, |
652 { 1, 0, 0, 47, 0, 0, 0, 0}, | 652 { 1, 0, 0, 47, 0, 0, 0, 0}, |
753 {11, 0, 0, 47, 0, 0, 0, 0}, | 753 {11, 0, 0, 47, 0, 0, 0, 0}, |
754 {12, 0, 0, 43, 48, 0, 0, 0}, | 754 {12, 0, 0, 43, 48, 0, 0, 0}, |
755 {39, 0, 0, 48, 0, 0, 0, 0}, | 755 {39, 0, 0, 48, 0, 0, 0, 0}, |
756 {14, 0, 0, 48, 0, 0, 0, 0}, | 756 {14, 0, 0, 48, 0, 0, 0, 0}, |
757 {17, 0, 0, 0, 0, 0, 0, 0} | 757 {17, 0, 0, 0, 0, 0, 0, 0} |
758 }; | 758 }}; |
759 std::array<__int16, 4> pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing = {34, 149, 264, 379}; | 759 std::array<__int16, 4> pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing = {34, 149, 264, 379}; |
760 std::array< std::array<char, 37>, 36> byte_4ED970_skill_learn_ability_by_class_table = | 760 std::array< std::array<char, 37>, 36> byte_4ED970_skill_learn_ability_by_class_table = |
761 {{ | 761 {{ |
762 2, 3, 2, 3, 3, 2, 3, 4, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 0, 2, 1, 0, 1, 2, 2, 0, 3, 0, 0, 1,//Knight | 762 2, 3, 2, 3, 3, 2, 3, 4, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 0, 2, 1, 0, 1, 2, 2, 0, 3, 0, 0, 1,//Knight |
763 2, 3, 2, 3, 3, 2, 3, 4, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 0, 2, 1, 0, 1, 2, 2, 0, 3, 0, 0, 1, | 763 2, 3, 2, 3, 3, 2, 3, 4, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 0, 2, 1, 0, 1, 2, 2, 0, 3, 0, 0, 1, |