From 332fbfe590d29f2bdd375229142bae6f845be6a5 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Fri, 20 Jul 2012 17:43:08 +0100 Subject: Ensure GameSave internal pointers are NULL at the start diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp index 7f8aa4f..0b6be57 100644 --- a/src/client/GameSave.cpp +++ b/src/client/GameSave.cpp @@ -22,7 +22,13 @@ gravityMode(save.gravityMode), airMode(save.airMode), signs(save.signs) { - blockMap, blockMapPtr, fanVelX, fanVelXPtr, fanVelY, fanVelYPtr, particles = NULL; + blockMap = NULL; + blockMapPtr = NULL; + fanVelX = NULL; + fanVelXPtr = NULL; + fanVelY = NULL; + fanVelYPtr = NULL; + particles = NULL; setSize(save.blockWidth, save.blockHeight); @@ -35,14 +41,30 @@ signs(save.signs) GameSave::GameSave(int width, int height) { - blockMap, blockMapPtr, fanVelX, fanVelXPtr, fanVelY, fanVelYPtr, particles = NULL; + blockMap = NULL; + blockMapPtr = NULL; + fanVelX = NULL; + fanVelXPtr = NULL; + fanVelY = NULL; + fanVelYPtr = NULL; + particles = NULL; + setSize(width, height); } GameSave::GameSave(char * data, int dataSize) { - blockWidth, blockHeight = 0; - blockMap, blockMapPtr, fanVelX, fanVelXPtr, fanVelY, fanVelYPtr, particles = NULL; + blockWidth = 0; + blockHeight = 0; + + blockMap = NULL; + blockMapPtr = NULL; + fanVelX = NULL; + fanVelXPtr = NULL; + fanVelY = NULL; + fanVelYPtr = NULL; + particles = NULL; + try { if(dataSize > 0) { -- cgit v0.9.2-21-gd62e