Commit Graph
1861 Commits
Author SHA1 Message Date
lalien 85152e7a05 - replaced NO_SOLDIER with NOBODY
- replaced NO_MAP_POS with NOWHERE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-22 14:54:41 +00:00
lalien f035858e3f - removed breath reduction for soldiers that are not in loaded sector
- added bug fix from build 1240 (fixed freeze in tactical - enemy soldier attempted to throw item at himself (save from pyg))

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1251 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-22 14:29:14 +00:00
AalaarDB 3f6ff281a3 Fix for 1% chance to hit target when distance is > 52
Camo and other effects are taken into account when aiming at a body part
Max Distance Visible is more consistent in being calculated based on the soldier and direction rather than a fixed number

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-21 10:21:56 +00:00
Overhaul c01ba3f6f1 Fix for militia transported to NOWHERE during autoresolve in a different than current sector
INS for overhead map is back!
Weapon CTH at extreme range now calculated with soldier's real sight max


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1237 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-21 07:51:09 +00:00
lalien f4bbb51e07 - reverted the "Fix for chance to hit being 1% at distances > 52" because it removes visibility limit
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1231 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-20 11:40:28 +00:00
AalaarDB dd6c4f56a1 Fix for chance to hit being 1% at distances > 52
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-19 21:25:35 +00:00
Overhaul fccef1faea Fix for AI seeking climb point in toxic gas
Fix for civilians trying to climb the roof to seek noise
Fix for punching and stabbing
Transparent change: Gave names to anonymous structs in OBJECTTYPE


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-18 19:03:20 +00:00
Overhaul c9fb501033 Fix for the "CONT" that won't go away
Fix points calculation in BaseAPsToShootOrStab
Tweaks to inventory, soldier, and merc profile structs
Fix for divide by 0 in CalcBestShot


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1199 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-14 07:48:45 +00:00
Wanne 6b6700ce96 - bugfix: HE Ammo Bug (thx to Callahan)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1195 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-13 18:08:41 +00:00
Overhaul 6ec2c5da7d Initialized many variables
Fix for enemy invasions and reinforcements


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-13 03:39:54 +00:00
Wanne ca8cb7b89a - bugfix: Sometimes if you press with the right mouse button on the radarmap, the overhead map view was not displayed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1173 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-07 22:20:15 +00:00
Wanne ce31084ae7 Removed most of my thousands "WANNE" comments which goes back 2 years when I changed to higher resolutions. These were only internal comments for me, so they didn't include any useful meaning for others.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-07 21:39:23 +00:00
Overhaul 6de05c3fe1 Fix AI deadlock when multiple soldiers occupy the same tile
Fix to reset Pablo so that future thefts can also be punished


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1169 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-07 05:10:05 +00:00
lalien 5926a62a05 - allowed militia to wear camo
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1155 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-05 00:47:19 +00:00
Overhaul c6514b0774 Fix for mouse movement when clicking on mercs. In windowed mode would move the cursor to odd places on screen
Enemy group invasion tactics fixed.  Now reinforcements come from all directions, same as from surrounding stationary reinforcements
Removed shuriken check
Fix for mercs turing lame


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1154 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-04 04:19:18 +00:00
Wanne 2db9c118a2 Added Breath APs fix from Kaiden
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1153 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-03 23:31:44 +00:00
Overhaul b07d18f9f4 Editor: Disable light sprites that are not in bounds. Actually happens in some sectors (ie Drassen)
Editor:  Fix for use of uninitialized variable in undo
Editor:  Fix for clipping bounds that are offscreen (causes crash)
Fix for AP bonus reading from INI
Fix mine indexes when looking for creature infestation of mines
Final (?) fix for militia reinforcements.  Also a change:  If you refuse reinforcements, none will come for the entirety of the battle
Increase size of cover and LOS grids to fit max radius
Fix for uninitialized light level in DistanceVisible
Move CheckForEndOfBattle to end of ReduceAttackBusy, to remove a possible militia invalidate upon promotion
Change the way Alt-L handles reloading


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1142 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-01 08:58:34 +00:00
Overhaul c462fd7744 More detailed error messages for failed saves
Yet another phantom militia fix

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1124 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-26 05:26:38 +00:00
SpaceViking 3e997fa0e1 Don't have monster spit cause fiery explosions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1120 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-25 12:41:40 +00:00
Overhaul b559e8601d Removed an inconsistency between quickload and regular load
Turned on heap checking for debug builds.  *Could cause memory to run low if game runs for extended periods
Fixed assertion message for case where soldier groups try to cross impassible terrain
Fixed inventory memory leak


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1110 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-24 09:14:56 +00:00
SpaceViking 48527d4aa5 Fix problem with items with default attachments not comparing to base items correctly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1109 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-24 06:44:11 +00:00
lalien 4b42b95a8c - fixed memory leak in new inventory
- fixed some variables not being initialized
- fixed swapped parameter in LOS.cpp
- added variable range check in lighting.cpp, the cause of wrong index value still not fixed

 


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-22 01:09:21 +00:00
Overhaul b7859a710f Efficiency improvements for soldier->soldier sighting
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1091 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-21 08:10:00 +00:00
lalien 9e92cefbfa - fixed some variables not being initialized
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1089 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-20 18:16:54 +00:00
lalien 429ca31658 - fixed Ctrl+M not moving items from/to the roof
- fixed Ctrl+S, Ctrl+F, Ctrl+M, Ctrl+R affect not visible items

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-19 14:29:05 +00:00
Overhaul 9d71fc89f0 Massive effort to reign in militia problem. Still has issues :(
Fix:  If only some of mercs go to a lower level (mine, basement, etc) but do not choose to "GO TO SECTOR", sector is still inaccessible from strategic map.  However, watch for triggers that might happen on first visit to a sector, that fail.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1076 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-19 08:33:17 +00:00
Sergeant_Kolja cab825a382 The Bug "pObject corrupted", aka "Toni SKI crash" or 6 Shuriken stacking crash" is triggered for debugging here, but only in _DEBUG build. In Release, nothing is changed. In _DEBUG, the code will DebugBreak() and if no Studio running, it will AsserMsg(). But this happens only if the corruption was _detected_. Not when it has happened :-( It is only a starting point for further excavation, and better than having nothing...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1070 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-17 20:12:29 +00:00
Sergeant_Kolja c75026b151 Fixed two bugs:
1st) Weight Overflow, mostly when calculating Weight of Creature Spit Ammo. This has no Ammo, so the old code calculated accidentally -1.6f, resulting in 0xFFFF integer

2nd) GetAttachmentComboMerge() improved. Now a base item can be merged with _different_ 2nd items to result in _different_ merges. Before, a base item was only able to be merged to _one_ result. F.I. if we want to make a Dart gun from Dart pistol by adding (a buttstock and) wheter a steel tube /or/ a Gun Barrel Extender, the old code wouldn't work for the Gun Barel Extender, since it would never been tested, if there is a Gun Barrel.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1069 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-17 19:59:25 +00:00
SpaceViking a778a657b9 Fixes for more structures not being initialized.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-17 03:07:12 +00:00
SpaceViking cec7853cf9 Fix bug where structure was not being initialized. This caused occasional crashes when dialog with text was displayed.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-17 02:38:05 +00:00
Overhaul 8e75433dd1 Militia and friendly AI now mark mines for OUR side.
Related to above, militia deadlock fixed
Crash if console hasn't been brought up when text is sent to it fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 20:34:43 +00:00
Overhaul 7384ae7268 Newly placed tanks now drag away old wreckage if present
Console line input only backspaces to beginning of line

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1050 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 08:09:59 +00:00
Overhaul 99e45d697e Fix to make soldier continue towards destination if previous path ended with a special move
Re-integrated LUA and console.  Still many things to finish though.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1048 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 04:25:07 +00:00
lalien 0c6b247cf5 - new shortcut: Shift+M moves all items in sector to location of selected merc
- fix for array initialization


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-13 23:32:44 +00:00
Overhaul ec4d1f6e24 Fix to stackable throwables:
Stop assertion failure for stack of 6 throwables.  
Report correct damage and AP for stacked throwables.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-09 11:06:57 +00:00
Overhaul d318885593 Brute force to finally make militia show up when they're supposed to
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1035 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-09 08:58:56 +00:00
Overhaul 1bf50d65f4 Fixed a pathing issue where a soldier would sometimes jump the wrong fence
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1034 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-08 09:29:15 +00:00
Overhaul 6a9a39c096 Fixed animation deadlock when crouched soldier's final destination is to jump a fence.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-08 08:42:11 +00:00
Overhaul d8145755c3 Added window around windowed JA2
Replaced Windows console with freeware console implementation.  Activate in windowed mode with \
Added error and quit if JA2 started in window mode in >16bpp color depth
Fix to enemy sector investigation:  Was deducting from redshirts when elites investigated
Fix AWOL militia (need additional fix to prevent them from being redistributed during after reinforcements)
Fix to tanks to add them in their original spot when a new one cannot be found.  Should modify to remove old wreckage in this case.
AI no longer tries to fire mortar when no room for it
Tanks no longer try to throw knives


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-08 07:02:56 +00:00
lalien 45b0868ace - fixed: shift-R (autoreload) doesnt check if the ammo is accesible/visible
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-04 22:04:12 +00:00
lalien 6cf3fbbe5a - added new militia control command
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-29 21:19:11 +00:00
Overhaul e6024e5151 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2007-06-29 10:40:05 +00:00
SpaceViking 2b59950880 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@971 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 03:00:15 +00:00
Wanne df9d9e6c00 PROJECT CHANGES (already done for VS 2003):
- Added "lua" project folder to the "Additional Include Directories" for each project
- Added "lua51_vs2003.lib" to the "Additional Dependencies" for project "ja2" 
Project should now compile in VS 2003 without any errors.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 18:48:46 +00:00
Wanne 74cd6a21f3 Reverted 2 lines in Tactical/ShopKeeper Interface.cpp, because it did not compile in VS 2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@932 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:44:36 +00:00
SpaceViking 1c1f843449 Fixed error in copying soldier profiles
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@925 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 18:03:00 +00:00
Overhaul 7a27e7105d New attack busy system
Added missing #includes

Added LUA scripting and console

Changed the way tracers are visualized, so they work more like real tracers instead of a light fountain

Fixed signedness of many grid variables used in GetMouseMapPos calls

Fixed enemy weapon choosing:  Sometimes a mortar is chosen but later rejected, but the grenade class was not reset.  Caused assertion failure

Added checks so enemies don't try to chuck RPG grenades with their hands

Now possible to shoot a someone in the head if he's in water

Fixed InitSightArrays to also clear soldier interrupt duel points.  This was causing an assertion failure elsewhere in the code because the interrupt list still had soldiers on it sometimes when this function was called.

Soldiers are much less willing to forfeit their turn over an attempt to use more APs than they have

Removed early setting of muzzle flash.  This would allow enemies to get an interrupt before you even fired.

Fixed item dropping by AI.  If AI tried to drop something while standing it would cause deadlock

Change to greatly speed up closing the sector inventory window in an unloaded sector

Added conditional compile flag to always give robot weapon ready advantage, even for 360 degree sighting


Check builddefines.h for the conditional flags.  Of greatest interest might be LUA_CONSOLE.  This will cause the game to bring up a command console when run.  However this console is severely lacking in many areas.  If anybody knows of an open-source terminal/console that could be used instead, it would be appreciated.  The existing console does bad things when you try to close it, and since it counts as a separate app, it pauses the game while it has focus.

LUA scripting is very limited, basically just proof of concept.  There is one global variable, the Soldiers array.  An array index gives you the soldier in that slot in the currently loaded sector.  The soldier has a few things that can be accessed:  name (short name); fullname (long name); grid (current grid #, can be changed); walkto(grid) (function to walk to another grid); runto(grid) (function to run to another grid)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@924 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 09:01:04 +00:00
lalien e5308f27b3 - externalized game starting time
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-04 18:01:51 +00:00
lalien 76d67f37e9 - removed beta version build define
- allowed helicopter to land in enemy controlled sector
- SHIFT+N now can use goggles attached to the helmet

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-29 11:57:10 +00:00
Sergeant_Kolja 09a26e3155 in ReadInAttachmentComboMergeStats() added a missing fclose plus a missing XML_free
in Items.cpp added unfriendly code to trace + stop the game when pObj is corrupted.
(the corruption comes from somewhere outside the destructed foo!)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-27 12:34:43 +00:00