1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 6826-6828 from branches/ja2_source_official_2014:

Browse Source 
- Minor code improvements and cleanup
- Fix from r6775 is no longer necessary.
- Code improvement: Instead of calling inv.size() repeatedly, just call it once and remember that value

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6829 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-01-26 12:18:43 +00:00
parent d4aa35a66e
commit d6186aca15
34 changed files with 677 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Item Types.cpp
+26 -13
View File
@@ -80,11 +80,13 @@ bool DestroyLBEIfEmpty(OBJECTTYPE* pObj)
{
if (pObj->IsActiveLBE(0) == true) {
LBENODE* pLBE = pObj->GetLBEPointer(0);
if (pLBE) {
for (unsigned int x = 0; x < pLBE->inv.size(); ++x) {
if (pLBE->inv[x].exists() == true) {
if (pLBE)
{
UINT16 plbesize = pLBE->inv.size();
for (UINT16 x = 0; x < plbesize; ++x)
{
if (pLBE->inv[x].exists() == true)
return false;
}
}
for (std::list<LBENODE>::iterator iter = LBEArray.begin(); iter != LBEArray.end(); ++iter) {
if (iter->uniqueID == pLBE->uniqueID) {
@@ -107,38 +109,44 @@ void DestroyLBE(OBJECTTYPE* pObj)
LBENODE* pLBE = pObj->GetLBEPointer(0);
if(pLBE)
{
for(unsigned int x = 0; x < pLBE->inv.size(); x++)
UINT16 plbesize = pLBE->inv.size();
for(UINT16 x = 0; x < plbesize; ++x)
{
if(pLBE->inv[x].exists() == true)
{
pLBE->inv[x].initialize();
}
}
for (std::list<LBENODE>::iterator iter = LBEArray.begin(); iter != LBEArray.end(); ++iter) {
if (iter->uniqueID == pLBE->uniqueID) {
for (std::list<LBENODE>::iterator iter = LBEArray.begin(); iter != LBEArray.end(); ++iter)
{
if (iter->uniqueID == pLBE->uniqueID)
{
LBEArray.erase(iter);
break;
}
}
(*pObj)[0]->data.lbe.uniqueID = 0;
(*pObj)[0]->data.lbe.bLBE = 0;
return;
}
}
return;
}
void MoveItemsInSlotsToLBE( SOLDIERTYPE *pSoldier, std::vector<INT8>& LBESlots, LBENODE* pLBE, OBJECTTYPE* pObj)
{
for(unsigned int i=0; i<LBESlots.size(); i++) // Go through default pockets one by one
UINT16 plbesize = pLBE->inv.size();
UINT16 lbesize = LBESlots.size();
for(UINT16 i=0; i<lbesize; ++i) // Go through default pockets one by one
{
if(pSoldier->inv[LBESlots[i]].exists() == false) // No item in this pocket
continue;
// Found an item in a default pocket so get it's ItemSize
UINT16 dSize = CalculateItemSize(&pSoldier->inv[LBESlots[i]]);
for(unsigned int j=0; j<pLBE->inv.size(); j++) // Search through LBE and see if item fits anywhere
for(unsigned int j=0; j<plbesize; ++j) // Search through LBE and see if item fits anywhere
{
if(pLBE->inv[j].exists() == true) // Item already stored in LBENODE pocket
continue;
@@ -368,15 +376,19 @@ BOOLEAN MoveItemFromLBEItem( SOLDIERTYPE *pSoldier, UINT32 uiHandPos, OBJECTTYPE
}
}
}
if (DestroyLBEIfEmpty(pObj) == false) {
if (DestroyLBEIfEmpty(pObj) == false)
{
//we should have copied all the items from the LBE to the soldier
//which means the LBE should be empty and destroyed. However, if it's not empty, we need to force place
//some items so that we can empty the LBE without losing anything.
for(unsigned int i = 0; i < LBESlots.size(); i++)
UINT16 invsize = pSoldier->inv.size();
UINT16 lbesize = LBESlots.size();
for(UINT16 i = 0; i < lbesize; ++i)
{
if(pLBE->inv[i].exists() == true)
{
for(unsigned int j = BIGPOCKSTART; j < pSoldier->inv.size(); j++)
for(UINT16 j = BIGPOCKSTART; j < invsize; ++j)
{
if(pSoldier->inv[j].exists() == false)
{
@@ -385,6 +397,7 @@ BOOLEAN MoveItemFromLBEItem( SOLDIERTYPE *pSoldier, UINT32 uiHandPos, OBJECTTYPE
}
}
}
//Now, check one last time and if we still have an object, drop it to the ground
if(pLBE->inv[i].exists() == true)
{