From b36f24334c976a724444070e510ed0cabefd37b5 Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 11 Aug 2016 20:15:52 +0000 Subject: [PATCH] Fix: VS2010 compilation issue git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8285 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle Items.h | 13 +++---------- Tactical/XML_InteractiveTiles.cpp | 4 ---- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Tactical/Handle Items.h b/Tactical/Handle Items.h index 7288d4850..a0d3662d4 100644 --- a/Tactical/Handle Items.h +++ b/Tactical/Handle Items.h @@ -125,16 +125,9 @@ typedef enum } INTERACTIVE_STRUCTURE_TYPE; typedef struct INTERACTIVE_STRUCTURE { - void reset() - { - sector = -1; - sectorlevel = -1; - sLevel = -1; - sActionType = INTERACTIVE_STRUCTURE_NO_ACTION; - difficulty = 0; - luaactionid = -1; - } - + INTERACTIVE_STRUCTURE() + : sector( -1 ), sectorlevel( -1 ), sLevel( -1 ), sActionType( INTERACTIVE_STRUCTURE_NO_ACTION ), difficulty( 0 ), luaactionid( -1 ) {} + INT16 sector; INT8 sectorlevel; // whether this is on the surface (0) or below (1-3) char szTileSetName[20]; // name of the tileset diff --git a/Tactical/XML_InteractiveTiles.cpp b/Tactical/XML_InteractiveTiles.cpp index 62cf4b55f..088e3e2d2 100644 --- a/Tactical/XML_InteractiveTiles.cpp +++ b/Tactical/XML_InteractiveTiles.cpp @@ -43,16 +43,12 @@ interactiveactionsStartElementHandle( void *userData, const XML_Char *name, cons { pData->curElement = ELEMENT_LIST; - memset( pData->curArray, 0, sizeof(INTERACTIVE_STRUCTURE)*pData->maxArraySize ); - pData->maxReadDepth++; //we are not skipping this element } else if ( strcmp( name, "ACTION" ) == 0 && pData->curElement == ELEMENT_LIST ) { pData->curElement = ELEMENT; - pData->curArray[pData->curIndex].reset( ); - pData->maxReadDepth++; //we are not skipping this element } else if ( pData->curElement == ELEMENT &&