Mercurial > mm7
diff mm7_data.cpp @ 1219:85bdbaa539f4
Merge
author | Gloval |
---|---|
date | Sun, 09 Jun 2013 21:42:01 +0400 |
parents | eb687c8529ee 68655becb94b |
children | 6279bf7a4d1a |
line wrap: on
line diff
--- a/mm7_data.cpp Sun Jun 09 21:40:17 2013 +0400 +++ b/mm7_data.cpp Sun Jun 09 21:42:01 2013 +0400 @@ -643,8 +643,8 @@ {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 {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 }}; -unsigned char SoundSetAction[110][8] = // 4ED3D8 -{ +std::array<std::array<unsigned char, 8>, 110> SoundSetAction = // 4ED3D8 +{{ { 0, 0, 0, 0, 0, 0, 0, 0}, {38, 0, 0, 37, 38, 45, 0, 0}, {37, 0, 0, 47, 53, 0, 0, 0}, @@ -755,7 +755,7 @@ {39, 0, 0, 48, 0, 0, 0, 0}, {14, 0, 0, 48, 0, 0, 0, 0}, {17, 0, 0, 0, 0, 0, 0, 0} -}; +}}; std::array<__int16, 4> pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing = {34, 149, 264, 379}; std::array< std::array<char, 37>, 36> byte_4ED970_skill_learn_ability_by_class_table = {{