1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
2b7f79db94d428968f719396259bd075d5c1fdc5
source/Tactical
T
History
Wanne 2b7f79db94 - Fixed problems with merc faces when doing certain actions. This bug was introduced in revision: 4396 
o Fixes endless loop when clicking on items with explosives and merc starts to talk
o Fixes hidden merc faces
o Fixes wrong merc faces (merc face instead of skull) when merc is dead

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-05-29 16:08:27 +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
****************************************************************************
2011-05-26 11:04:47 +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
****************************************************************************
2011-05-26 11:04:47 +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
****************************************************************************
2011-05-26 11:04:47 +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
****************************************************************************
2011-05-26 11:04:47 +00:00
interface Dialogue.h
**********************************************************
2010-02-28 18:38:52 +00:00
Interface Enhanced.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
Interface Enhanced.h
************************************************************
2011-01-18 09:11:09 +00:00
Interface Items.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
Interface Items.h
****************************************************************************
2011-05-26 11:04:47 +00:00
Interface Panels.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
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
****************************************************************************
2011-05-26 11:04:47 +00:00
Interface.h
****************************************************************************
2011-05-26 11:04:47 +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
- Fixed problems with merc faces when doing certain actions. This bug was introduced in revision: 4396
2011-05-29 16:08:27 +00:00
Items.h
****************************************************************************
2011-05-26 11:04:47 +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
****************************************************************************
2011-05-26 11:04:47 +00:00
Overhead.h
************************************************************
2011-01-18 09:11:09 +00:00
PATHAI.cpp
************************************************************
2011-01-18 09:11:09 +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
************************************************************
2011-01-18 09:11:09 +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
****************************************************************************
2011-05-26 11:04:47 +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
****************************************************************************
2011-05-26 11:04:47 +00:00
Soldier Profile.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
Soldier Profile.h
************************************************************
2011-01-18 09:11:09 +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
****************************************************************************
2011-05-26 11:04:47 +00:00
TeamTurns.h
Merged Multi Player Project into main branch
2008-05-12 08:20:47 +00:00
Turn Based Input.cpp
****************************************************************************
2011-05-26 11:04:47 +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
****************************************************************************
2011-05-26 11:04:47 +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
************************************************************
2011-01-18 09:11:09 +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