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

Perform explicit casts from UINT8 to UINT16 for SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-18 23:38:00 +02:00
parent 1e16de30d7
commit 94a5972a85
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Item Types.cpp
+2 -2
View File
@@ -1566,7 +1566,7 @@ OBJECTTYPE& OBJECTTYPE::operator=(const OLD_OBJECTTYPE_101& src)
(*this)[0]->data.misc.bDetonatorType = src.ugYucky.bDetonatorType;
(*this)[0]->data.misc.usBombItem = src.ugYucky.usBombItem;
(*this)[0]->data.misc.bDelay = src.ugYucky.bDelay; // includes bFrequency
(*this)[0]->data.misc.ubBombOwner = src.ugYucky.ubBombOwner;
(*this)[0]->data.misc.ubBombOwner = static_cast<UINT16>(src.ugYucky.ubBombOwner);
(*this)[0]->data.misc.bActionValue = src.ugYucky.bActionValue;
(*this)[0]->data.misc.ubTolerance = src.ugYucky.ubTolerance; // includes ubLocationID
(*this)[0]->data.ubDirection = DIRECTION_IRRELEVANT;
@@ -1658,7 +1658,7 @@ OBJECTTYPE& OBJECTTYPE::operator=(const OLD_OBJECTTYPE_101& src)
(*this)[0]->data.misc.bDetonatorType = src.ugYucky.bDetonatorType;
(*this)[0]->data.misc.usBombItem = src.ugYucky.usBombItem;
(*this)[0]->data.misc.bDelay = src.ugYucky.bDelay; // includes bFrequency
(*this)[0]->data.misc.ubBombOwner = src.ugYucky.ubBombOwner;
(*this)[0]->data.misc.ubBombOwner = static_cast<UINT16>(src.ugYucky.ubBombOwner);
(*this)[0]->data.misc.bActionValue = src.ugYucky.bActionValue;
(*this)[0]->data.misc.ubTolerance = src.ugYucky.ubTolerance; // includes ubLocationID
(*this)[0]->data.ubWireNetworkFlag = TRIPWIRE_NETWORK_OWNER_ENEMY; // it is always assumed that preplated traps are of hostile origin