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

Merged from revision: 7230

Browse Source 
Fixes (by Buggler)
- Added first page and last page buttons to history log
- Fixed pick up backpack on the same grid to cost the same as manually picking it up instead of no cost
- Display message when dropping and picking backpacks for all mercs in sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7231 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-05-23 19:07:05 +00:00
parent b5aa779b1b
commit 262b1ea128
14 changed files with 116 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Panels.cpp
+2 -1
View File
@@ -4315,7 +4315,8 @@ BOOLEAN ChangeDropPackStatus(SOLDIERTYPE *pSoldier, BOOLEAN newStatus)
iRange = GetRangeInCellCoordsFromGridNoDiff( pSoldier->sGridNo, gWorldItems[wi].sGridNo );
if(gWorldItems[wi].sGridNo == pSoldier->sGridNo) // standing on pack - pickup regardless
{
sAPCost = 0;
// Buggler: pickup should cost the same as manually picking it up
//sAPCost = 0;
break;
}
else if(iRange < 26 && !(gTacticalStatus.uiFlags & INCOMBAT)) // should mean anything within 2 diagonal tiles while not in combat