Asdow
cd83fac928
Update Air Raid.cpp
2024-11-18 23:12:27 +02:00
Asdow
e9e8080077
Update merccompare.cpp
2024-11-18 23:12:17 +02:00
Asdow
9fb29cf444
Remove UINT8 conversions
2024-11-18 23:12:00 +02:00
Asdow
ca1112313a
Increase ubUserData2 from UINT8 to UINT16
2024-11-18 23:11:41 +02:00
Asdow
dd2c6f44b2
Fix incorrect function arguments
2024-11-18 22:38:28 +02:00
Asdow
38b710343a
Fix incorrect function argument
2024-11-18 22:38:09 +02:00
Asdow
3ddc4c2bbd
Change to SoldierID
2024-11-18 22:24:55 +02:00
Asdow
d2388c76b8
Modify SoldierID constructor to prevent invalid valuels
2024-11-18 21:43:30 +02:00
Asdow
07420ce245
Revert "Guard against out of bounds access"
...
This reverts commit c75f57785e .
2024-11-18 21:42:13 +02:00
Asdow
e62684f0e1
Convert GetSoldierIDFromMercID() to SoldierID
2024-11-18 18:50:20 +02:00
Asdow
c75f57785e
Guard against out of bounds access
...
Can't trust a simple != check
2024-11-18 18:49:38 +02:00
Asdow
66bd1e41c2
Correct loops
2024-11-18 18:27:14 +02:00
Asdow
fa56a7ad6d
Update Scheduling.cpp
2024-11-18 17:34:41 +02:00
Asdow
f49013307f
Convert to SoldierID
2024-11-18 01:01:57 +02:00
Asdow
657097aa54
Remove unused global
2024-11-17 23:47:26 +02:00
Asdow
b74ccf3ddc
Convert to SoldierID
2024-11-17 23:45:48 +02:00
Asdow
d149b6ffea
Correct parameter order
2024-11-17 22:39:58 +02:00
Asdow
ef9aa1b027
Convert to SoldierID
2024-11-17 22:29:31 +02:00
Asdow
b6e8b0c5ff
Convert to SoldierID
2024-11-17 21:09:13 +02:00
Asdow
b9641d4c90
Convert to SoldierID
2024-11-17 20:52:12 +02:00
Asdow
f50bdf99cc
Convert to SoldierID
2024-11-17 20:41:09 +02:00
Asdow
9532fbfe2c
Convert to SoldierID
2024-11-17 19:41:34 +02:00
Asdow
74d752d452
More conversions to SoldierID
2024-11-17 18:15:36 +02:00
Asdow
06936b71c9
Convert to SoldierID
...
Rearranged struct to optimize memory layout
2024-11-17 17:22:30 +02:00
Asdow
e9a13e12d8
Convert to SoldierID
2024-11-17 17:11:03 +02:00
Asdow
9acf994952
Convert gusTempDragBuildSoldierID to SoldierID
2024-11-17 16:50:01 +02:00
Asdow
9d62b9a37a
Remove unused function parameters
2024-11-17 16:46:57 +02:00
Asdow
2e92da4e12
Convert to SoldierID
2024-11-17 16:43:39 +02:00
Asdow
f39078357b
Remove unused function parameters
2024-11-17 16:39:13 +02:00
Asdow
2e147d4bd7
Convert to SoldierID
2024-11-17 16:35:26 +02:00
Asdow
274be524e6
More functions converted to SoldierID
2024-11-17 16:25:12 +02:00
Asdow
34f0b40f93
Convert functions and globals to SoldierID
2024-11-17 14:53:52 +02:00
Asdow
f58cf588a6
Mark TacticalStatusType::sSlideReason as _UNUSED
...
Removed from function call parameters at the same time.
It was supplied to SlideTo, SlideToLocation and SoldierLocationRelativeToScreen but was never used.
2024-11-17 14:20:37 +02:00
Asdow
30e6b9008c
SetUIBusy() & UnSetUIBusy() to SoldierID
2024-11-17 11:15:39 +02:00
Asdow
ab94d33bec
PlaySoldierJA2Sample() to SoldierID
2024-11-17 10:36:10 +02:00
Asdow
3fe6e4f3d8
GetSoldier() to SoldierID
2024-11-17 10:33:29 +02:00
Asdow
3e1c87f53c
Remove unused global gusOldSelectedSoldier
2024-11-17 10:27:42 +02:00
Asdow
cbf53f8848
TacticalStatusType::ubLastRequesterSurgeryTargetID to SoldierID
2024-11-17 10:26:01 +02:00
Asdow
f0be44bb42
Convert to SoldierID
...
TacticalStatusType::ubEnemySightingOnTheirTurnEnemyID
TacticalStatusType::ubEnemySightingOnTheirTurnPlayerID
TacticalTeamType::ubLastMercToRadio
2024-11-17 10:23:01 +02:00
Asdow
61c5a41bea
LocateSoldier() & HandleMercLeavingEquipmentInDrassen() & HandleMercLeavingEquipmentInOmerta()
2024-11-17 01:35:49 +02:00
Asdow
c475f9e4e6
Convert MapScreenCharacterSt::usSolID to SoldierID
2024-11-17 01:25:00 +02:00
Asdow
2918801f75
AddSoldierToSector & OBJECTTYPE::soldierID changed to SoldierID
2024-11-16 20:55:08 +02:00
Asdow
42d5ecb923
HandleLeavingOfEquipmentInCurrentSector() to SoldierID
2024-11-16 20:09:14 +02:00
Asdow
cd720a639a
Fix Dismiss Merc not working after selecting several soldiers
2024-11-16 19:25:44 +02:00
Asdow
d28d46d974
SOLDIERTYPE::bOverrideMoveSpeed to SoldierID
2024-11-16 16:28:48 +02:00
Asdow
edb26a68fe
Guard against array out of bounds access
2024-11-16 16:25:28 +02:00
Asdow and GitHub
1cd94cda23
Fix inventory cloning bug ( #338 )
...
- If we have a sector already loaded (eg. Drassen airport)
- Squad in a different sector encounters enemies and goes to autoresolve
- After pressing DONE in autoresolve screen -> we miss calling the TrashWorld() function in CheckAndHandleUnloadingOfCurrentWorld() due to battle sector not being the same as loaded sector.
- Selected sector gets reset from Drassen airport to invalid values by same function
- Now we have the loaded sector's whole inventory existing in gWorldItems
- Enter any other sector in tactical mode and the gWorldItems gets added into its sector inventory in EnterSector()
Because the TrashItems() work in a way where it only sets gWorldItems elements to not existing if it finds them in a loaded map's structure data, we will pretty much always have that original bugged out set of items present in gWorlItems and they will constantly be added to sector inventories from then on once the bug has been triggered.
2024-11-16 16:05:14 +02:00
Asdow
e7fe1d1cda
Update LaptopSave.h
2024-11-16 11:55:57 +02:00
Asdow
3ff4cc0c19
GENERAL_SAVE_INFO members to SoldierID
2024-11-16 01:22:20 +02:00
Asdow
98c18495c6
Update GENERAL_SAVE_INFO::sContractRehireSoldierID to SoldierID
2024-11-16 00:58:16 +02:00