Fixed MSVC related issues
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@855 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
fafa69842f
commit
9b7ab89441
|
@ -115,8 +115,8 @@ SDWORD memBlockCmp(void *key1, void *key2)
|
|||
UBYTE *start1, *start2, *end1, *end2;
|
||||
|
||||
// Calculate the edges of the memory blocks
|
||||
start1 = (UBYTE *)(((MEM_NODE *)key1)->pObj + sizeof(MEM_NODE) + SAFETY_ZONE_SIZE);
|
||||
start2 = (UBYTE *)(((MEM_NODE *)key2)->pObj + sizeof(MEM_NODE) + SAFETY_ZONE_SIZE);
|
||||
start1 = (UBYTE *)((char *)(((MEM_NODE *)key1)->pObj) + sizeof(MEM_NODE) + SAFETY_ZONE_SIZE);
|
||||
start2 = (UBYTE *)((char *)(((MEM_NODE *)key2)->pObj) + sizeof(MEM_NODE) + SAFETY_ZONE_SIZE);
|
||||
end1 = start1 + ((MEM_NODE *)key1)->size;
|
||||
end2 = start2 + ((MEM_NODE *)key2)->size;
|
||||
|
||||
|
|
|
@ -11787,7 +11787,7 @@ SDWORD getCompFromNamePreV7(UDWORD compType, char *pName)
|
|||
{
|
||||
return count;
|
||||
}
|
||||
psStats = (BASE_STATS *)((void*)psStats + statSize);
|
||||
psStats = (BASE_STATS *)((char*)psStats + statSize);
|
||||
}
|
||||
|
||||
//return -1 if record not found or an invalid component type is passed in
|
||||
|
@ -11844,7 +11844,7 @@ SDWORD getStatFromNamePreV7(BOOL isFeature, char *pName)
|
|||
{
|
||||
return count;
|
||||
}
|
||||
psStats = (BASE_STATS *)((void*)psStats + statSize);
|
||||
psStats = (BASE_STATS *)((char*)psStats + statSize);
|
||||
}
|
||||
|
||||
//return -1 if record not found or an invalid component type is passed in
|
||||
|
|
|
@ -2771,7 +2771,7 @@ COMP_BASE_STATS * getComponentDetails(char *pName, char *pCompName)
|
|||
{
|
||||
return pArtefact;
|
||||
}
|
||||
pArtefact = (COMP_BASE_STATS*)((void*)pArtefact + size);
|
||||
pArtefact = (COMP_BASE_STATS*)((char*)pArtefact + size);
|
||||
}
|
||||
|
||||
debug( LOG_ERROR, "Cannot find component %s", pCompName );
|
||||
|
|
|
@ -656,7 +656,7 @@ BOOL scrValDefSave(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize)
|
|||
*((UDWORD*)pBuffer) = ((BASE_OBJECT *)psVal->v.oval)->id;
|
||||
#ifdef _DEBUG
|
||||
psObj = getBaseObjFromId(((BASE_OBJECT *)psVal->v.oval)->id);
|
||||
ASSERT( psObj == (BASE_OBJECT *)data,"scrValDefSave failed to find object, continue" );
|
||||
ASSERT( psObj == (BASE_OBJECT *)psVal->v.oval,"scrValDefSave failed to find object, continue" );
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue