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

..

Action Items.h

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

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

Air Raid.cpp

**********************************************************

2010-02-28 18:38:52 +00:00

Air Raid.h

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

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

Animation Cache.cpp

Merged New Inventory Project into main branch

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

Animation Cache.h

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Animation Control.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Animation Control.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Animation Data.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Animation Data.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Arms Dealer Init.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Arms Dealer Init.h

************************************************************

2011-01-18 09:11:09 +00:00

ArmsDealerInvInit.cpp

BUGZILLA #535: Fixed CTD that could occur every day on strategy screen at 08:58 when initializing the inventory for the arms dealer

2011-06-21 13:18:58 +00:00

ArmsDealerInvInit.h

Merged New Inventory Project into main branch

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

AStarPathfinder.cpp

Fixes for VS2003

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

AStarPathfinder.h

Merged New Inventory Project into main branch

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

Auto Bandage.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Auto Bandage.h

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

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

BinaryHeap.hpp

Fixed appearance of save game corruption when a game with different inventory set is loaded. Note that such games can still cause odd behavior and CTD's

2007-10-20 08:09:03 +00:00

Boxing.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Boxing.h

**********************************************************

2010-02-28 18:38:52 +00:00

bullets.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Bullets.h

**********************************************************

2010-02-28 18:38:52 +00:00

Campaign.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Campaign.h

************************************************************

2011-01-18 09:11:09 +00:00

Civ Quotes.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Civ Quotes.h

************************************************************

2011-01-18 09:11:09 +00:00

Dialogue Control.cpp

BUGZILLA #546: Fixed crash in InitPreBattleInterface()

2011-07-11 11:42:22 +00:00

Dialogue Control.h

************************************************************

2011-01-18 09:11:09 +00:00

DisplayCover.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

DisplayCover.h

************************************************************

2011-01-18 09:11:09 +00:00

Drugs And Alcohol.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Drugs And Alcohol.h

100AP project integration

2008-11-06 00:46:54 +00:00

End Game.cpp

************************************************************

2011-01-18 09:11:09 +00:00

End Game.h

**********************************************************

2010-02-28 18:38:52 +00:00

Enemy Soldier Save.cpp

*************************************************************************

2010-03-07 11:37:32 +00:00

Enemy Soldier Save.h

Merged New Inventory Project into main branch

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

EnemyItemDrops.cpp

Merged New Inventory Project into main branch

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

EnemyItemDrops.h

- added a militia drop rate to the xml-drop files.obj

2006-08-26 12:28:27 +00:00

Faces.cpp

- Fixed problems with merc faces when doing certain actions. This bug was introduced in revision: 4396

2011-05-29 16:08:27 +00:00

faces.h

- Fixed problems with merc faces when doing certain actions. This bug was introduced in revision: 4396

2011-05-29 16:08:27 +00:00

fov.cpp

**********************************************************

2010-02-28 18:38:52 +00:00

fov.h

**********************************************************

2010-02-28 18:38:52 +00:00

GAP.cpp

Merged New Inventory Project into main branch

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

GAP.H

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

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

Handle Doors.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Handle Doors.h

**********************************************************

2010-02-28 18:38:52 +00:00

Handle Items.cpp

BUGFIX 536 - Fixed it so we don't lose items when attempting to hand an invalid item to an NPC.

2011-06-21 16:07:49 +00:00

Handle Items.h

************************************************************

2011-01-18 09:11:09 +00:00

Handle UI Plan.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Handle UI Plan.h

**********************************************************

2010-02-28 18:38:52 +00:00

Handle UI.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Handle UI.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Interface Control.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Interface Control.h

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

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

Interface Cursors.cpp

**********************************************************

2010-02-28 18:38:52 +00:00

Interface Cursors.h

**********************************************************

2010-02-28 18:38:52 +00:00

Interface Dialogue.cpp

- 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.

2011-06-21 12:41:07 +00:00

interface Dialogue.h

**********************************************************

2010-02-28 18:38:52 +00:00

Interface Enhanced.cpp

BUGFIX 525 - Corrected UDB display issue where ammo and RangeBonus are concerned.

2011-06-09 16:43:02 +00:00

Interface Enhanced.h

************************************************************

2011-01-18 09:11:09 +00:00

Interface Items.cpp

BUGFIX 536 - Fixed it so we don't lose items when attempting to hand an invalid item to an NPC.

2011-06-21 16:07:49 +00:00

Interface Items.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Interface Panels.cpp

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.

2011-06-06 21:06:06 +00:00

Interface Panels.h

************************************************************

2011-01-18 09:11:09 +00:00

Interface Utils.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Interface Utils.h

Merged New Inventory Project into main branch

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

Interface.cpp

- Fixed crash (could not load existing file) in Release version when initializing portrait icons

2011-06-12 07:35:08 +00:00

Interface.h

BUGFIX 501 - portraits weren't being re-initialized when changing the TOPTION_SHOW_TACTICAL_FACE_ICONS parameter.

2011-06-07 16:30:51 +00:00

InterfaceItemImages.cpp

************************************************************

2011-01-18 09:11:09 +00:00

InterfaceItemImages.h

************************************************************

2011-01-18 09:11:09 +00:00

Inventory Choosing.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Inventory Choosing.h

Merged New Inventory Project into main branch

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

Item Types.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Item Types.h

************************************************************

2011-01-18 09:11:09 +00:00

Items.cpp

Bug 540: Fixed issue where CTRL + SHIFT + A was creating full ammo crates without consolidating any ammo.

2011-07-02 06:21:05 +00:00

Items.h

BUGFIX 482 - Corrected several variable definitions so that large mag capacity is better supported.

2011-06-06 20:37:23 +00:00

Keys.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Keys.h

**********************************************************

2010-02-28 18:38:52 +00:00

LOS.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

LOS.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Map Information.cpp

**********************************************************

2010-02-28 18:38:52 +00:00

Map Information.h

**********************************************************

2010-02-28 18:38:52 +00:00

Merc Entering.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

merc entering.h

**********************************************************

2010-02-28 18:38:52 +00:00

Merc Hiring.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Merc Hiring.h

************************************************************

2011-01-18 09:11:09 +00:00

Militia Control.cpp

**********************************************************

2010-02-28 18:38:52 +00:00

Militia Control.h

Editor: Disable light sprites that are not in bounds. Actually happens in some sectors (ie Drassen)

2007-08-01 08:58:34 +00:00

Morale.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Morale.h

************************************************************

2011-01-18 09:11:09 +00:00

opplist.cpp

- Reverted BUGZILLA #338 fix, because the fix lead to problems with enemy soldier opponent count

2011-05-29 10:14:10 +00:00

opplist.h

************************************************************

2011-01-18 09:11:09 +00:00

Overhead Types.h

************************************************************

2011-01-18 09:11:09 +00:00

Overhead.cpp

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.

2011-06-21 14:26:20 +00:00

Overhead.h

************************************************************

2011-01-18 09:11:09 +00:00

PATHAI.cpp

- Bugfix: Fixed CTD that could occur on enemy soldier pathing

2011-05-31 19:03:21 +00:00

PATHAI.H

************************************************************

2011-01-18 09:11:09 +00:00

PathAIDebug.h

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

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

Points.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Points.h

****************************************************************************

2011-05-26 11:04:47 +00:00

QARRAY.cpp

************************************************************

2011-01-18 09:11:09 +00:00

qarray.h

************************************************************

2011-01-18 09:11:09 +00:00

Rain.cpp

Merged New Inventory Project into main branch

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

Rain.h

Fixed appearance of save game corruption when a game with different inventory set is loaded. Note that such games can still cause odd behavior and CTD's

2007-10-20 08:09:03 +00:00

Real Time Input.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Rotting Corpses.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Rotting Corpses.h

**********************************************************

2010-02-28 18:38:52 +00:00

rt time defines.h

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

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

ShopKeeper Interface.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

ShopKeeper Interface.h

****************************************************************************

2011-05-26 11:04:47 +00:00

ShopKeeper Quotes.h

Merged New Inventory Project into main branch

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

SkillCheck.cpp

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.

2011-06-21 16:54:24 +00:00

SkillCheck.h

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

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

Soldier Add.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Soldier Add.h

**********************************************************

2010-02-28 18:38:52 +00:00

Soldier Ani.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Soldier Ani.h

**********************************************************

2010-02-28 18:38:52 +00:00

Soldier Control.cpp

BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed.

2011-06-06 22:28:19 +00:00

Soldier Control.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Soldier Create.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Soldier Create.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Soldier Find.cpp

**********************************************************

2010-02-28 18:38:52 +00:00

Soldier Find.h

**********************************************************

2010-02-28 18:38:52 +00:00

Soldier Functions.h

**********************************************************

2010-02-28 18:38:52 +00:00

Soldier Init List.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Soldier Init List.h

**********************************************************

2010-02-28 18:38:52 +00:00

Soldier macros.h

Fixed the sector inventory so that you can right click to look at an item's description even if you don't have an On Duty merc in the sector. You still need a merc in sector, but they can be involved in another activity where before they also had to be part of an active unit.

2008-08-12 17:09:29 +00:00

soldier profile type.h

BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed.

2011-06-06 22:28:19 +00:00

Soldier Profile.cpp

BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed.

2011-06-06 22:28:19 +00:00

Soldier Profile.h

BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed.

2011-06-06 22:28:19 +00:00

Soldier Tile.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

soldier tile.h

**********************************************************

2010-02-28 18:38:52 +00:00

SoldierTooltips.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Spread Burst.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Spread burst.h

**********************************************************

2010-02-28 18:38:52 +00:00

Squads.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Squads.h

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Strategic Exit GUI.cpp

**********************************************************

2010-02-28 18:38:52 +00:00

Strategic Exit GUI.h

**********************************************************

2010-02-28 18:38:52 +00:00

Structure Wrap.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Structure Wrap.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Tactical All.h

Merged New Inventory Project into main branch

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

Tactical Save.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Tactical Save.h

**********************************************************

2010-02-28 18:38:52 +00:00

Tactical Turns.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Tactical Turns.h

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

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

Tactical_VS2005.vcproj

****************************************************************************

2011-05-26 11:04:47 +00:00

Tactical_VS2008.vcproj

****************************************************************************

2011-05-26 11:04:47 +00:00

Tactical_VS2010.vcxproj

****************************************************************************

2011-05-26 11:04:47 +00:00

Tactical_VS2010.vcxproj.filters

****************************************************************************

2011-05-26 11:04:47 +00:00

TeamTurns.cpp

- Bugfix: Disabled the experimental fix from Headrocks HAM 3.2, were enemies with 0 APs can enter the battle

2011-07-11 10:39:47 +00:00

TeamTurns.h

Merged Multi Player Project into main branch

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

Turn Based Input.cpp

- 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

2011-06-29 17:35:42 +00:00

UI Cursors.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

UI Cursors.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Vehicles.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

Vehicles.h

****************************************************************************

2011-05-26 11:04:47 +00:00

Weapons.cpp

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.

2011-06-14 15:05:36 +00:00

Weapons.h

****************************************************************************

2011-05-26 11:04:47 +00:00

World Items.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

World Items.h

************************************************************

2011-01-18 09:11:09 +00:00

XML_AmmoStrings.cpp

Merged New Inventory Project into main branch

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

XML_AmmoTypes.cpp

- Fixed a few Visual Studio compiler warnings

2009-07-22 21:35:50 +00:00

XML_Armour.cpp

Merged New Inventory Project into main branch

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

XML_AttachmentInfo.cpp

Merged New Inventory Project into main branch

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

XML_Attachments.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_AttachmentSlots.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_BurstSounds.cpp

Merged New Inventory Project into main branch

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

XML_CivGroupNames.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_ComboMergeInfo.cpp

Merged New Inventory Project into main branch

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

XML_CompatibleFaceItems.cpp

Merged New Inventory Project into main branch

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

XML_EnemyAmmoDrops.cpp

Merged New Inventory Project into main branch

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

XML_EnemyArmourDrops.cpp

Merged New Inventory Project into main branch

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

XML_EnemyExplosiveDrops.cpp

Merged New Inventory Project into main branch

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

XML_EnemyItemChoice.cpp

Merged New Inventory Project into main branch

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

XML_EnemyMiscDrops.cpp

Merged New Inventory Project into main branch

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

XML_EnemyNames.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_EnemyRank.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_EnemyWeaponChoice.cpp

Merged New Inventory Project into main branch

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

XML_EnemyWeaponDrops.cpp

Merged New Inventory Project into main branch

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

XML_Explosive.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_HiddenNames.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_IMPItemChoices.cpp

Merged New Inventory Project into main branch

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

XML_IncompatibleAttachments.cpp

Merged New Inventory Project into main branch

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

XML_Launchable.cpp

Merged New Inventory Project into main branch

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

XML_LBEPocket.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

XML_LoadBearingEquipment.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

XML_Magazine.cpp

Merged New Inventory Project into main branch

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

XML_MercStartingGear.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

XML_Merge.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

XML_NewFaceGear.cpp

****************************************************************************

2011-05-26 11:04:47 +00:00

XML_Opinions.cpp

*************************

2010-02-20 15:49:46 +00:00

XML_Profiles.cpp

BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed.

2011-06-06 22:28:19 +00:00

XML_Profiles.h

*************************

2010-02-20 15:49:46 +00:00

XML_Qarray.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_RandomStats.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_RPCFacesSmall.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_SectorLoadscreens.cpp

Merged New Inventory Project into main branch

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

XML_SoundProfile.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_Sounds.cpp

Fixed szSoundEffects definition

2009-03-24 20:41:54 +00:00

XML_SpreadPatterns.cpp

**********************************************************

2010-02-28 18:38:52 +00:00

XML_TonyInventory.cpp

Flexible merchant updates

2010-03-17 02:42:30 +00:00

XML.h

****************************************************************************

2011-05-26 11:04:47 +00:00