Commit Graph
660 Commits
Author SHA1 Message Date
ChrisL 38ee990e9f Bugfix to stop a CTD that could occur if the system inadvertantly tries to stack two money objects that have a 0 uiMoneyAmount amount.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-18 05:21:01 +00:00
ChrisL 2d5c6e2996 Fixed a bug in the "sell all" strategic inventory screen options. Money now gets sold without modification and unreachable items can't accidentally be sold.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-17 16:47:50 +00:00
ChrisL bffdfcc75d Fixed an OIV mode bug where RPCs don't get initial gear at hire.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-16 16:42:43 +00:00
ChrisL 4ccad69873 Updated version number.
Bugfix to resolve a Map Editor problem where you would constantly receive a "Major Version Update" message.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2032 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-15 18:56:39 +00:00
ChrisL 0596b0a553 MadLab fix related to handing him a weapon with attachments.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-15 16:14:14 +00:00
ChrisL 94eee4138c Updated game version to match the most recent SVN gamebranch upload. No idea why I missed this during the rev2013 update.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-15 15:34:56 +00:00
Wanne 9308131d17 - replaced wrong text for ironman in german version in the start new game screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-13 14:35:15 +00:00
ChrisL 4d4536a8ee Fixed an item duplication bug related to the item description window and unloading a weapon.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-11 18:04:29 +00:00
Wanne 104f964760 fixed an exploit where no enemies are present in starting sector: Go to tactical before you hire any merc. Then hire a merc and compress time until merc arrives. Then you arrive in Omerta and no enemies are present. Also the chopper animation was not played.
I simply disabled the "Go to tactical button" if the user has not hired any merc. This eliminates all the "bad" side effects.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1981 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-03 17:49:56 +00:00
ChrisL bbc4447ab6 Fixed a bug that would cause a freeze while in OldInv mode at the very start of the game if you didn't open the tactical inventory panel before trying to open the strategic inventory panel.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-02 21:34:11 +00:00
ChrisL fbf63c8af0 Setup failsafe to block NIV Mode if "Data" is specified as the CUSTOM_DATA_LOCATION.
Setup language specific files to be optional.
Setup code to accept all language specific files for items.xml, pockets.xml and ammostrings.xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1953 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-31 19:02:34 +00:00
ChrisL a7e6b96bbe Build1937
This build includes the "Professional Sniper" skill and changes made to aiming and scopes in the CTH calculation functions.
Modified Sniper skill and "per click" aim bonus functionality.
Added some adjustments to how Scopes effect the CTH calculations.  This should drastically reduce the effectiveness of sniper weapons and scopes, while still leaving them effective at closer ranges.
Adjusted the scope vision bonus so that it plays on range with a minimum attainable reduction equal to the scopes minrange value.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1937 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-29 20:40:40 +00:00
ChrisL bdcc920c63 Build1936
Minor adjustments to some of the rendering functions to grant a bit more control to the code.
Adjusted the mouse areas for key and item popup windows.
Added the pocket capacity indicator to sector inventory when using NewInv mode.
Added the right click option to sector inventory so you can view/manipulate stacks and view item descriptions without first equiping an item.
Updated sector inventory so that capacity values appear in all pockets.  Not just currently filled one.
Updated sector inventory so that newly placed items could be right-clicked on for details.
Increased the mouse region for the various stack popups so there is always room to close the popup without activating the description box.
Fixed a bug in the sector inventory description panel that caused a crash when trying to remove an attachment.
Fixed sector inventory so you can add attachments to weapons.
Fixed some weight issues.
Fixed a crash resulting from right-clicking in sector inventory while Item Desc window was already open.
Fixed the "Active Squad" message so it displays the squad that is actually activated.
Fixed a bug that allowed you to start a new game in NewInv mode while in 640x480 resolution.
Updated the Item Description windows so you can load a gun as well as unload.
Added new CTRL+SHIFT+D hotkey to delete all items in sector.
Added new CTRL+SHIFT+S hotkey to sell all items in sector, assuming you have the ALT+LMB option turned on in your INI file.
Fixed a problem with sector inventory item description where the status did not appear for items that couldn't stack.
Fixed a problem with Nails so he always starts with his leather jacket, even if you don't buy his gear.
Incorporated a failsafe so that NewInv mode can't be selected, nor NIV saves loaded, when no custom data path is set.
Add new IC_BELTCLIP item class.
Update pocket definition restrictions to use bitwise compare.
Add failsafe so that you can't merge LBENODEs.
Reset VC2005 so it doesn't point to a specific drive.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1936 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-29 20:35:03 +00:00
Wanne 2ff5aabf24 - fixed some compilation errors in VS 2003 (but not all)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-27 13:50:06 +00:00
Wanne 50377c2bae - updated _Ja25RussianText.cpp (thx to Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1886 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-13 19:18:09 +00:00
Wanne fab0aae9da Updated _RussianText.cpp (thx to Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1882 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-12 18:33:11 +00:00
Wanne 844c3445aa - translated some missing german texts, added one missing german text string for militia command
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1880 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-11 21:02:22 +00:00
Wanne bf368a0013 - suppressed all the deprecated insecure functions warnings for VS 2005 if you build a Release or MapEditor Version
For Debug version it is already set.
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1878 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-10 19:58:45 +00:00
ChrisL 88619fb555 1877 Release
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-10 17:39:30 +00:00
ChrisL 6d31772abd Altered the pName field from Pockets.xml to a CHAR16 value so it will support multilingual code.
Updated the Pockets.xml reader function so that we can include a german.pockets.xml and russian.pockets.xml (and any other language we eventually choose to support) just like we have with Items.xml.
I moved the "Sold Item" and "Delete Item" phrases to the language specific cpp files.
I updated the SHIFT+N hotkey so that it will now work from the strategic screen.  On tactical it handles the entire team.  On strategic, it handles only the one merc who is currently active.
I fixed a problem with the ALT+W cheat key so that it cycles properly.
I fixed a problem with the backpack buttons where the button key wasn't being properly deleted.  This could sometimes cause an "overload" which would result in a crash.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-09 17:26:55 +00:00
lalien 43ca24dda8 Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-08 15:15:25 +00:00
lalien e16d166277 Changed SVN properties
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-08 14:40:47 +00:00
Wanne 5e5035458a - Improved previous bugfix: If the merc arrives with the helicopter at night (defined in the ja2_options.ini) it was daytime in tactical
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-26 20:28:06 +00:00
Wanne 9649811083 - bugfix: If the merc arrives with the helicopter at night (defined in the ja2_options.ini) it was daytime in tactical
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-26 19:41:45 +00:00
MaddMugsy cb36b3db6d -updated game version
-suppressed soldier action data messages in cheat mode
-enabled enemy / militia ammo choosing to be limited by coolness

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1853 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-26 02:37:23 +00:00
Wanne c49af95ec6 - suppressed all the deprecated insecure functions warnings for VS 2005 if you build a Release veersion
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1852 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-25 19:32:42 +00:00
Wanne f641ba3e32 - new property (ENABLE_CHANCE_OF_ENEMY_AMBUSHES_ON_INSANE_DIFFICULT) for the enemy ambushes which are in the game since the beginning of 1.13 development
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1836 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-24 19:06:52 +00:00
Wanne 41e2bd433c - bugfix: item duplication bug:
You need two mercenaries. You place required item to first mercenary's inventory, 
then you take the item and point cursor with the item at the second mercenary. 
Then you click right mouse button and then left one. 
During the process of giving the item from the first mercenary to the second quickly move the item to the another slot of the inventory. 
As a result of it the item will be given to the second mercenary and the first mercenary will still have it.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1835 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-24 18:04:50 +00:00
Wanne 72b9a847dd - suppressed all the deprecated insecure functions warnings for VS 2005:
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"
- Enabled PLAY_INTRO (defined in ja2.ini) property in source code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1834 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-24 17:55:49 +00:00
lalien 2ed23927f2 - fixes for VS2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-16 16:34:47 +00:00
Wanne 411fdd1584 - bugfix: Bug #79: Creatures are gone if you compress time in strategic and select auto battle
- bugfix: Bug #51: Speck sends wrong mail if any of the 4 new guys (Text, Stogie, Biggens, Gaston) level up.
- added missing description texts for IMP skill rooftop sniping and camouflage (also translated in german and russian)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1796 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-12 18:56:38 +00:00
Wanne 31ba967436 - Intro is always played now (iPlayIntro = 1), until I can update (have write access) the ja2.ini in the GameDir
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-10 07:42:59 +00:00
Wanne e41a905c51 - added a new option in ja2.ini (PLAY_INTRO) + source code where the user can enable or disable the intro.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-10 07:36:22 +00:00
Wanne c55b927f8b - bugfix: Bobby Rays filter buttons (again). Now it should work
- bugfix: Hand to hand combat (knifes, claws, ...) was disabled in auto battle. This was done in revision 51 because of CTDs that always occured there. I enabled hand to hand combat and tested ~50 auto battles. No single CTD. It seems that the CTD has been fixed since revision 51.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-09 09:41:24 +00:00
Wanne df8b135b52 - bugfix (workaround): Most of the Sir-tech credits name were displayed in dark blue color. Now all credits name are set in "dark-white" color regardless of the font color code.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1784 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 17:14:52 +00:00
Wanne 8232957994 - Enabled music in windowed mode (was missing in windowed mode)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 09:37:12 +00:00
Wanne bb1b1eaf7e - bugfix: Filter buttons under used category
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1782 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 07:58:03 +00:00
lalien 56e3a24535 - changed Russian descriptions
- bug fix for bug #50 'Monsters win auto battle'

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1757 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-24 12:39:50 +00:00
lalien 77e2b4e176 - changed Russian descriptions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-15 11:12:06 +00:00
Overhaul 6049e8da5a Added property pages to make it easy to change build language (at least with VS2K5)
Added support for Russian city names and Items
Fixed contract length exploit (hire merc for 2 weeks for the price of 1 day)
Fixed insurance emails repeating when you choose "delete" but then say no
Corrected UTF-8 to wide char translation on Windows platforms (Windows doesn't handle mbstowcs correctly)
Moved UTF-8 to Wide Char translation for item descriptions and names so it happens at XML load time (fix bug that Russian has half the description space)
Fix overflow when combining two items with high counts (such as 200-round boxes of ammo)
Path AI fixes
Fixed issues with non-interruptable animations causing infinite clock
Fixed some issues with soldiers not reaching their plotted destination
Fixed escorted players who were cowering, being unable to move after joining party
Only allow militia to climb roofs if their orders allow them to move
Fix bug where AI might climb the wrong roof on the way to the destination roof
Allow AI who have gone outside their patrol grid, to return to the Grid


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-09 02:08:39 +00:00
lalien 144426e896 - fixed Russian text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1674 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-17 18:18:21 +00:00
lalien 45b492c94a - replaced Russian characters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-14 11:24:32 +00:00
bugmonster c33b00d6ff - additional text moved to _*Text.cpp for localisation purposes
- refined Russian text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-12 18:21:35 +00:00
bugmonster 2ab1e53459 - fixed bug, appearing as overlapping text in insurance web-site on high screen resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-12 18:18:43 +00:00
bugmonster 9d716dcaae - fixed bug when merc cannot automaticly leave the ring after boxing. This happens when SOLDIER_ENGAGEDINACTION flag is set.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-14 16:55:07 +00:00
bugmonster 574b8e3218 - Improved compatibility with different russian JA2 distribs' resources
- International/russian *.npc file format unified, performed conversion on-the-fly
- New 1.13 messages' text moved to Text.h/_*Text.cpp
- Russian translation fixed/refined

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-12 18:40:15 +00:00
Overhaul ed5fb7dec8 Fix infinite recursion for tank sighting. This could have a side effect of causing sight glitches, but that's much better than a stack overflow/CTD.
Added SNIPER orders to soldier debug info screen


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1589 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-09 09:14:41 +00:00
Overhaul 11c4d9648e Added memory leak detection to "new" operator
Prevent merc in slot 0 from disappearing due to errant schedule.  Still need to find and fix schedule though
Prevent attempts to turn or climb roof when soldier collapsed
Fix problems when mortar or RPG randomly assigned to a soldier but cannot be added for whatever reason
Pathing favors beginning path on orthogonal and using as few turns as possible (mostly old behavior).
Prevent interruptions when soldier climbs up, which can cause fall into building just below the target roof position
Fix pauses due to soldiers hurt in previous turn
Fix soldier path not reaching destination when thrown by explosion damage or heavy gunfire
Restore pathing to cave and underground exits
Fix too many AI ending up on the roofs


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-09 09:10:40 +00:00
Overhaul 51539605f5 ADB's fix for wandering shopkeepers and other civs
Fix for medics in autobandage trying to open locked or trapped doors and causing UI lockup due to door open menu popup


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1550 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-25 09:20:28 +00:00
Overhaul a1ac43ee58 Fix for clock problem when dual wield or auto-fire causes a soldier to turn on the first shot but knocks him down on a successive shot
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-23 08:06:02 +00:00