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

new feature: 'Move item' assignment allows quick and easy mass transfer of items between city sectors.

Browse Source 
Warning: GameDir >= r1723 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-11 15:22:29 +00:00
parent fd8b146296
commit 8171fdbe7e
22 changed files with 1045 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Faces.cpp
+18 -4
View File
@@ -1652,6 +1652,8 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
BOOLEAN drawOpponentCount = FALSE;
CHAR16 wShortText[ 8 ]; // added by Flugente to display sector names
// If we are using an extern buffer...
if ( fUseExternBuffer )
{
@@ -2413,6 +2415,18 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
break;
case MOVE_EQUIPMENT:
{
sIconIndex = 25;
fDoIcon = TRUE;
GetShortSectorString( SECTORX(pSoldier->usItemMoveSectorID), SECTORY(pSoldier->usItemMoveSectorID), wShortText );
fShowNumber = TRUE;
fShowMaximum = TRUE;
}
break;
case FACILITY_INTERROGATE_PRISONERS:
sIconIndex = 23;
fDoIcon = TRUE;
@@ -2452,10 +2466,10 @@ void HandleRenderFaceAdjustments( FACETYPE *pFace, BOOLEAN fDisplayBuffer, BOOLE
if ( fShowMaximum )
{
/*if ( pSoldier->bAssignment == FACILITY_INTERROGATE_PRISONERS )
swprintf( sString, L"%2.2f/%d", bPtsAvailable, usMaximumPts );
else*/
swprintf( sString, L"%d/%d", sPtsAvailable, usMaximumPts );
if ( pSoldier->bAssignment == MOVE_EQUIPMENT )
swprintf( sString, L"%s", wShortText );
else
swprintf( sString, L"%d/%d", sPtsAvailable, usMaximumPts );
}
else
{
Tactical/Interface Items.cpp
+1
View File
@@ -266,6 +266,7 @@ UINT32 guiAttachmentSlot;
// HEADROCK HAM 4: This replaces "Misc" icons.
extern UINT32 guiItemInfoAdvancedIcon; // added here by Flugente
UINT32 guiItemInfoMoveItemDisplay; // added here by Flugente. We need a second name, otherwise the two displays in Strategic Inventory and UDB will interfere with each other
UINT32 guiItemGraphic;
UINT32 guiMoneyGraphicsForDescBox;
Tactical/Soldier Control.h
+4 -1
View File
@@ -1274,9 +1274,12 @@ public:
UINT16 usSoldierProfile; // Flugente: allow linking to a xml-based profile specifiying name, visuals, traits etc.
// Flugente: sector ID for move items assignemnt
UINT8 usItemMoveSectorID;
// Flugente: Decrease this filler by 1 for each new UINT8 / BOOLEAN variable, so we can maintain savegame compatibility!!
// Note that we also have to account for padding, so you might need to substract more than just the size of the new variables
UINT8 ubFiller[8];
UINT8 ubFiller[7];
#ifdef JA2UB
//ja25
Tactical/World Items.h
+9 -4
View File
@@ -6,20 +6,25 @@
#define WORLD_ITEM_DONTRENDER 0x0001
#define WOLRD_ITEM_FIND_SWEETSPOT_FROM_GRIDNO 0x0002
#define WOLRD_ITEM_FIND_SWEETSPOT_FROM_GRIDNO 0x0002
#define WORLD_ITEM_ARMED_BOMB 0x0040
#define WORLD_ITEM_SCIFI_ONLY 0x0080
#define WORLD_ITEM_REALISTIC_ONLY 0x0100
#define WORLD_ITEM_REALISTIC_ONLY 0x0100
#define WORLD_ITEM_REACHABLE 0x0200
#define WORLD_ITEM_GRIDNO_NOT_SET_USE_ENTRY_POINT 0x0400
#define WORLD_ITEM_GRIDNO_NOT_SET_USE_ENTRY_POINT 0x0400
//Kaiden: This constant is to flag items that an enemy drops when they die.
#define WORLD_ITEM_DROPPED_FROM_ENEMY 0x0800
#define WORLD_ITEM_DROPPED_FROM_ENEMY 0x0800
// Flugente: when equipping militia from inventory, do not consider this item
#define WORLD_ITEM_TABOO_FOR_MILITIA_EQ_ELITE 0x1000
#define WORLD_ITEM_TABOO_FOR_MILITIA_EQ_BLUE 0x2000
#define WORLD_ITEM_TABOO_FOR_MILITIA_EQ_GREEN 0x4000
// Flugente: when moving items via 'move items' assignment, ignore this item
#define WORLD_ITEM_MOVE_ASSIGNMENT_IGNORE 0x8000
#define WORLD_ITEM_TABOO_FOR_MILITIA_EQ_ALL 0x7000
class WORLDITEM;//dnl ch33 120909