Commit Graph
7616 Commits
Author SHA1 Message Date
Asdow 243e22a8c6 Remove unused includes 2025-11-19 21:11:19 +02:00
Asdow d85643b895 Initialize local variable 2025-11-19 21:11:19 +02:00
Asdow 413eaa08fb Declare compatible functions static 2025-11-19 21:11:19 +02:00
Asdow 08c82aa056 Remove unused local variable 2025-11-19 21:11:19 +02:00
Asdow 03e4898061 Declare compatible functions static 2025-11-19 21:11:19 +02:00
Asdow 6799d68b3c Remove duplicate includes 2025-11-19 21:11:19 +02:00
Asdow 5f6114fed9 Remove unused files 2025-11-19 21:11:19 +02:00
Asdow eace375a3b Remove unused function declaration 2025-11-19 21:11:19 +02:00
Asdow 419f9f3bf5 Remove duplicate includes 2025-11-19 21:11:19 +02:00
Asdow 9e4b819f69 Declare compatible functions static 2025-11-19 21:11:19 +02:00
Asdow 8296bfbf8a Move Handle UI.h include under JA2UB define 2025-11-19 21:11:19 +02:00
Asdow 12250a34ae Remove unused includes 2025-11-19 21:11:19 +02:00
Asdow 9f7b545528 Combine search loops into one
Reduces code duplication and fixes an illegal memory access that was still present.
2025-11-19 13:57:41 +02:00
Asdow f902b01497 Fix ubID underflow
Fixes illegal memory access if we tried to find previous merc and our currently selected one has ubID == 0
2025-11-19 10:12:53 +02:00
Asdow 0bbb01ae87 Fix pTeamSoldier initialization 2025-11-18 17:39:27 +02:00
Marco Antonio J. Costaandmajcosta 4cb1ebac88 fix invalid use of std::wstring in swprintf
fixes #554
2025-11-17 20:57:18 -03:00
AsdowandGitHub 264105071a Load old ObjectData correctly (#553)
* Load old ObjectData correctly

ITS changed ObjectDataStructs::OBJECT_BOMBS_AND_OTHER::ubBombOwner data size from 1 byte to 2 bytes, and it was not taken into account when loading ObjectData
2025-11-11 20:14:46 +02:00
steph-pgandmajcosta 9ce1492651 Add visual muzzle flash for invisible soldiers 2025-10-19 09:42:20 -03:00
steph-pgandmajcosta 7499daf06a Let 'w' allow to look with no extra click 2025-10-15 16:55:54 -03:00
KittyandGitHub 1793fcbb44 Change FAMAS attachment (#210)
* Change bipod attachment of FAMAS to not built-in

* Change default attachment of FAMAS
changed from built-in bipod to bipod
2025-10-15 17:36:01 +02:00
steph-pgandmajcosta 1e1eb88864 Remove extra line 2025-10-14 05:35:40 -03:00
steph-pgandmajcosta 72e586a378 Move visibility check after already included pCorpse check 2025-10-14 05:35:40 -03:00
steph-pgandmajcosta 07dbf9c848 Make 3rd party corpses invisible till they in fov 2025-10-14 05:35:40 -03:00
steph-pgandmajcosta b19efcf1b4 Make disease healing a highest prior 2025-10-13 16:19:44 -03:00
Marco Antonio J. Costaandmajcosta 332b267ae6 use en_US locale instead of user's, fallback to C if not found
most likely every windows install has en_US available, even if in other
languages. if not, bring back the insertcommas function from history, no
biggie
2025-10-11 09:02:11 -03:00
Asdow 584f6b47e6 Supply ProfileID to LUA scripts instead of SoldierID
Lua scripts expect to receive the same profileID value back from l_FindSolderByProfileID() that is supplied to it on the script side. This is a bit suboptimal as we constantly keep searching for the correct soldier on different calls to C++ side with the way it works now.
2025-10-11 11:43:37 +03:00
Marco Antonio J. Costaandmajcosta 219cc6f88d missed one 2025-10-10 17:54:58 -03:00
Marco Antonio J. Costaandmajcosta 8257f2c9df edit remaining default settings
TODO make this have a single source of truth instead of three or four
2025-10-10 17:51:08 -03:00
KittyandGitHub 1fa40c063a Make Acog 4x Combo only available with OAS (#209)
This combo doesn't make much sense in NAS and originaly stems from OAS, so keep it to OAS
2025-10-10 19:05:58 +02:00
kitty624 baa827d96f Make Acog 4x Combo only available with OAS
This combo doesn't make much sense in NAS and originaly stems from OAS, so keep it to OAS
2025-10-10 19:03:12 +02:00
Marco Antonio J. Costaandmajcosta c6fd81d289 Fix discrepant TOPTION values in GameSettings.cpp
Ja2_Settings was supposed to be automatically generated but over time we
started to edit defaults either there or in GameSettings.cpp inconsistently
2025-10-09 21:53:55 -03:00
KittyandGitHub 5b38b63c2d Fix another line in lookup for XML-Edior (#208)
Fix another line in lookup for XML-Edior
2025-10-09 18:57:12 +02:00
kitty624 7cc1ffc8ca Fix another line in lookup for XML-Edior 2025-10-09 18:55:30 +02:00
KittyandGitHub 913257fbda Another fix lookup data XML-Editor (#207)
Fixed wrong open/close
2025-10-09 18:39:42 +02:00
kitty624 ba13c42684 Another iix lookup data XML-Editor
Fixed wrong open/close
2025-10-09 18:36:50 +02:00
KittyandGitHub b22edb581c Fix lookup data for Xml-Editor (#206)
Fix in AttachmentPoints lookup data for XML-Editor
2025-10-09 18:29:05 +02:00
kitty624 03206a6226 Fix lookup data for Xml-Editor
fix in AttachmentPoints lookup
2025-10-09 18:25:22 +02:00
KittyandGitHub f7702e422e Fixed typo
Typo caused duplicate entry for AR57 16
now fixed so that there's the intented entry for AR57 11 and no more duplicate
2025-10-08 22:25:21 +02:00
kitty624 0fef835e9e Fixed typo
Typo caused duplicate entry for AR57 16
now fixed so that there's the intented entry for AR57 11 and no more duplicate
2025-10-08 22:21:39 +02:00
steph-pgandAsdow d98de9e793 Adjust soldier create traits due to demolitions change
Since demolitions no longer affects grenades damage and range grenades
check should be moved to throwing. Keep demolitions trait at lower prior
because it can still be helpful to detect mines
2025-10-08 23:01:46 +03:00
KittyandGitHub ca72893f68 Remove a duplicate entry for Ares M4 Shrike (#204)
Remove a duplicate entry for Ares M4 Shrike
2025-10-08 21:25:28 +02:00
kitty624 3b554c379a Remove a duplicate entry for Ares M4 Shrike 2025-10-08 21:23:19 +02:00
Marco Antonio J. Costaandmajcosta 049981b35f remove now unused functions
we use a single function to turn a number into a money formatted string
now
2025-10-08 05:36:37 -03:00
Marco Antonio J. Costaandmajcosta 1088ffc5b2 prevent shopkeeper interface from adding a second $ 2025-10-08 05:36:37 -03:00
Marco Antonio J. Costaandmajcosta 3d29eff4d8 use FormatMoney everywhere 2025-10-08 05:36:37 -03:00
Marco Antonio J. Costaandmajcosta 0dd32c4670 move FormatMoney to Text Utils 2025-10-08 05:36:37 -03:00
Marco Antonio J. Costaandmajcosta fee56e37e7 better FormatMoney 2025-10-08 05:36:37 -03:00
Marco Antonio J. Costaandmajcosta d79a445ad1 remove ATM_BUTTONS_* definitions 2025-10-08 03:07:23 -03:00
Marco Antonio J. Costaandmajcosta b1ccdf4e38 remove unused TransferFundsFromBankToMerc/MercToBank 2025-10-08 03:07:23 -03:00
Marco Antonio J. Costaandmajcosta 3af3b3fbbc remove sATMText[] 2025-10-08 03:07:23 -03:00