# HG changeset patch
# User Grumpy7
# Date 1370786642 -7200
# Node ID 8192b25d356cd4e9fe35d084e3593e3ed3e592b2
# Parent  4d90f0591add98b24aeffbaddb24954393255461
SoundSetAction to std::array

diff -r 4d90f0591add -r 8192b25d356c Player.cpp
--- a/Player.cpp	Sun Jun 09 01:41:55 2013 +0200
+++ b/Player.cpp	Sun Jun 09 16:04:02 2013 +0200
@@ -564,7 +564,7 @@
   //v4 = a2;//102
   v5 = 0;
   pSoundId = 0;
-  v6 = SoundSetAction[speech];//byte_4ED280 &byte_4ED3D8[4 * v4] ???
+  v6 = SoundSetAction[speech].data();//byte_4ED280 &byte_4ED3D8[4 * v4] ???
   if (uVoicesVolumeMultiplier)
   {
     v7 = 0;
diff -r 4d90f0591add -r 8192b25d356c mm7_data.cpp
--- a/mm7_data.cpp	Sun Jun 09 01:41:55 2013 +0200
+++ b/mm7_data.cpp	Sun Jun 09 16:04:02 2013 +0200
@@ -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 = 
 {{
diff -r 4d90f0591add -r 8192b25d356c mm7_data.h
--- a/mm7_data.h	Sun Jun 09 01:41:55 2013 +0200
+++ b/mm7_data.h	Sun Jun 09 16:04:02 2013 +0200
@@ -486,7 +486,7 @@
 extern std::array<const char*, 25> pPlayerPortraitsNames;
 
 extern std::array< std::array<unsigned char, 25>, 48> byte_4ECF08;
-extern unsigned char SoundSetAction[110][8]; // weak
+extern std::array<std::array<unsigned char, 8>, 110> SoundSetAction; // weak
 extern std::array<__int16, 4> pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing;
 extern std::array< std::array<char, 37>, 36> byte_4ED970_skill_learn_ability_by_class_table;
 extern std::array<int, 777> dword_4EDEA0; // weak