SpaceViking
ac41de3515
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@972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 03:01:57 +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
SpaceViking
1ff6f798c3
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@970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:57:50 +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
SpaceViking
183ee2005f
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@968 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:56:45 +00:00
SpaceViking
88b9b38bd6
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@967 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:56:15 +00:00
Wanne
4d51fbcdd9
PROJECT CHANGES (already done for VS 2003):
...
- Changed "Runtime Library" from "lua" project to "Multi-threaded Debug (/MTd)" so we get rid of "Linker Warning LNK4098" in project "ja2"
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@940 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 19:42:03 +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
lalien
e78b4ea242
- fix for Russian version
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@934 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 15:47:03 +00:00
lalien
5299427465
- added project and lib files for Lua
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:58:34 +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
lalien
639987007d
- renamed lib file
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:36:34 +00:00
Overhaul
611205b8f6
Corrected LUA console define
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@928 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 08:48:01 +00:00
lalien
536f4ca51b
- reverted some files from build 924
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 21:38:54 +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
SpaceViking
8ed1ff9d6e
Fixes for array indexing problems when there are no best thrown/best gun
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@922 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 03:04:30 +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
Wanne
eebe112427
new exe build (911)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@912 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-31 08:31:22 +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
Wanne
bd22863e45
- bugfix: If merc is in crouched stance and he passes an item to another merc, he did not change his direction
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-23 18:41:42 +00:00
Wanne
4effa1c3ea
- new: Merged source code of item throwing animation in crouched stance, AI was not changed (look for comments marked <SB>)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@890 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 18:09:15 +00:00
Wanne
d61f4ff935
- new exe build (888)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:59:40 +00:00
Wanne
76cf1684f1
- new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (INI-Switch: USE_EXTERNALIZED_LOADSCREENS)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@887 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:29:52 +00:00
Wanne
2ee08ea1c0
- bugfix: Automated scrolling if you talk to someone in small maps (e.g: Rebel Basement) in high resolution (1024x768)
...
- bugfix: Scrolling problem in radar map in small maps (e.g: Rebel Basement) in high resolution (1024x768)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-14 16:07:06 +00:00
lalien
9b89749d8f
- fix for Russian version
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@874 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-11 20:07:47 +00:00
Wanne
5661efc75b
- new exe build (872)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 20:38:22 +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
lalien
8e80a6168a
bug fixes from Overhaul:
...
- roof inaccessible tiles problem
- AI hang while deciding on an action (fire 0 rounds on auto)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 15:10:29 +00:00
lalien
30cc546c09
bug fixes from Overhaul:
...
- CTD when someone fell off the west side of a building
- Assertion failure when Skyrider leaves a sector where a merc cannot be woken up
- Boxing fixes: Opponent no longer "seeks cover", ie jumps back out of the ring; no longer will pick up a gun from the ground while boxing
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 14:42:28 +00:00
Wanne
91016c3d6c
- reverted: Reverted the changes from version 856, because I think this leads to the graphical glitches with tooltips in Strategy screen. But I'm not sure if it is the problem ...
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@864 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-28 20:03:41 +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
lalien
60b6b85801
Strategic AI changes:
...
- Removed Omerta from the list of "unimportant" sectors (Estoni and San Mona still "unimportant")
- Allowed queen to attack Omerta before day 2 at 7:45AM and Drassen before day 3 at 6:30AM
- The reinforcements are not reassigned anymore when the sector where they were going to is captured by player
- Omerta garrison is not reassigned anymore when queen fortifies cities
- Enabled investigation of lost city sector by the enemy
*Limit for the investigation of the sector depends on difficulty level (4, 8, 12 and unlimited on INSANE)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-27 21:30:59 +00:00
AcyForsythe
d8ed7117f0
- Adding XML_Roaming.cpp to project
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@860 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-27 20:52:43 +00:00
AcyForsythe
48c5a4e1ab
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@859 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-25 22:50:42 +00:00
AcyForsythe
e95a6463ad
- Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@858 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-25 22:46:27 +00:00
AcyForsythe
f9fe75d5e7
- Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@857 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-25 22:45:10 +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
lalien
a17a3f7cc8
- New feature: Remove attachments and unload all weapons in sector (Shift+F)
...
- Fix for grenade launchers (allow reloading with valid ammunition only)
- Fix for stacking items in sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-19 09:28:28 +00:00
SpaceViking
198d1fe9d3
Code for "new way to progress" (visiting sectors)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@843 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-09 01:02:46 +00:00
lalien
0eb7e55a52
- Added translation table for Russian characters
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@839 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-07 15:26:43 +00:00
SpaceViking
0ca9624e95
Enable .ini setting to disable stealing
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@838 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-07 03:39:47 +00:00
MaddMugsy
682d33da8c
-minor fix to allow different types of GL grenades to be attached to the grenade panel and the ALICE pack
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@830 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-04 02:38:33 +00:00
SpaceViking
1baf9b0bd1
Better handle missing .ini entries for IMP slots
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-02 00:50:19 +00:00
lalien
1ef4419b0d
- Fixed misspelling of function names
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@822 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-01 10:37:34 +00:00
Wanne
68f05b3e6b
new exe build (820)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-01 10:09:59 +00:00
Wanne
abee009cf7
- bugfix: the roof CtH bug also affected the numerical CtH display on pressing "F" (fixed by AndroidXP)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-01 09:14:17 +00:00
lalien
6d117f5c06
- Added rooftop CtH fix from AndroidXP
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@812 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-30 18:08:32 +00:00