1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,692 Commits 9 Branches 6 Tags
6ca75431aed49cecd5b8cb7cd0b7afa297fd82ca
Commit Graph
978 Commits
Author SHA1 Message Date
Shadooow ad8edc869e Fixed bug introduced in r9275; not being able to assign mercs to facilities or train militia 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9282 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 20:44:06 +00:00
Sevenfm 0fdaba84f6 World items patch (by Asdow). 
Adds timing logs to savegame function, similar to how we already had in loading a save file. 
Uses a global struct for unloaded sectors' inventory instead of using map item temp files every time unloaded inventory is accessed.
From timing loading and saving functions with a save that has dozens of sectors with hundreds of items each, saving is a little bit slower than before, because map item temp files have to be written to disk just before the save, when that wasn't the case before (from ~0.3 s -> ~0.5s). It is offset by a decrease in loading a game (from ~1.1s -> 0.745s), once an older save is saved at least once. Any unloaded sector inventory access during gameplay is considerably faster and for example the autoresolve lag when militia is using sector equipment is completely gone for me.
Preserves save game compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9277 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-26 01:02:30 +00:00
Sevenfm be14552e32 Prevented the game trying to delete an already deleted button when leaving mapscreen and fixed visual bug for popup boxes drawing in item description box in widescreen UI (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9276 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-25 22:24:53 +00:00
Sevenfm bc8fac5c3e Fix: memset bugs (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9275 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-25 11:25:03 +00:00
Shadooow 24775ee398 Fixed crash when the cheat command to teleport on mapscreen assigned previous sector into sector from which the destination cannot be entered. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9272 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-22 20:08:37 +00:00
Sevenfm 8c59159213 Added "select all" option for strategic movement popup box (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9269 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-20 19:48:56 +00:00
Sevenfm 5282553a8c Stop being able to change assignments of in transit mercs (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9268 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-20 17:48:39 +00:00
Sevenfm abdfd022ae Implements mouse wheel scrolling for switching mercs in strategic map when hovering mouse above teamlist, character inventory and character info panels (by Asdow). 
Simplified the r9266 inventory scrolling and made it obey inverted mouse wheel scrolling direction that is in the options screen (by Asdow).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9267 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 22:05:01 +00:00
Sevenfm f1ba48f51f Added mouse wheel scroll functionality for changing pages in strategic map inventory (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9266 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 19:29:50 +00:00
Shadooow 8e60b4d442 Fix&Revert of previous commit, I messed it up with my other edits in code that are not tested yet. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9264 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 08:03:12 +00:00
Shadooow bbd6b1393f Fixed Daily Expenses to no longer count salary of dead mercs or POW NPCs and RPCs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9263 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 07:53:06 +00:00
Shadooow 5bb4de2484 Fixed bug where kicking out a merc and telling him to drop items in current sector while having that sector map inventory open would fail to move his items into sector inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-15 14:08:41 +00:00
Shadooow 7c40f27359 Dismissing vehicle will drop items in its inventory in current sector without asking. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-14 22:58:32 +00:00
Shadooow 67f62736ed Changed assignment text for destroyed vehicles in merc list. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9256 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-14 22:27:37 +00:00
Shadooow a9fa54e69a Fixed not being able to remove vehicle from merc list. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-14 22:12:18 +00:00
Shadooow 18b21ce561 Fixed bug splitting escort-requiring npc with another merc, who is under that npc in squad list, from existing squad resulting in putting the two into different groups and disallowing to plot movement. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9251 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 03:12:33 +00:00
Shadooow d2ccd4a307 Correction to not disable retreat when ALLOW_SKYRIDER_HOT_LZ is 2 or 3. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9246 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 01:31:08 +00:00
Shadooow a577db2752 Disabled retreat when hot dropping and only center of the map is allowed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9244 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 23:54:17 +00:00
Sevenfm 6a3f5cf29e Fix for the uncertain enemies question mark location in higher resolutions (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9234 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-04 19:59:16 +00:00
Shadooow 038410db4a fix for the new cheat not updating mapscreen automatically 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-02 16:12:23 +00:00
Shadooow e20d0cb134 new cheat/debugging command for mapscreen: CTRL+SHIFT+A will reveal all sectors and enemies 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-02 14:13:02 +00:00
Shadooow e600134786 fixed bug allowing to move robot without soldier having control device if they were both in party where another soldier not chosen to move had the device 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9227 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 20:44:21 +00:00
Shadooow 9737bd9255 fixed bug allowing to plot path with Robot or NPCs that needs to be escorted on their own 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 12:36:03 +00:00
Sevenfm 0cc70519d3 Widescreen UI patch (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-11-21 12:56:27 +00:00
Sevenfm 1ee875be61 New ingame options screen (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-11-17 07:50:20 +00:00
Sevenfm f9cfb5e831 Auto Resolve code: added type change missing from previous commit, fixed some compiler warnings. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-11-01 16:19:17 +00:00
Sevenfm 01a566494e Fix possible signed/unsigned type inconsistency problems in auto resolve code, fix max limit for tries in auto bandage code. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9209 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-11-01 16:09:59 +00:00
Shadooow bd5fc83ef8 fixed gap between the involved table and uninvolved table 
fixed uninvolved header not appearing at all when all mercs were involved

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-30 19:23:03 +00:00
Shadooow 14e963e338 re-enabled the scrolling functionality via mouse wheel on the message scroll bar which got lost due to previous change to message region boundaries 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9203 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 14:34:44 +00:00
Shadooow c9b9652940 reworked the camouflage and weight map regions to be created only on demand 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 13:26:02 +00:00
Shadooow 30b3528956 improved the boundaries of the message area in map screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 12:56:56 +00:00
Shadooow 6d8e11931a fixed negative value passed into PreRandom that could cause game to crash 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9198 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-27 00:21:47 +00:00
Sevenfm a8bace71fc Rebel command balancing (by rftr): 
- most admin actions' effectiveness now scale with town loyalty
- added the ability to spend supplies to raise town loyalty
- fixed arc website dropdown issues
- minor code cleaning in Rebel Command.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-22 09:31:38 +00:00
Sevenfm 8d8f912e1a Fix: ASD deploys tanks if there are any in reserve, instead of prioritizing jeeps (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9190 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-19 07:22:32 +00:00
Sevenfm ff172cc92f fix: follow-up minievents properly wait for the specified time (by rftr) 
fix: money income from rebel command displays properly in finances (by rftr)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9188 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-18 06:15:40 +00:00
Shadooow a3bcfef40a maximum heath of merc on mapscreen will now show in red color if the merc suffered a health loss from critical hit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 23:16:52 +00:00
Shadooow 7f57376f93 pressing ESC while map movement popup box opened will now cancel the box instead of leaving map into tactical mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9186 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 22:37:20 +00:00
Shadooow 9f18ebb382 fix: mercs in a helicopter can initiate movement by clicking in their destination column, like regular on-foot/in-car movement (by rfrt) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 21:58:13 +00:00
Sevenfm 7a7f554908 Fix/change: the hospital now checks for mercs with damaged stats in addition to damaged health. in addition, the hospital now charges money to heal damaged stats (by rftr). 
Minor fixes for quest debug log.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9180 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-15 04:49:17 +00:00
Sevenfm 0a717c2697 Removed option AI_DECISION_INFO. 
Added quest debug logging to Logs\QuestInfo.txt

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-14 08:35:32 +00:00
Sevenfm d3d06bced6 Mercs with the <druguse> tag in their background don't automatically consume drugs/alcohol if they are asleep (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9174 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-05 07:29:05 +00:00
Sevenfm 9ebd4a5137 Bugfix: dissolve all militia groups involved in a battle when it is completed. this fixes bad/immobile militia groups created by safehouses (ARC feature) (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9170 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-04 06:59:37 +00:00
Shadooow 999fc8ac96 improved the graphic of the prebattle table 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9166 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-17 08:50:52 +00:00
Shadooow 79bd483fe4 allowed mouse wheel to work in map screen message log area 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9165 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-10 20:53:57 +00:00
Sevenfm 418cf24039 misc fixes (by rftr): 
- cleaned up warnings in Rebel Command.cpp
- ARC: Draft directive is hidden if volunteer pool option is disabled
- fixed dropdown menu behaviour at the RIS website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-03 05:15:54 +00:00
Sevenfm b7adaf802a Small arc update (by rftr): 
- 2 new directives
- 3 new admin actions
- arc website dropdown fix
- one admin action per region can now be changed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9161 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-01 16:48:13 +00:00
Sevenfm 1828cf252b Fix vs2013 compilation errors (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9155 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-08-25 14:17:08 +00:00
Flugente eca080f0f9 New feature (by rftr): Arulco Rebel Command (ARC) 
Improve you cities and overall campaign by choosing out of several upgrades

Requires GameDir >= r2613

For more info, see https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24884&start=0&

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9153 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-08-22 19:00:09 +00:00
Flugente 58379b84cd Minor code improvements 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9147 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-24 19:16:12 +00:00
Flugente ed82841e3c Fix: when using two guns, both are reloaded on the reload cursor prompt, even if one of them still has ammo. This has been changed so that now only empty guns get reloaded 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9146 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-24 19:15:18 +00:00