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

Convert SOLDIERTYPE->usChatPartnerID to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-15 21:09:17 +02:00
parent 83b3485e58
commit ecb29ae9bc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+2 -2
View File
@@ -11397,7 +11397,7 @@ void CheckChatPartners()
if ( fMercQuoteThisTime ) if ( fMercQuoteThisTime )
GetSoldierScreenPos( pSoldier, &sScreenX, &sScreenY ); GetSoldierScreenPos( pSoldier, &sScreenX, &sScreenY );
else else
GetSoldierScreenPos( MercPtrs[pSoldier->usChatPartnerID], &sScreenX, &sScreenY ); GetSoldierScreenPos( pSoldier->usChatPartnerID, &sScreenX, &sScreenY );
if ( gsVIEWPORT_START_X <= sScreenX && if ( gsVIEWPORT_START_X <= sScreenX &&
gsVIEWPORT_END_X >= sScreenX && gsVIEWPORT_END_X >= sScreenX &&
@@ -11407,7 +11407,7 @@ void CheckChatPartners()
if ( fMercQuoteThisTime ) if ( fMercQuoteThisTime )
BeginChatQuote( pSoldier, sScreenX, sScreenY ); BeginChatQuote( pSoldier, sScreenX, sScreenY );
else else
BeginChatQuote( MercPtrs[pSoldier->usChatPartnerID], sScreenX, sScreenY ); BeginChatQuote( pSoldier->usChatPartnerID, sScreenX, sScreenY );
fMercQuoteThisTime = !fMercQuoteThisTime; fMercQuoteThisTime = !fMercQuoteThisTime;
Tactical/Soldier Control.cpp
+1 -1
View File
@@ -21010,7 +21010,7 @@ void SOLDIERTYPE::StopChatting()
{ {
if ( this->usChatPartnerID != NOBODY ) if ( this->usChatPartnerID != NOBODY )
{ {
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, TacticalStr[DISTRACT_STOP_STR], this->GetName(), MercPtrs[this->usChatPartnerID]->GetName() ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, TacticalStr[DISTRACT_STOP_STR], this->GetName(), this->usChatPartnerID->GetName() );
MercPtrs[this->usChatPartnerID]->usChatPartnerID = NOBODY; MercPtrs[this->usChatPartnerID]->usChatPartnerID = NOBODY;
this->usChatPartnerID = NOBODY; this->usChatPartnerID = NOBODY;
Tactical/Soldier Control.h
+1 -1
View File
@@ -1550,7 +1550,7 @@ public:
//INT16 bUnusedINT16_4; //INT16 bUnusedINT16_4;
INT16 sDragCorpseID; // Flugente: id of corpse we are dragging INT16 sDragCorpseID; // Flugente: id of corpse we are dragging
UINT16 usChatPartnerID; // Flugente: the id of another merc we are 'chatting' with SoldierID usChatPartnerID; // Flugente: the id of another merc we are 'chatting' with
// Flugente: new variables for extra stats // Flugente: new variables for extra stats
INT16 bExtraStrength; // additional strength gained via power armor INT16 bExtraStrength; // additional strength gained via power armor