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

CancelDrag, StartDrag: update interface panel to change drag icon status.

Browse Source 
DrawTraitRadius uses usColour.
Allow to start dragging from any stance, soldier will crouch automatically.
Show draggable objects when drag skill menu is active.
Press [\] key to start dragging object/solder/corpse in front of merc.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2022-04-24 18:21:44 +00:00
parent cdc605d5ab
commit 904fae7a96
11 changed files with 345 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+161 -24
View File
@@ -9332,7 +9332,7 @@ void CalculateSoldierAniSpeed( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pStatsSoldier
}
// Flugente: drag people
if ( pSoldier->IsDraggingSomeone( false ) )
if ( pSoldier->IsDragging( false ) )
{
pSoldier->sAniDelay = gItemSettings.fDragAPCostModifier * pSoldier->sAniDelay;
}
@@ -11775,7 +11775,7 @@ void SOLDIERTYPE::MoveMerc( FLOAT dMovementChange, FLOAT dAngle, BOOLEAN fCheckR
// Flugente: as we move a tile, we would now be too far away to drag someone.
// So remember whether we were dragging (we have to set our position now, otherwise the person we drag woul soon occupy our gridno).
BOOLEAN currentlydragging = this->IsDraggingSomeone();
BOOLEAN currentlydragging = this->IsDragging();
INT32 sOldGridNo = this->sGridNo;
// OK, set new position
@@ -18322,7 +18322,8 @@ BOOLEAN SOLDIERTYPE::CanUseSkill( INT8 iSkill, BOOLEAN fAPCheck, INT32 sGridNo )
case SKILLS_DRAG:
// TODO: a better check would be whether we can drag anything at the moment - CanDrag is more used for a specific person
if ( CanDragInPrinciple() )
// sevenfm: added AP check to crouch before starting to drag
if ((!fAPCheck || EnoughPoints(this, GetAPsToStartDrag(this, sGridNo), 0, FALSE)) && CanDragInPrinciple())
canuse = TRUE;
break;
@@ -18467,6 +18468,11 @@ BOOLEAN SOLDIERTYPE::UseSkill( UINT8 iSkill, INT32 usMapPos, UINT32 ID )
break;
case SKILLS_DRAG:
// sevenfm: change to crouch before dragging
if (gAnimControl[this->usAnimState].ubEndHeight != ANIM_CROUCH)
{
HandleStanceChangeFromUIKeys(ANIM_CROUCH);
}
if ( usMapPos != NOWHERE )
SetDragOrderStructure( usMapPos );
else if ( ID < NOBODY )
@@ -18650,8 +18656,9 @@ STR16 SOLDIERTYPE::PrintSkillDesc( INT8 iSkill, INT32 sGridNo )
swprintf( atStr, pTraitSkillsDenialStrings[TEXT_SKILL_DENIAL_PRONEPERSONORCORPSE] );
wcscat( skilldescarray, atStr );
swprintf( atStr, pTraitSkillsDenialStrings[TEXT_SKILL_DENIAL_CROUCH] );
wcscat( skilldescarray, atStr );
// sevenfm: allow to start dragging from any stance, will crouch automatically
//swprintf( atStr, pTraitSkillsDenialStrings[TEXT_SKILL_DENIAL_CROUCH] );
//wcscat( skilldescarray, atStr );
swprintf( atStr, pTraitSkillsDenialStrings[TEXT_SKILL_DENIAL_FREEHANDS] );
wcscat( skilldescarray, atStr );
@@ -20736,10 +20743,10 @@ void SOLDIERTYPE::RiotShieldTakeDamage( INT32 sDamage )
}
// Flugente: drag people
BOOLEAN SOLDIERTYPE::CanDragInPrinciple()
BOOLEAN SOLDIERTYPE::CanDragInPrinciple(BOOLEAN fCheckStance)
{
// only prone while crouched
if ( gAnimControl[this->usAnimState].ubEndHeight != ANIM_CROUCH )
// only allow while crouched
if (fCheckStance && gAnimControl[this->usAnimState].ubEndHeight != ANIM_CROUCH)
return FALSE;
// not in water
@@ -20753,9 +20760,9 @@ BOOLEAN SOLDIERTYPE::CanDragInPrinciple()
return TRUE;
}
BOOLEAN SOLDIERTYPE::CanDragPerson( UINT16 usID )
BOOLEAN SOLDIERTYPE::CanDragPerson(UINT16 usID, BOOLEAN fCheckStance)
{
if ( !CanDragInPrinciple() )
if (!CanDragInPrinciple(fCheckStance))
return FALSE;
// check whether this guy exists etc.
@@ -20794,9 +20801,9 @@ BOOLEAN SOLDIERTYPE::CanDragPerson( UINT16 usID )
return FALSE;
}
BOOLEAN SOLDIERTYPE::CanDragCorpse( UINT16 usCorpseNum )
BOOLEAN SOLDIERTYPE::CanDragCorpse(UINT16 usCorpseNum, BOOLEAN fCheckStance)
{
if ( !CanDragInPrinciple( ) )
if (!CanDragInPrinciple(fCheckStance))
return FALSE;
ROTTING_CORPSE* pCorpse = GetRottingCorpse( usCorpseNum );
@@ -20826,9 +20833,9 @@ BOOLEAN SOLDIERTYPE::CanDragCorpse( UINT16 usCorpseNum )
return FALSE;
}
BOOLEAN SOLDIERTYPE::CanDragStructure( INT32 sGridNo )
BOOLEAN SOLDIERTYPE::CanDragStructure(INT32 sGridNo, BOOLEAN fCheckStance)
{
if ( !CanDragInPrinciple() )
if (!CanDragInPrinciple(fCheckStance))
return FALSE;
if ( sGridNo == NOWHERE )
@@ -21013,27 +21020,27 @@ BOOLEAN SOLDIERTYPE::CanDragStructure( INT32 sGridNo )
return TRUE;
}
BOOLEAN SOLDIERTYPE::IsDraggingSomeone( bool aStopIfConditionNotSatisfied )
BOOLEAN SOLDIERTYPE::IsDragging( bool aStopIfConditionNotSatisfied )
{
if ( this->sDragCorpseID >= 0 )
if (this->sDragCorpseID >= 0)
{
if ( this->CanDragCorpse(this->sDragCorpseID) )
if (this->CanDragCorpse(this->sDragCorpseID, TRUE))
return TRUE;
else if ( aStopIfConditionNotSatisfied )
else if (aStopIfConditionNotSatisfied)
CancelDrag();
}
else if ( this->usDragPersonID != NOBODY )
else if (this->usDragPersonID != NOBODY)
{
if ( this->CanDragPerson(this->usDragPersonID) )
if (this->CanDragPerson(this->usDragPersonID, TRUE))
return TRUE;
else if ( aStopIfConditionNotSatisfied )
else if (aStopIfConditionNotSatisfied)
CancelDrag();
}
else if ( this->sDragGridNo != NOWHERE )
else if (this->sDragGridNo != NOWHERE)
{
if ( this->CanDragStructure( this->sDragGridNo ) )
if (this->CanDragStructure(this->sDragGridNo, TRUE))
return TRUE;
else if ( aStopIfConditionNotSatisfied )
else if (aStopIfConditionNotSatisfied)
CancelDrag();
}
@@ -21105,6 +21112,12 @@ void SOLDIERTYPE::SetDragOrderStructure( INT32 sGridNo )
void SOLDIERTYPE::CancelDrag()
{
// sevenfm: update face icon
if (this->usDragPersonID != NOBODY || this->sDragCorpseID != -1 || this->sDragGridNo != NOWHERE)
{
fInterfacePanelDirty = DIRTYLEVEL2;
}
// if we are dragging a person, set them to the center of their gridno, otherwise their position might be off
if (this->usDragPersonID != NOBODY)
{
@@ -24454,6 +24467,130 @@ BOOLEAN SOLDIERTYPE::CanBreakWindow(void)
return FALSE;
}
BOOLEAN SOLDIERTYPE::CanStartDrag(void)
{
if (!this->IsDragging(false) && this->CanDragInPrinciple())
{
INT32 sNewGridNo = NewGridNo(this->sGridNo, DirectionInc(this->ubDirection));
if (!TileIsOutOfBounds(sNewGridNo) && sNewGridNo != this->sGridNo)
{
// soldiers
for (UINT32 cnt = gTacticalStatus.Team[OUR_TEAM].bFirstID; cnt <= gTacticalStatus.Team[CIV_TEAM].bLastID; ++cnt)
{
if (cnt != this->ubID &&
MercPtrs[cnt] &&
MercPtrs[cnt]->sGridNo == sNewGridNo &&
this->CanDragPerson(cnt))
{
return TRUE;
}
}
// corpses
ROTTING_CORPSE* pCorpse;
for (INT32 cnt = 0; cnt < giNumRottingCorpse; ++cnt)
{
pCorpse = &(gRottingCorpse[cnt]);
if (pCorpse &&
pCorpse->fActivated &&
pCorpse->def.bLevel == this->pathing.bLevel &&
sNewGridNo == pCorpse->def.sGridNo &&
this->CanDragCorpse(pCorpse->iID))
{
return TRUE;
}
}
// gridno
UINT32 tiletype;
UINT16 structurenumber;
UINT8 hitpoints;
UINT8 decalflag;
if (this->CanDragStructure(sNewGridNo) &&
IsDragStructurePresent(sNewGridNo, this->pathing.bLevel, tiletype, structurenumber, hitpoints, decalflag))
{
int xmlentry;
GetDragStructureXmlEntry(tiletype, structurenumber, xmlentry);
if (xmlentry >= 0)
{
return TRUE;
}
}
}
}
return FALSE;
}
void SOLDIERTYPE::StartDrag(void)
{
if (this->CanDragInPrinciple())
{
if (gAnimControl[this->usAnimState].ubEndHeight != ANIM_CROUCH)
{
HandleStanceChangeFromUIKeys(ANIM_CROUCH);
}
INT32 sNewGridNo = NewGridNo(this->sGridNo, DirectionInc(this->ubDirection));
if (!TileIsOutOfBounds(sNewGridNo) && sNewGridNo != this->sGridNo)
{
// soldiers
for (UINT32 cnt = gTacticalStatus.Team[OUR_TEAM].bFirstID; cnt <= gTacticalStatus.Team[CIV_TEAM].bLastID; ++cnt)
{
if (cnt != this->ubID &&
MercPtrs[cnt] &&
MercPtrs[cnt]->sGridNo == sNewGridNo &&
this->CanDragPerson(cnt))
{
SetDragOrderPerson(cnt);
fInterfacePanelDirty = DIRTYLEVEL2;
}
}
// corpses
ROTTING_CORPSE* pCorpse;
for (INT32 cnt = 0; cnt < giNumRottingCorpse; ++cnt)
{
pCorpse = &(gRottingCorpse[cnt]);
if (pCorpse &&
pCorpse->fActivated &&
pCorpse->def.bLevel == this->pathing.bLevel &&
sNewGridNo == pCorpse->def.sGridNo &&
this->CanDragCorpse(pCorpse->iID))
{
SetDragOrderCorpse(pCorpse->iID);
fInterfacePanelDirty = DIRTYLEVEL2;
}
}
// gridno
UINT32 tiletype;
UINT16 structurenumber;
UINT8 hitpoints;
UINT8 decalflag;
if (this->CanDragStructure(sNewGridNo) &&
IsDragStructurePresent(sNewGridNo, this->pathing.bLevel, tiletype, structurenumber, hitpoints, decalflag))
{
int xmlentry;
GetDragStructureXmlEntry(tiletype, structurenumber, xmlentry);
if (xmlentry >= 0)
{
SetDragOrderStructure(sNewGridNo);
fInterfacePanelDirty = DIRTYLEVEL2;
}
}
}
}
}
BOOLEAN DoesSoldierWearGasMask( SOLDIERTYPE *pSoldier )//dnl ch40 200909
{
INT8 bPosOfMask = FindGasMask( pSoldier );