Commit Graph
69 Commits
Author SHA1 Message Date
Overhaul 03dfd90060 Inscreased speed of window title bar resize for open/close function
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1060 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-16 03:45:41 +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
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 d24bb86686 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@969 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:57:16 +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
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 0530b53b9c bug fixes from Overhaul:
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 13:16:37 +00:00
lalien 61d6152ce5 bug fixes from Overhaul:
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check
- Fixed improper printf field in a debug message 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 22:44:08 +00:00
Wanne a1a3487b2b - bugfix: Text placement in insurance laptop pages in higher resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@863 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-28 19:44:03 +00:00
Wanne a5dd7f7a76 - bugfix: Wrong placement of the terrorists pictures on the files section in the laptop
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@856 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-19 20:11:06 +00:00
SpaceViking 060a09ead0 Code changes to allow more slots for IMPs.
Allow dead IMPs to be replaced.
Add another way to progress in the game (sectors visited).


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@798 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-26 01:47:14 +00:00
lalien 3f37673034 - added VS2005 compability fix from Space Viking
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-10 18:46:57 +00:00
MaddMugsy ff2aa4f8e1 -increased inventory capacity for IMP items doled out in ImpItemChoices.xml
-changed ammo given to IMPs so they have at least two clips for their main gun

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-17 06:13:52 +00:00
Wanne 805e9de8d7 new exe 656
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-18 19:02:29 +00:00
Wanne 358fc9e31c - feature: Added filter buttons for Misc items to Bobby Rays
new exe build (656)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-07 21:03:32 +00:00
Wanne 3d1337ebeb - feature: Added armor filter buttons (helm, vest, legging, plate) to Bobby Rays
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@655 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-07 15:56:55 +00:00
Wanne 5615c2a075 - bugfix: Wrong text placement in the florist gallery website
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@639 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-29 23:49:44 +00:00
Wanne b5601c78d9 updated soldier tooltips
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-12 16:24:53 +00:00
Wanne b53eec588d - reseted IMP activation text box after creating an IMP
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-06 21:09:37 +00:00
Wanne f839dcbe73 - bugfix: CTDs after you have placed your mercs before the attacking occurs
- added notification when you try to create a new IMP and you already have the maxium number of mercs (18) in your team.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-05 21:21:51 +00:00
Wanne 4ae5382557 - bugfix: Got a "misplaced" I.M.P email on day 3
- bugfix: Laptop -> Personnel -> Inventory scroll buttons 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@605 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-24 20:00:12 +00:00
Wanne cdf263093a - build of the new release & update (602)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@602 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-13 12:42:10 +00:00
Wanne 755e811293 - bugfix: Average column in laptop->profiles was not correct calculated
- feature: Moved Auto save to option  screen
- feature: German.Items.xml can now use "Umlaute". It is now correct displayed in the game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@592 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-05 09:58:01 +00:00
Wanne 4341409ded git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@590 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-10-04 12:24:10 +00:00
Wanne c256b0faf8 - Temporary removed the bugfix from version 560, because it is not such a big bugfix so that players need to start a new game. We should enable the bugfix when we make bigger changes to the savegame structure or make a new release (or update) public again. NOW LOADING OLDER SAVEGAMES WORKS JUST FINE AGAIN!
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@561 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-26 13:30:39 +00:00
Wanne 8dc317c136 - bugfix: After loading a savegame the I.M.P. emails always name "Barry Unger". The problem was, that the I.M.P mail changes were not saved.
ATTENTION: YOU HAVE TO START A NEW GAME, BECAUSE THE SAVEGAME-STRUCTURE CHANGED. IT IS NOT POSSIBLE TO LOAD AN OLDER SAVEGAME (AN ERROR WILL OCCUR)!!!!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-26 13:02:10 +00:00
Wanne 0aa610ac40 - bugfix: When loading an I.M.P by nickname or 90210 the voice was not set correct
- feature: Now it is possible to load an I.M.P. even if it has multiple blanks (spaces) in the nickname. E.g. "Mr D 2", "Jack 1", ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@559 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-25 07:55:58 +00:00
Wanne ba83608c40 - bugfix: Wrong chance to hit calculation on RPG rocket launchers
- bugfix: CTD in German version when using auto fire (-> missing German language strings)
- updated German and English language files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@548 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-22 21:10:48 +00:00
Wanne 6f06b9ce78 - bugfix (from build 529): IMPs have wrong voices
- bugfix: Multiple IMPs with same voice causes wrong data and CTDs. Now it is impossible to have multiple IMPs with the same voice. No more invalid IMP data with multiple imps (hopefully) ;)
- You can have a maximum number of 6 imps (3 women and 3 men). All have different voices
- If an IMP is cloned (90210, nickname) an unused voice is set. So we have correct data
- Prevent the user from selecting used voices in the IMP Voice selection screen


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-18 19:31:34 +00:00
Wanne bea62be616 - bugfix: The content of all the IMP analyze emails only show the statistics of last created character
- removed some of my old unused comments

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-17 13:51:20 +00:00
Wanne 18a1d0e519 - bugfix: Getting incorrect data & CTDs when using multiple IMP characters with same voices. Now it is possible to have up to 6 merc with the same voice without getting incorrect data. No more need to use different voices! (IF YOU PLAY WITH MULTIPLE IMPS, YOU SHOULD START A NEW GAME, BECAUSE THE IMP CHARACTERS GAME DATA IS INCORRECT!)
- bugfix: CTD when using Random personality in I.M.P creation
- moved Random personality flag from INI to option screen
- added MAX_IMP_CHARACTERS entry in the ja2_options.ini (Range: 0 - 6)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@528 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-17 07:31:34 +00:00
Lesh 6df124efd7 - code cleanup mostly from Brent Johnson (Nonomori), a very few from me
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-06 19:10:08 +00:00
Wanne f64eaf15d8 - Bugfix: Bobby Rays ammo filter
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@470 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-25 16:27:18 +00:00
Wanne b7efb446e8 - Bugfix: Bobby Ray's Ammo filter was not working properly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@468 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-25 12:36:13 +00:00
Wanne f8582530ab - Bugfix: Bobby Rays Filter buttons
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-21 06:11:00 +00:00
Wanne 0eadcefc0d Bobby Rays Filter Buttons: Removed "Heavy Weapons" filter from ammo, renamed "LMG" to "MG", removed "Ammo" filter from Used items.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-20 19:46:17 +00:00
MaddMugsy 78a7d89dad -fixed BR item display error
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-13 08:09:59 +00:00
Wanne fa0744a0d9 Bobby Rays: Added "Heavy Weapons" Filter to the Guns and Ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@429 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-12 11:41:39 +00:00
MaddMugsy 47c26ccdcf -small tweak to BR fix to disable the notbuyable and itemclass = 0 filter on initial inventory setup so we can add new items later
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-11 19:53:06 +00:00
MaddMugsy 367f4e88fd -added ENABLE_CREPITUS flag to options ini file to enable/disable crepitus even in sci-fi mode
-fixed BR's not stocking things later in game if they were illegal when game started

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@425 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-11 19:29:50 +00:00
Wanne c739efc56e Bobby Ray: Filter Guns, Ammo and Used!
Filters for Armour and Misc will follow

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-11 10:21:36 +00:00
MaddMugsy 13a8319fbb -ammo weights affected by # bullets remaining
-added code to support urban, desert and snow camo

2 issues:

1. Need to test this to make sure it works, since I'm at work.  I'll test it all out tonight.

2. There is no Snow terrain type.  Anyone have any great ideas on how to test for it?

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-03 23:55:44 +00:00
Wanne e96c84cf55 Fix: Correct offsets in laptop zoom in/out animation in all 3 resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-20 17:54:52 +00:00
MaddMugsy d18502accb -fixed mercs complaining about equipment when it's really good
-fixed BR not getting new stock for items with indexes > 1000
-reduced re-ordering times for awesome BR's


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-20 03:36:19 +00:00
MaddMugsy 8c19632c28 -spreadsheet update
-minor BR restock formula change (probably won't matter)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-19 16:39:36 +00:00
MaddMugsy c4c5ddeec1 -fixed BR's not restocking
-fixed 90210 not working
-fixed 8 character IMP names not working

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-18 04:29:26 +00:00
Lesh d38efcb6fa Lesh:
fix: laptop zoom in/out animation now starts/ends in laptop monitor though it doesn't fit into monitor strictly on 640x480 and 1024x768 ( +/- small offset)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-29 20:45:58 +00:00
lalien d390d4a266 - Added menu option to show weapon ranges in tiles/meters
- Allowed to enter tactical view for any visited sector


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@234 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-15 14:22:18 +00:00
lalien 68510dd26d - Added menu option to show/remove item shadow
- fixed menu descriptions

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@233 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-15 11:48:10 +00:00
MaddMugsy 72ad53d95e -removed disk space check because it was pissing me off and coming up with a warning despite the fact that I have 12 GB space free
-changed weapon ranges in tooltips to tiles to match the ranges in the item description screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@231 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-06-14 02:24:57 +00:00