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
Strategic/Quest Debug System.cpp
+8 -5
View File
@@ -3179,11 +3179,13 @@ void CreateDestroyDisplayNPCInventoryPopup( UINT8 ubAction )
DrawTextToScreen( gMercProfiles[ gNpcListBox.sCurSelectedItem ].zNickname, QUEST_DBS_NPC_INV_POPUP_X, QUEST_DBS_NPC_INV_POPUP_Y+20, QUEST_DBS_NPC_INV_POPUP_WIDTH, QUEST_DBS_FONT_TITLE, QUEST_DBS_COLOR_SUBTITLE, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
usPosY = QUEST_DBS_NPC_INV_POPUP_Y + 40;
for( i=0; i<pSoldier->inv.size(); i++)
UINT16 invsize = pSoldier->inv.size();
for( i=0; i<invsize; ++i)
{
if (pSoldier->inv[i].exists() == false) {
if (pSoldier->inv[i].exists() == false)
continue;
}
// if ( !LoadItemInfo( pSoldier->inv[ i ].usItem, zItemName, zItemDesc ) )
// Assert(0);
wcscpy( zItemName, ShortItemNames[ pSoldier->inv[ i ].usItem ] );
@@ -3691,7 +3693,7 @@ void RefreshAllNPCInventory()
{
UINT16 usCnt;
UINT16 usItemCnt;
UINT16 usItem;
UINT16 usItem;
for ( usCnt=0; usCnt < TOTAL_SOLDIERS; usCnt++ )
{
@@ -3704,7 +3706,8 @@ void RefreshAllNPCInventory()
if ( gProfilesRPC[Menptr[ usCnt ].ubProfile].ProfilId == Menptr[ usCnt ].ubProfile || gProfilesNPC[Menptr[ usCnt ].ubProfile].ProfilId == Menptr[ usCnt ].ubProfile || gProfilesVehicle[Menptr[ usCnt ].ubProfile].ProfilId == Menptr[ usCnt ].ubProfile )
{
//refresh the mercs inventory
for ( usItemCnt = 0; usItemCnt< Menptr[ usCnt ].inv.size(); usItemCnt++ )
UINT16 invsize = Menptr[ usCnt ].inv.size();
for ( usItemCnt = 0; usItemCnt< invsize; ++usItemCnt )
{
if ( gMercProfiles[ Menptr[ usCnt ].ubProfile ].inv[ usItemCnt ] != NOTHING )
{