Merged revision(s) 7251 from branches/ja2_source_official_2014:

code cleanup & removed some warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-06-01 21:50:14 +00:00
parent be52b5bf76
commit 6448b332ec
8 changed files with 168 additions and 325 deletions
+2 -1
View File
@@ -5756,7 +5756,7 @@ void RemoveProhibitedAttachments(SOLDIERTYPE* pSoldier, OBJECTTYPE* pObj, UINT16
// put it on the ground //dnl ch75 281013
INT32 sGridNo = NOWHERE;
UINT8 ubLevel = 0;
for(int i=0; i<guiNumWorldItems; i++)
for(UINT32 i=0; i<guiNumWorldItems; ++i)
{
if(gWorldItems[i].fExists && (pObj == &gWorldItems[i].object))
{
@@ -5765,6 +5765,7 @@ void RemoveProhibitedAttachments(SOLDIERTYPE* pSoldier, OBJECTTYPE* pObj, UINT16
break;
}
}
if(sGridNo != NOWHERE)
{
if(guiCurrentItemDescriptionScreen == MAP_SCREEN && fShowMapInventoryPool)