ChrisL 6f2af55cba Fixed assertion error caused when switching from strategic to tactical with a dead merc in the current team. ...

Fixed a bug where hired RPCs would not get items stored in their gunsling or knife pockets.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2359 3b4a5df2-a311-0410-b5c6-a8a6f20db521

2008-09-23 23:14:49 +00:00

..

AI Viewer.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Assignments.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Assignments.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Auto Resolve.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Auto Resolve.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Campaign Init.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Campaign Init.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Campaign Types.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Creature Spreading.cpp

* fixed bullet artifacts and removal !

2008-05-16 08:36:19 +00:00

Creature Spreading.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Clock.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Clock.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Event Hook.cpp

disabled mp reading of ja2_options.ini to take default values only.

2008-05-26 10:56:45 +00:00

Game Event Hook.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Events.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Events.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Init.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Game Init.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Hourly Update.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Map Screen Helicopter.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Helicopter.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface Border.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface Border.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface Bottom.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Map Screen Interface Bottom.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface Map Inventory.cpp

Fix sector inventory so that right-click closes the panel when ALLOW_SECTOR_DESCRIPTION_WINDOW is FALSE.

2008-09-11 14:57:12 +00:00

Map Screen Interface Map Inventory.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface Map.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Map Screen Interface Map.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface TownMine Info.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface TownMine Info.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Map Screen Interface.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Map Screen Interface.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

mapscreen.cpp

modified mp bobby rays to show inv. also disabled reinforcements in MP

2008-05-25 13:51:05 +00:00

mapscreen.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Meanwhile.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Meanwhile.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Merc Contract.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Merc Contract.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

MilitiaSquads.cpp

* fixed bullet artifacts and removal !

2008-05-16 08:36:19 +00:00

MilitiaSquads.h

- Cleaned up the militia code a bit, boolean logic at midnight with no coffee can be a little sloppy. Re-tested mobile militia/veteran militia changes.

2006-10-02 02:37:26 +00:00

Player Command.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Player Command.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

PreBattle Interface.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

PreBattle Interface.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Queen Command.cpp

- fixed map editor incompatibility with the merged multiplayer code

2008-05-17 21:51:32 +00:00

Queen Command.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Quest Debug System.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Quest Debug System.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Quests.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Quests.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

QuestText.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

QuestText.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Reinforcement.cpp

- bugfix: Exclusive multiplayer condition was missing in AddPossiblePendingMilitiaToBattle()

2008-06-04 05:50:50 +00:00

Reinforcement.h

Fix for mouse movement when clicking on mercs. In windowed mode would move the cursor to odd places on screen

2007-08-04 04:19:18 +00:00

Scheduling.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Scheduling.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic AI.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic AI.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic All.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Event Handler.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Strategic Event Handler.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic Merc Handler.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Merc Handler.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Mines.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Mines.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Movement Costs.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Movement.cpp

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Strategic Movement.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Pathing.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Pathing.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Status.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Status.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Town Loyalty.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Town Loyalty.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

strategic town reputation.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

strategic town reputation.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic Turns.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Turns.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic_2005Express.vcproj

Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor.

2008-09-19 16:27:07 +00:00

strategic.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic.dep

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic.dsp

- Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT

2007-04-25 22:45:10 +00:00

strategic.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic.mak

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic.vcproj

Fixes for VS2003

2008-05-31 11:56:39 +00:00

strategicmap.cpp

Fixed assertion error caused when switching from strategic to tactical with a dead merc in the current team.

2008-09-23 23:14:49 +00:00

strategicmap.h

Updated code to support language specific cities.xml.

2008-08-29 16:12:08 +00:00

Town Militia.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Town Militia.h

bug fixes from Overhaul:

2007-05-09 13:16:37 +00:00

XML_Army.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

XML_Roaming.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00