1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: VS2010 compilation issue

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-08-11 20:15:52 +00:00
parent 2c5e85f828
commit b36f24334c
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.h
+3 -10
View File
@@ -125,16 +125,9 @@ typedef enum
} INTERACTIVE_STRUCTURE_TYPE; } INTERACTIVE_STRUCTURE_TYPE;
typedef struct INTERACTIVE_STRUCTURE { typedef struct INTERACTIVE_STRUCTURE {
void reset() INTERACTIVE_STRUCTURE()
{ : sector( -1 ), sectorlevel( -1 ), sLevel( -1 ), sActionType( INTERACTIVE_STRUCTURE_NO_ACTION ), difficulty( 0 ), luaactionid( -1 ) {}
sector = -1;
sectorlevel = -1;
sLevel = -1;
sActionType = INTERACTIVE_STRUCTURE_NO_ACTION;
difficulty = 0;
luaactionid = -1;
}
INT16 sector; INT16 sector;
INT8 sectorlevel; // whether this is on the surface (0) or below (1-3) INT8 sectorlevel; // whether this is on the surface (0) or below (1-3)
char szTileSetName[20]; // name of the tileset char szTileSetName[20]; // name of the tileset
Tactical/XML_InteractiveTiles.cpp
-4
View File
@@ -43,16 +43,12 @@ interactiveactionsStartElementHandle( void *userData, const XML_Char *name, cons
{ {
pData->curElement = ELEMENT_LIST; pData->curElement = ELEMENT_LIST;
memset( pData->curArray, 0, sizeof(INTERACTIVE_STRUCTURE)*pData->maxArraySize );
pData->maxReadDepth++; //we are not skipping this element pData->maxReadDepth++; //we are not skipping this element
} }
else if ( strcmp( name, "ACTION" ) == 0 && pData->curElement == ELEMENT_LIST ) else if ( strcmp( name, "ACTION" ) == 0 && pData->curElement == ELEMENT_LIST )
{ {
pData->curElement = ELEMENT; pData->curElement = ELEMENT;
pData->curArray[pData->curIndex].reset( );
pData->maxReadDepth++; //we are not skipping this element pData->maxReadDepth++; //we are not skipping this element
} }
else if ( pData->curElement == ELEMENT && else if ( pData->curElement == ELEMENT &&