1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,075 Commits 9 Branches 6 Tags
2170bd5b4ee0c462876701f5b4fedff62ec426b0
Commit Graph
1075 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 2170bd5b4e - Bugfix: Fixed incorrect email message text for new custom user merc (uiIndex >= 178), when merc is availabe for business on AIM 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-21 13:47:46 +00:00
ChrisL 75e797f9ae BUGFIX 551: Prior fix would allow items to be auto placed into the wrong sector if you had a sector inventory panel already open. The code should now realize that the wrong sector inventory screen is displayed, close that screen, switch to the correct sector, and then open the sector inventory panel before placing the item into sector inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4573 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-14 16:46:14 +00:00
ChrisL 49a7405861 BUG 551: Items auto placed into world inventory might accidentally be dropped into the wrong sector. Now, when you're on the map screen, the sector inventory panel is closed, and you try to drop something into the world, sector inventory should automatically open so that items can be placed directly to the sector panel. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-14 16:07:41 +00:00
ChrisL af82df815b Corrected Vision Range Bonus display issue on UDB. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-12 19:23:31 +00:00
Wanne 085180af3d BUGZILLA #546: Fixed crash in InitPreBattleInterface() 
- It seems the wrong 2nd parameter was passed to the method call InitPreBattleInterface(), when calling this method from from Dialogue Control.cpp (Line: 933)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-11 11:42:22 +00:00
Wanne 0c8aa89f08 - Bugfix: Disabled the experimental fix from Headrocks HAM 3.2, were enemies with 0 APs can enter the battle 
o This experimental fix caused assertion errors in AddPossiblePendingMilitiaToBattle()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-11 10:39:47 +00:00
Wanne 02f7f2037c BUGZILLA #545: Enlarged font size in 1024x768 for strategy map screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4561 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-07 11:25:16 +00:00
ChrisL 69e0832a88 Bug 540: Fixed issue where CTRL + SHIFT + A was creating full ammo crates without consolidating any ammo. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4553 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-02 06:21:05 +00:00
Wanne fc24d5b2b7 *** Official Update Version: 4552 *** 
- Increased Version number to 4552

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-01 12:00:59 +00:00
Wanne f65f029305 MERGED FEATURE FROM DEVELOPMENT TRUNK: Enlarging Strategy Map (Revision: 4527 - 4534) 
- This feature enlarges the strategy map in 800x600 and 1024x768 (like in Wildfire 6.0)
- You also have to update the GameDir folder from the official SVN GameDir folder with the latest graphics

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-30 14:53:16 +00:00
Wanne 88e98b5023 - Fixed redundant code duplication when initializing SectorNames.xml for foreign (not English) language 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4549 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-30 11:32:01 +00:00
Wanne 73a10dceaf - Singleplayer: Fixed exploit, when it is enemies turn, you can still move when pressing CTRL + L or CTRL + S to open the Save/Load screen and then close the screen without loading/saving 
o I just disabled loading/saving via the load/save screen when it is the enemies turn
o You can still save load via the quicksave slot

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-29 17:35:42 +00:00
Wanne 221bad1406 Multiplayer: Fixed exploit, where a client (which does not currently have the turn) can still move when pressing CTRL + L or CTRL + S to open the Save/Load screen and then close the screen without loading/saving 
o I just disabled loading/saving while in turn based mode in a multiplayer game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-29 17:06:23 +00:00
Wanne 4c098a5097 - Fixed type mistakes (Hardest battle, Surgeries undergone) (thx to Zalpha) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-27 18:01:28 +00:00
Wanne 2cbc52e265 - Fixed "out of memory" crash when loading a savegame with NIV and the wrong "Items.xml" files 
o In my case the ja2 process took ALL the memory (up to 2GB) and then crashed
o The problem is, that the "objectStack.resize(size);" consumes ALL the memory when passing in invalid huge size to the resize method
o The wrong "size" is calculated from the temporary files because of wrong items. Now I added a safety check on the size variable and if out of range ( > 1000) we simply fail loading the savegame instead of letting the ja2 process consume all the memory and then let it crash after a few minutes.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4532 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-25 09:53:40 +00:00
Wanne b932d1accf - Multiplayer Updates: 
o Fixed problem in score screen (stack around variable szPlayerMisses was corrupt)
o Increased connection timeout to 120 seconds, which hopefully avoids the ID_CONNECTION_LOST when trying to connect with high ping
o Fixed wrong message in message box, when clients connection got lost

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4523 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-22 21:20:38 +00:00
inshy 0d661ec0cf Translated new line in Russian lang 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-22 05:27:21 +00:00
ChrisL bf4ae66494 BUGFIX 538 - Added a condition so that if a door is not openable, iChance will be reset to 0 in time for the merc to make the "this is impossible" speech. 
2nd correction.  My fix left iChance uninitialized when the personality modifiers were being applied, meaning they no longer counted.  I've put the iChance initialization back where it was and slightly altered the condition so we simply resent iChance to 0 when the lock is impossible.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 16:54:24 +00:00
ChrisL edf1aaa302 BUGFIX 538 - Added a condition so that if a door is not openable, iChance will be reset to 0 in time for the merc to make the "this is impossible" speech. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4517 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 16:46:35 +00:00
ChrisL 9073f66572 BUGFIX 536 - Fixed it so we don't lose items when attempting to hand an invalid item to an NPC. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4516 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 16:07:49 +00:00
ChrisL 19416a395b BUGFIX 534 - Added code to restrict non-ammo item status to 100. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 15:33:39 +00:00
Wanne f14fa1f66d BUGZILLA #537: Robot can now move through fire/gas tiles without stopping each tile. No need to stop each tile for the robot, because the robot does not get hurt by fire/gas. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 14:26:20 +00:00
Wanne 1252675d7e BUGZILLA #535: Fixed CTD that could occur every day on strategy screen at 08:58 when initializing the inventory for the arms dealer 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 13:18:58 +00:00
Wanne 4b55d692c7 BUGZILLA #539: Formatting of "No funds available" output screwed due to tab char 
o I also moved the hardcoded English text to the proper language text files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4511 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 13:03:56 +00:00
Wanne e51e7399e7 - Bugfix: Removed quest reward points for the WHOLE team after you won the boxing and impressed kingpin, because you gained too much experience if you do the boxing stuff again and again. 
o Now we have vanilla behavior again.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4510 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 12:41:07 +00:00
Wanne 816f697ac2 - Bugfix: Improved previous Bugfix 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-20 21:37:54 +00:00
Wanne beeb01e0b4 - Bugfix: Fixed CTD if weapon doesn't have ubDeadliness set it causes a division by zero and a CTD. (fix by Dougster) 
o Specifically an enemy had binoculars in his hand, and went to pick up a weapon off the ground, and it would crash.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4506 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-20 20:03:35 +00:00
Wanne 4be8c4f88c - Removed unused old files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-17 10:56:48 +00:00
ChrisL 4adeed2f4b BUGFIX 479 - Because GearAimBonus was altering iSightRange during the CTH calculation, it was possible for an apparently visible target to be effected by the SHOOT_UNSEEN_PENALTY. By moving the penalty directly against iChance, this should resolve this. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-14 15:05:36 +00:00
ChrisL d9437117bb BUGFIX 523 - When retreating from combat, the code was designed to add 5 minutes to the game clock. Not sure why. Possibly to resolve an exploit? Anyway, if another travel group had an arrival time within that 5 minute span, an Assertion error would result. This fixes that by removing the 5 minute "retreat charge". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4500 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-14 14:43:30 +00:00
ChrisL 11889ee846 BUGFIX 527 - Corrected weapon placement when 2handed weapon is held in off hand during a successful steal attempt. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4499 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-13 16:47:21 +00:00
ChrisL 2bd354af32 BUGFIX 522 - Coded some popup box position adjustments so that popup boxes can't be drawn off the screen. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-13 16:33:38 +00:00
Wanne 3e5ab3767b - Deleted old and unused VFS folder (project) 
o I forget to delete that, when merging the complete development trunk back into the official trunk

- Deleted old an unused Multiplayer/test_space.* files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4496 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-12 07:42:16 +00:00
Wanne 48a9816f6d - Fixed crash (could not load existing file) in Release version when initializing portrait icons 
o  "VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE" was not set!


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4493 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-12 07:35:08 +00:00
ChrisL ba81d0de5a BUGFIX 526 - Bullet graphic rendering was causing an internal display error when attaching/removing Ammo attachments from the tactical panel. We don't need to actually redisplay the bullet graphic, however, in order to change the text that's on the bullet graphic. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4491 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-09 17:36:58 +00:00
ChrisL a9a88e4642 BUGFIX 525 - Corrected UDB display issue where ammo and RangeBonus are concerned. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-09 16:43:02 +00:00
ChrisL 7ddd54134f removed unnecessary weapons.xml write procedure from the ReadInWeaponStats function. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-09 15:34:57 +00:00
ChrisL b8e5ebcf6c BUGFIX 514 - A vector error in the size of the world inventory was causing a mouse button to be deleted twice resulting in an assertion error. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-07 18:16:56 +00:00
ChrisL 61fac0c0f8 BUGFIX 501 - portraits weren't being re-initialized when changing the TOPTION_SHOW_TACTICAL_FACE_ICONS parameter. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4484 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-07 16:30:51 +00:00
ChrisL 1652167097 BUGFIX 500 - Corrected "equiped" spelling error 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 23:56:35 +00:00
ChrisL 3f9cb6b833 BUGFIX 497 - Aim Level function was not allowing negative aim levels which might initially make sense, but if any modifiers would result in a negative value, we'd end up with an high value which would then get reset by the built in limits. I've recast the variable to an INT8 which will allow negative results, at least prior to the built in limits being applied. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 23:09:16 +00:00
ChrisL 7376ffbb68 BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 22:28:19 +00:00
ChrisL 42a2130043 BUGFIX 484 - Appears that some of the SM Panel pockets were out of alignment by 1 pixel to the right. I'm not sure if this is because of a recent sti alteration or if this has always been the case but the code has been updated to account for the current STI coords. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 21:06:06 +00:00
ChrisL ab7ecb51e6 BUGFIX 482 - Corrected several variable definitions so that large mag capacity is better supported. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4478 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 20:37:23 +00:00
ChrisL 25133e0afe BUGFIX 480 - When disarming a bomb when your inventory is full, the merc actually disarming the bomb will now be the active "ItemPointerSoldier". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 19:44:37 +00:00
Wanne 75b4d43964 - Fixed Tixa problem: When playing Realistic you could go down to underground level where crepitus are 
o When loading such a buggy savegame, we will fix it automatically

- Simplified (reworked) IF-conditions with crepitus

- new define in luaglobal.h: LUA_GAME_INIT_NEW_GAME, LUA_GAME_INIT_NPCS.
o So we can select if we want to use lua script (GameInit.lua) or the hardcoded JA2 stuff

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 19:04:56 +00:00
Wanne bfbe6b0311 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4472 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2011-06-05 07:44:32 +00:00
Wanne da8d90a1b6 - Updated a text from the option screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-03 13:18:24 +00:00
Wanne 7ff31b59b0 BUGZILLA #492: Fixed CTD when switching from IMP page to another web page 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-02 20:52:24 +00:00
Wanne 6b72751538 - Bugfix: Fixed CTD that could occur on enemy soldier pathing 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4466 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-31 19:03:21 +00:00