Marco Antonio J. Costa and majcosta
d79a445ad1
remove ATM_BUTTONS_* definitions
2025-10-08 03:07:23 -03:00
Marco Antonio J. Costa and majcosta
b1ccdf4e38
remove unused TransferFundsFromBankToMerc/MercToBank
2025-10-08 03:07:23 -03:00
Marco Antonio J. Costa and majcosta
3af3b3fbbc
remove sATMText[]
2025-10-08 03:07:23 -03:00
Marco Antonio J. Costa and majcosta
86ec94b40a
stop using sATMText for "Insufficient Funds" message
...
it is about to go
2025-10-08 03:07:23 -03:00
Marco Antonio J. Costa and majcosta
395c18c557
remove gsAtmSideButtonText[]
2025-10-08 03:07:23 -03:00
Marco Antonio J. Costa and majcosta
2eff78a2cf
remove scope and fix whitespace in RenderAtmPanel
2025-10-07 23:09:53 -03:00
Marco Antonio J. Costa and majcosta
3d95c47356
refactor UpDateStateOfStartButton
2025-10-07 23:09:53 -03:00
Marco Antonio J. Costa and majcosta
0ebcf0fa06
remove comments
2025-10-07 23:09:53 -03:00
Marco Antonio J. Costa and majcosta
d6166000c9
rename fShowAtmPanelStartButton into something truthful
...
there is no start button, this just controls whether to draw the four
buttons in the Personnel tab of the laptop or not
also get rid of lying comments
also make it static, laptop.cpp doesn't use it at all
2025-10-07 22:59:05 -03:00
Marco Antonio J. Costa and majcosta
08b8d2f04f
remove leftover unused stuff from personnel.cpp
2025-10-07 22:59:05 -03:00
Marco Antonio J. Costa and majcosta
ba2e69d045
remove fATMFlags-dependent code since it is always 0
2025-10-07 22:59:05 -03:00
Marco Antonio J. Costa and majcosta
c9cf34d608
remove unused ATMNumberButtonCallback
2025-10-07 22:59:05 -03:00
Marco Antonio J. Costa and majcosta
be109b71fa
unused RenderRectangleForPersonnelTransactionAmount
2025-10-07 22:59:05 -03:00
Marco Antonio J. Costa and majcosta
690d9e1336
remove unused HandleStateOfATMButtons
2025-10-07 22:59:05 -03:00
Marco Antonio J. Costa and majcosta
3c87ae2724
remove unused code when fShowAtmPanel is FALSE
...
fShowAtmPanel is always FALSE
2025-10-07 22:59:05 -03:00
steph and majcosta
f6ae1a96cd
Some BP, and snitch settings were using wrong mapping
2025-10-07 20:41:24 -03:00
Marco Antonio J. Costa and majcosta
6c96b80afc
Remove unused ATMOther2ButtonCallback
2025-10-07 20:36:22 -03:00
Marco Antonio J. Costa and majcosta
00b5758af1
remove unused ATMOtherButtonCallback
2025-10-07 20:36:22 -03:00
Marco Antonio J. Costa and majcosta
72ab9b0135
Remove unused CreateDestroyATMButton
2025-10-07 20:36:22 -03:00
Marco Antonio J. Costa and majcosta
92813f5ce1
remove unused ATMStartButtonCallback
2025-10-07 20:36:22 -03:00
Asdow
da83c6a557
Fix power gen fan sound
...
* Stop fan sound when switching sector
* Start fan sound when loading a save where current sector is power gen sector
2025-10-06 22:09:39 +03:00
Marco Antonio J. Costa and majcosta
a9dd9d0ca6
fix visual bug introduced by removing DrawMoneyOnScreen
...
AIM profile fees now display correctly for old inventory system as well
2025-10-05 10:54:44 -03:00
Asdow
710941edd3
Dynamically adjust contract box position
...
Create contract renewal box right next to mouse position. Small QoL change to have the box closer.
2025-10-03 23:47:15 +03:00
Asdow
0b0fffa21d
Improve multiselection contract renewal
...
* Contract duration lines are greyed out if the player lacks funds
*Selecting a mix of AIM and other merc types allows renewing contracts for selected AIM mercs
* Multiselection of only mercs whose contracts are not renewable (IMPs, rebels, etc) will have greyed out contract lines
2025-10-03 23:47:15 +03:00
Asdow
e1acf181df
Add FIXME
2025-09-29 11:58:55 +03:00
Asdow
0f8c14e72e
Remove FindSoldierByProfileID_()
...
All the calls where this was used are functionally identical when we just supply UID to the original FindSoldierByProfileID() call with fPlayerMercsOnly set to FALSE
2025-09-29 11:58:55 +03:00
Asdow
ecea18f57c
Add FIXME to l_ActionInProgress
2025-09-29 11:58:55 +03:00
Asdow
e63e936715
Clean up
...
* Removed superfluous for-if loops
* Wrapped function contents inside if(lua_gettop(L)) scopes similar to other, already fixed functions
* Harmonized whitespace
* Added FIXMEs to two unfinished functions
2025-09-29 11:58:55 +03:00
Asdow
a15ed3aceb
Fix l_SoldierGiveItem(lua_State* L)
...
Don't use SoldierID when matching for profile id
2025-09-29 11:58:55 +03:00
Asdow
0cb13650ed
Fix whitespace formatting
2025-09-29 11:58:55 +03:00
Asdow
601ef4dc30
Remove duplicate includes
2025-09-29 11:58:55 +03:00
Asdow
8fa2189a66
Fix schedule compatibility between map versions 7 & 8
2025-09-28 10:35:13 +03:00
Marco Antonio J. Costa and majcosta
cf6cc2a213
Revert "use link-time optimization when creating a release"
...
If this is ever the default, it should be set in the CMakeLists.txt file, not in the CI alone. My bad.
This reverts commit a7b0091a27
2025-09-27 20:02:15 -03:00
Asdow
fb34eb6776
Use SoldierID for checks
2025-09-28 00:34:07 +03:00
Asdow
35984f57d0
Check for valid ubAttacker
2025-09-27 23:57:14 +03:00
Asdow
6c42f222e1
Fix PBI when enemy attacks starting sector in tactical view
...
When enemy attacks the starting sector and player is in tactical view. We go from tactical to strategic screen to show the prebattle interface instead of staying in tactical. The game errors on the sector assert when trying to draw the glowing red locator around the sector just before displaying the prebattle interface.
Normally the sector gets set properly when compressing time for the first time in a new game start but due to UB going into playing the intro video, it skips the call to HandleTimeCompressWithTeamJackedInAndGearedToGo() that would eventually set it. Neither can we rely on setting the sector when initiating the prebattle interface since MapScreenHandle() tries to display the locator before the PBI gets initialized.
2025-09-27 01:01:23 +03:00
Marco Antonio J. Costa and majcosta
e8aedb29d5
show daily discounted costs for 1week and 2week contracts
...
also shorten translations to fit the UI
2025-09-26 02:31:02 -03:00
Marco Antonio J. Costa and majcosta
ffe987061e
remove DrawMoneyOnScreen
...
there's already a function to draw text on the screen. a money amount is
text, so just return a string and print that.
2025-09-26 02:31:02 -03:00
Asdow
1f6e545a39
Make enemy battle sound respect speech volume setting
2025-09-25 23:26:29 +03:00
Asdow
2b9efd3702
Make helicopter sound respect sound effect volume setting
...
Helicopter sound would play upon heli insertion even if sound effects volume was set to 0 in options.
2025-09-25 22:55:33 +03:00
Asdow
f5a7c32bff
Use SoldierID instead of pSoldier
...
ContinueDialogue was possible to be called with pSoldier that isn't null but is not valid pointer to MercPtrs array resulting in debugger catching an illegal memory access.
2025-09-25 22:47:51 +03:00
Marco Antonio J. Costa and majcosta
e14a337e03
Prevent AllowReinforcements from reverting to TRUE regardless of setting whenever you save
2025-09-25 15:27:30 -03:00
Asdow
d21b487884
Fix include filenames
2025-09-25 13:06:18 +03:00
Asdow
a161dcc509
Fix selecting soldiers via right click in editor
2025-09-25 10:17:04 +03:00
Asdow
f3b99edbff
Fix Debug build
2025-09-24 19:21:58 +03:00
Asdow
f47908e033
Fix debug mode defines
...
JA2BETAVERSION gets defined in cmake depending on selected config
2025-09-24 19:21:58 +03:00
Asdow and GitHub
f52ab32952
Merge pull request #331 from 1dot13/ExtraMercs
...
Increased Team Sizes (ITS)
2025-09-24 17:07:51 +03:00
Asdow
82aca548f5
Merge branch 'master' into ExtraMercs
2025-09-24 16:14:10 +03:00
Marco Antonio J. Costa and majcosta
4ec012ce7b
fix bug where combat doesn't end on team retreat
...
fixes issue #498 where retreating from combat in a sector that has a merc
inbound via the airdrop marker causes combat not to end
the reason this fails is that a the inbound soldier counts as being in
the sector being retreated from, even though he isn't
I add a check for `MercPtrs[i]->bInSector` so this doesn't happen
that way the function doesn't leave early and CheckForEndOfCombatMode is
reached
2025-09-11 22:00:32 -03:00
Marco Antonio J. Costa and majcosta
ac59eba898
get rid of unnecessary #defines
2025-09-05 20:31:11 -03:00
Marco Antonio J. Costaandmajcosta
stephandmajcosta
Asdow
