Mercurial > mm7

diff mm7_data.cpp @ 1207:96a81634669e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arrays to std::arrays phase 3 - finishing global arrays undone changes in render.h, because framerate dropped by half
author Grumpy7
date Sun, 09 Jun 2013 01:30:36 +0200
parents ab6560001f5b
children decc0dd6e4ba 8192b25d356c
line wrap: on
line diff
--- a/mm7_data.cpp	Sun Jun 09 01:10:49 2013 +0200
+++ b/mm7_data.cpp	Sun Jun 09 01:30:36 2013 +0200
@@ -64,8 +64,8 @@
 #include "stru159.h"
 
 #include "stru160.h"
-stru160 array_4EB8B8[66] =
-{
+std::array<stru160, 66> array_4EB8B8 =
+{{
   stru160( 0.0000000f,  0.0000000f,  1.0000000f),
   stru160( 0.0000000f,  0.3826830f,  0.9238799f),
   stru160( 0.3826830f,  0.0000000f,  0.9238799f),
@@ -132,10 +132,10 @@
   stru160(-0.4082480f,  0.4082480f, -0.8164970f),
   stru160(-0.8164970f,  0.4082480f, -0.4082480f),
   stru160(-0.4082480f,  0.8164970f, -0.4082480f)
-};
-stru160 array_4EBBD0[128];
-__int32 array_4EBBD0_x[128*3] =
-{
+}};
+std::array<stru160, 128> array_4EBBD0;
+std::array<__int32, 128*3> array_4EBBD0_x =
+{{
   0x00000000, 0x00000001, 0x00000002, 0x00000001,
   0x00000003, 0x00000002, 0x00000001, 0x00000004,
   0x00000003, 0x00000003, 0x00000005, 0x00000002,
@@ -232,10 +232,10 @@
   0x00000026, 0x00000028, 0x00000041, 0x00000028,
   0x00000031, 0x00000041, 0x00000028, 0x0000000B,
   0x00000031, 0x00000031, 0x0000002D, 0x00000041
-};
+}};
 
 #include "stru220.h"
-stru220 stru_76E5C8[16384];
+std::array<stru220, 16384> stru_76E5C8;
 
 #include "stru176.h"
 stru176 array_5B5928_timers[100];