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,907 Commits 9 Branches 6 Tags
512717aff93eabaa1a92ac7d007896870fa7e033
Commit Graph
496 Commits
Author SHA1 Message Date
majcostaandGitHub 24425a82b1 More unused stuff removal (#49) 
* More unused stuff removal

delete:
- giant 'metaheaders' (JA2 All.h, Laptop All.h, etc), preferring to add #includes directly where needed
- unused ExceptionHandling and DbMan translation units
- unused WizShare.h, Bitmap.h, trle.h, video_private.h headers

* remove mentions from vc proj files too

* remove preprocessor conditionals for unused definitions

find . -iname '*.h' -o -iname '*.cpp' -exec unifdef.exe -m -UPRECOMPILED_HEADERS -UJA2_PRECOMPILED_HEADERS -UWIZ8_PRECOMPILED_HEADERS -UPRECOMPILEDHEADERS {} ';'

then manually fixed a couple files the tool errored out on

* yes, the comments too

as title
 2023-01-03 15:51:48 +02:00
AsdowandGitHub 08982d92e7 Fix illegal array access (#53) 
Array length was too small when using old skill trait system.
 2022-12-25 17:10:46 +02:00
rftrdevandGitHub 7fb55752fa Fix IMPs having 0 need to sleep (#26) 2022-11-16 23:28:24 -08:00
rftrdev 5000f965e1 Add "Soldier Bounties" mission 2022-10-22 17:54:06 -07:00
Asdow 317f741811 Added assertion with error message to prevent silent crashes/nullptr dereference if loading big item graphics fails. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-16 13:37:08 +00:00
Asdow 9f0a3e03bb Fixed glowing rectangle staying on the screen if one selects an item, clicks Finish button instead of closing inventory pool with checkmark/right click and then goes back to gear selection screen through Attributes screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9392 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-02 07:42:38 +00:00
Asdow 1f095b7d31 Implemented new IMP gear selection interface to replace the dropdown menus. Requires GameDir rev 2652. 
Enrico's letter is forced to the first hired merc in old inventory, similar to new inventory in case a free item pocket is not found.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-01 21:15:34 +00:00
rftr 02a8c48873 fix ARC cashback bug: https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22776&goto=364578&#msg_364578 
also remove incorrect dependency on fAssignTraitsToEnemy for HVT strikes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-15 16:32:07 +00:00
Sevenfm 67d5aeadb0 Additional Laptop files (by sun_alf). 
Example file: https://github.com/sun-alf/BRAINMOD-o/blob/master/Data-BRAINMOD/TableData/Laptop/AdditionalFiles.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-13 10:43:49 +00:00
Sevenfm 6e0a311c4c By default sort AIM names in descending order (original behavior). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-05 18:14:04 +00:00
rftr 746d15a1ba remove magic numbers from the usLimitedToSystem bitflag 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-02 01:11:25 +00:00
Shadooow 033ae4a191 Added two new tags into Items.xml, <FoodSystemExclusive> and <DiseaseSystemExclusive> which prevents specific items to appear without these systems enabled. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-24 05:40:46 +00:00
Shadooow 14ae31c4f1 Partial revert of previous commit from unrelated changes that prevented the build to compile. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9332 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-19 02:41:43 +00:00
Shadooow c3bb1c0da5 Option SHOW_SKILLS_IN_HIRING_PAGE removed and made to be enabled automatically. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9331 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-18 22:05:29 +00:00
rftr 5cfd9660d8 add mousewheel support to the MERC website, similar to AIM's implementation (hover over a merc's face). shift/ctrl modifiers are applied to the mousewheel, just like A/D/left/right keyboard inputs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9329 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-18 05:19:09 +00:00
rftr f63b121ec8 AIM members can now be sorted ascending/descending by name 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9328 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-17 16:33:33 +00:00
Shadooow 0c95fd4f2a Fixed crash in debug mode when opening BR Order Page without any item selected first. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-31 00:29:11 +00:00
Shadooow 44eccb5eab Adds mouse wheel functionality to AIM member page when hovering mouse over the merc photo and for browsing Bobby Rays inventory pages. If mouse is over an item's big picture, 'ctrl' + mouse wheel will allow adding or removing items from shopping cart (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9283 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 22:02:13 +00:00
Sevenfm 5c7959adec Removed duplicate macro (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9231 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-03 23:13:44 +00:00
Sevenfm 36d67602fd Added camouflage bonus to the survival trait (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9193 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-24 09:02:48 +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
Sevenfm 9f787dd73d QOL change: show additional ammo stats at bobby ray's website (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-14 06:40:28 +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
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 960bb2d4ba New feature (by rftr): Mini events are a feature where the player can receive short text blurbs, and pick one of two outcomes. 
Based on game implementations like Gloomhaven (road/city events) or Battletech (travel events).

For more info, see https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24865&goto=363481&#msg_363481

Requires GameDir >= r2599

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9137 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-09 19:38:55 +00:00
Shadooow f71a462445 fix for likes and hates of IMPs characters (not sure it actually is handled for IMP characters, but the previous fix make it to be Barry instead of nobody) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9076 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 12:48:56 +00:00
Shadooow 0c1a74b3d1 fix for newly created IMP characters eye blinking very fast 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9075 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 12:39:55 +00:00
Shadooow 9473f3bd24 fixed regression caused by previous fix that probably prevented IMP chars to recruit npcs and start quests, also fixes same problem of IMP chars above 10th which already had this problem before (values were 0 in MercProfiles.xml, now the values in xml are ignored so it doesn't matter) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9066 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-06 17:20:12 +00:00
Shadooow 2cc6d778ad fixed pressing ENTER and ESC during IMP enter key input when there is a messagebox notifying user he inputted wrong key which resulted in re-appearance of the messagebox or leaving laptop mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-06 15:44:01 +00:00
Shadooow 3ada868111 partial revert of 9063 - less code, same functionality 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-05 06:28:44 +00:00
Shadooow 4a2a1c67d2 better way of handling IMP slot replacements, game will no longer replace dead merc that was not deleted from team - so his name and stats will stay intact in personnel page 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-05 06:08:55 +00:00
Shadooow 4046368bd3 fixed more issues when replacing dead/pow IMP char like statistics and attributes progress not being erased, reverted old code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9062 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-05 05:53:24 +00:00
Shadooow c5df4830ea allowed to replace POW IMP char that was removed from team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9061 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-04 23:08:50 +00:00
Shadooow 54fb8e2862 fix for duplicated items in inventory when replacing dead IMP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9060 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-04 23:07:44 +00:00
Sevenfm 3579d96999 Fixes some old traits not having any popup text or showing "No bonuses" during IMP character creation (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9004 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-05 15:54:31 +00:00
Sevenfm b7cc3bbcf8 Fix for Dynamic Opinions feature not respecting ini setting and not allowing it to be disabled easily (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9002 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-05 03:40:57 +00:00
Sevenfm b6f15b2347 Add robots to enemy groups (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8956 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-03 03:32:40 +00:00
Sevenfm 0abc2bf31f Features by rftr (http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=12557&goto=362288&#msg_362288) 
New option BOBBY_RAY_TOOLTIPS_SHOW_LBE_DETAILS.
Stop Speck from spamming your email when multiple new mercs are available on the same day.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8926 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-01 08:25:59 +00:00
Flugente ce61a0b85b Fix: if no squad name is provided in xml, fall back on hardcoded name 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-15 21:23:53 +00:00
Flugente 93db0bb728 - Fix: assignment not displayed consistently in personnel page 
- Fix: bizarre function

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8863 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-12 16:48:32 +00:00
Wanne dc23302696 Fixed compilation error when trying to compile JA2UB version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8849 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-08 18:46:45 +00:00
Flugente c8627c7234 - Fix: wrong face displayed on insurance website 
- Chg: no insurance payout on suspicious deaths (no enemy presence during merc death, or merc died from friendly fire)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8843 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-05 12:03:44 +00:00
Flugente 8c2c0dd71d Only display IMP gear cost if costs exceed the free amount (IMP_PROFILE_COST), mention the free amount 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8838 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-04 17:30:46 +00:00
Flugente ad59900b3d Fix: individual militia in impassable sectors cannot be dismissed via website 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8837 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-04 14:47:40 +00:00
Flugente 9f167f16c6 Fix: if DYNAMIC_IMP_PROFILE_COST is TRUE, the IMP cost is too high(by sun_alf) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8831 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-30 20:23:25 +00:00
Flugente d33bc9123c Mercs can now have multiple disabilities at the same time. 
The new fSpecialFlagContractDisability tag for diseases adds a disability every time we are infected with the disease, it is used for PTSD.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8826 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-20 15:47:43 +00:00
Flugente b25a4be4e7 Fix: compiler warnings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8814 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-05-30 14:26:16 +00:00
Flugente c5022fa1e5 New feature: turncoats can be created from enemies and ordered to switch sides 
Requires GameDir >= r2535

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=360191&#msg_360191

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8811 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-05-30 00:13:42 +00:00
Flugente 0f44c83b71 Fix: bad colours in Militia Overview 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-05-19 22:35:32 +00:00
Flugente ea1892c788 New feature: factories allows facilities to create items 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=360075&#msg_360075

Requires GameDir >= r2534

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-05-17 20:52:27 +00:00