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
4,604 Commits 9 Branches 6 Tags
3061237e581e12bd92f4fdfb6ac967a6321b0ffb
Commit Graph
105 Commits
Author SHA1 Message Date
Asdow fa8e3113fe Declare function static 2025-11-19 21:11:19 +02:00
Asdow 62fbf90daa Remove unnecessary function declaration 2025-11-19 21:11:19 +02:00
Asdow 10ac8624fe Move ExecuteAdditionalCharacterDialogue defintion before the first call 
This allows us to declare it static
 2025-11-19 21:11:19 +02:00
Asdow 4e60877add Declare compatible functions static 2025-11-19 21:11:19 +02:00
Asdow 740a1a8851 Remove duplicate include 2025-11-19 21:11:19 +02:00
Asdow 55afb83eb2 Move UB specific header under UB #ifdef 2025-11-19 21:11:19 +02:00
Asdow dfd5cfd42e Remove unused includes 2025-11-19 21:11:19 +02:00
Asdow 518f7959aa Remove commented out include 2025-11-19 21:11:19 +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
Marco Antonio J. Costaandmajcosta 3d29eff4d8 use FormatMoney everywhere 2025-10-08 05:36:37 -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
Asdow 82aca548f5 Merge branch 'master' into ExtraMercs 2025-09-24 16:14:10 +03:00
BeatAroundTheBuscherandGitHub ed00830202 Fixes Upper/Lower Casing for include paths (#487) 
* Fixing upper/lower case for includes

types.h, zconf.h and zlib.h were renamed so that global includes like Types.h
are not used.
 2025-08-16 22:01:12 -03:00
Asdow c62d767622 Update to Master 2025-08-08 18:00:31 +03:00
Asdow d9391de58a Fix laptop crush popup text 
Due to additional dialogue flag having the value 8, and UB not having a specific flag for mercs standing up after heli crash, the FindSoldierByProfileID would always find Steroid if he was on the team, and then display the crunched laptop popup text.

Adding a new flag that is checked before we go into that branch in HandleDialogue fixes the issue.
 2025-06-22 12:43:33 +03:00
Marco Antonio J. Costa 4b563fefc8 Slightly clunkier fix for RUSSIAN conditional 2024-12-31 16:28:44 -03:00
Asdow de56f653ec Use SoldierID 2024-11-30 23:47:00 +02:00
Asdow 38b710343a Fix incorrect function argument 2024-11-18 22:38:09 +02:00
Asdow ef9aa1b027 Convert to SoldierID 2024-11-17 22:29:31 +02:00
Asdow 9532fbfe2c Convert to SoldierID 2024-11-17 19:41:34 +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 75deccbc44 Convert SOLDIERTYPE::ubRobotRemoteHolderID to SoldierID 2024-11-15 23:56:26 +02:00
Asdow 131172e41a Convert SOLDIERTYPE->ubPreviousAttackerID to SoldierID 2024-11-15 22:54:44 +02:00
Asdow b98732daa7 Convert gusSelectedSoldier to SoldierID 2024-11-15 19:06:34 +02:00
Asdow 4e253d0ec0 Update Dialogue Control.cpp 
Fix an access to member variable that prevented compilation
 2024-11-09 15:24:10 +02:00
Asdow 10250dc035 Merge branch 'master' into ExtraMercs 2024-11-09 13:44:53 +02:00
Asdow d6a3a27b58 Address review feedback 
* Dialogue control.cpp
* vsurface.cpp
* Event pump.cpp
 2023-10-10 19:53:19 +03:00
Asdow 56a55f1bc4 Use std::queue instead of old custom queue 
implemented in container.cpp
 2023-10-07 18:53:39 +03:00
Asdow 03482ffc3d Merge branch 'master' into ExtraMercs 2023-07-26 13:17:49 +03:00
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
rftrdev feaf9827c9 Set up ASSIGNMENT_REBELCOMMAND 
Hook up Start Mission button
 2022-10-13 11:31:48 -07:00
Asdow 1f0a8f46e8 Import changes from the local SVN working copy 2022-10-10 10:08:44 +03: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
Flugente 3b3abc2bc6 We can play external dialogue lines for NPC merchants via the lua function HandleNPCMerchantQuote(...) 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20611&goto=360388&#msg_360388

Requires GameDir >= r2550.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-17 20:21:39 +00:00
Flugente a48bd9a8a0 Fix: previous fix excluded non-RPCs from dialogue replacement 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8818 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-02 18:37:18 +00:00
Flugente d5d4db6066 Fix: do not call lua dialogue replacement function for RPCs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8817 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-02 17:27:20 +00:00
Flugente 948ad8caf1 Fix: crash after heli landing in UB (by Asdow) 
Fix: unnecessary town initialization in UB (by Asdow)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8816 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-01 20:53:22 +00:00
Flugente c92290155f Character lines can be replaced before playing via HandleReplaceQuote(...) in Overhead.lua. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-02 22:02:04 +00:00
Flugente 8ace6a2954 Added dialogue events for using a lockbomb (ADE_LOCKBOMB) and sniper warning (ADE_SNIPERWARNING) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-01 20:34:46 +00:00
Sevenfm afb0c368b9 Disabled auto fast forwarding for talking faces. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8688 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-08-13 22:00:49 +00:00
Flugente 0f558da7e4 Fix: wrong case marker 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-02-10 16:27:14 +00:00
Flugente 0ab562c29e - Added new additional dialogue events for commenting upon other merc's skill/kills, comment during bandaging 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23604&goto=356522&#msg_356522
- renamed dialogue enum for clarity

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-01-21 19:39:07 +00:00
silversurfer 54d5bb0317 fix (by Sevenfm): some functions ignored the last member of a team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-10-16 11:59:54 +00:00
Flugente 487c21ffdf Removed Sounds/SoundsProfiles.xml and relevant code. If you don't want soundfiles to play for a character, remove or rename those soundfiles, no need for an extra xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-09-29 15:06:37 +00:00
Flugente 494dbc6e69 Store the profile type in the profile structure and remove superfluous code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-09-24 19:36:28 +00:00
Flugente e205697804 Fix: possible underflow in UB code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8605 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-08-28 20:44:16 +00:00
Flugente 887170dda5 New merc (somewhat): Similar to Larry's two personalities, Buns now has an alternate personality as well. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23806&goto=354149&#msg_354149

Requires GameDir >= r2430.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-07-25 20:14:33 +00:00
Flugente a1763f9169 Fix: deleting a face with invalid pointer leads to first mercs having Skyrider's face 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-07-21 21:49:22 +00:00
Flugente d66bdad9e3 - Added a wrapper that takes care of determining the file type of audio files. 
- Fix: 'hit' sounds of non-profile NPCs were not played correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8580 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-07-21 15:02:44 +00:00
Flugente 69aeea0679 New Feature: mp3 audio format is now supported in addition to .wav and .ogg 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8579 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-07-19 21:42:07 +00:00