Mercurial > mm7

diff SaveLoad.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 5450af4f57ef dcc52e17b517
line wrap: on
line diff
--- a/SaveLoad.cpp	Sun Jun 09 01:10:49 2013 +0200
+++ b/SaveLoad.cpp	Sun Jun 09 01:30:36 2013 +0200
@@ -423,7 +423,7 @@
       data_write_pos += 836 * uNumActors;
       memcpy(data_write_pos, &uNumSpriteObjects, 4);
       data_write_pos += 4;
-      memcpy(data_write_pos, pSpriteObjects, 112 * uNumSpriteObjects);
+      memcpy(data_write_pos, pSpriteObjects.data(), 112 * uNumSpriteObjects);
       data_write_pos += 112 * uNumSpriteObjects;
       memcpy(data_write_pos, &uNumChests, 4);
       data_write_pos += 4;
@@ -472,7 +472,7 @@
       data_write_pos +=  836 * uNumActors;
       memcpy(data_write_pos, &uNumSpriteObjects, 4);
       data_write_pos += 4;
-      memcpy(data_write_pos, pSpriteObjects, 112 * uNumSpriteObjects);
+      memcpy(data_write_pos, pSpriteObjects.data(), 112 * uNumSpriteObjects);
       data_write_pos += 112 * uNumSpriteObjects;
       memcpy(data_write_pos, &uNumChests, 4);
       data_write_pos += 4;