1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
60d9fae2b06f3659bf99beeef46af85eb86c8886
source/Tactical
T
History
Wanne 60d9fae2b0 Added new merge type "USE_ITEM_NEW" -> MergeType: 13 (by Sevenfm) 
1.) USE_ITEM_NEW
- It creates new items with firstResultingItemIndex and secondResultingItemIndex (if defined) and deducts 1 point from firstItemIndex's status (for each new item).
- When firstItemIndex's status reaches 0, the item is destroyed.
- With this type of merge, you can use knife on tripwire roll, for example, to get 2 new tripwire items. So you can think of tripwire roll as container for 100 tripwires.
 
  <MERGE>
     <firstItemIndex>299</firstItemIndex>
     <secondItemIndex>1640</secondItemIndex>
     <firstResultingItemIndex>1524</firstResultingItemIndex>
     <secondResultingItemIndex>1524</secondResultingItemIndex>
     <mergeType>13</mergeType>
     <APCost>20</APCost>
  </MERGE>

2) USE_ITEM merge creates secondResultingItemIndex item if defined.
- With this secondResultingItemIndex defined, you can use knife on T-Shirt to get 2 rags.

  <MERGE>
     <firstItemIndex>299</firstItemIndex>
     <secondItemIndex>195</secondItemIndex>
     <firstResultingItemIndex>1022</firstResultingItemIndex>
     <secondResultingItemIndex>1022</secondResultingItemIndex>
     <mergeType>6</mergeType>
     <APCost>20</APCost>
   </MERGE>

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6681 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-05 08:05:27 +00:00
..
Action Items.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
Air Raid.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +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
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Animation Cache.h
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
Animation Control.cpp
Brief: //dnl ch73
2013-10-03 20:22:35 +00:00
Animation Control.h
- Changed jumping hotkey from >Shift+Mouse Button< to >Ctrl+Shift+Mouse Button<
2012-11-26 19:01:25 +00:00
Animation Data.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Animation Data.h
Sandro's feature pack (by Sandro)
2012-08-14 12:19:57 +00:00
Arms Dealer Init.cpp
- UB Improvements / Cleanup (by Jazz)
2013-08-29 11:53:39 +00:00
Arms Dealer Init.h
- UB Improvements / Cleanup (by Jazz)
2013-08-29 11:53:39 +00:00
ArmsDealerInvInit.cpp
Bugfix for JaggZilla bug #566
2013-10-13 14:31:43 +00:00
ArmsDealerInvInit.h
New Feature: The number of merchants has increased, and their values have been externalised.
2012-12-20 01:05:45 +00:00
AStarPathfinder.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
AStarPathfinder.h
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
Auto Bandage.cpp
- Disabled the new music externalization code from revision 6296 (by Jazz)
2013-09-09 07:01:36 +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
- Disabled the new music externalization code from revision 6296 (by Jazz)
2013-09-09 07:01:36 +00:00
Boxing.h
**********************************************************
2010-02-28 18:38:52 +00:00
bullets.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Bullets.h
HAM5.5b2 merged in!
2012-04-10 23:45:46 +00:00
Campaign.cpp
Externalizations (by Buggler)
2013-10-11 06:55:31 +00:00
Campaign.h
New in-game option: Quiet Training -- when on, mercs will not say quotes while training
2012-05-21 19:39:53 +00:00
Civ Quotes.cpp
- Added missing #ifdef ENABLE_ZOMBIES for zombie exclusive code (by Jazz)
2013-12-01 19:17:52 +00:00
Civ Quotes.h
Enemy Taunts Updates (by anv)
2013-11-22 21:50:00 +00:00
Dialogue Control.cpp
Fix: crash due to NULL-pointer
2013-11-25 18:48:04 +00:00
Dialogue Control.h
More buddies/foes (by anv)
2013-10-28 20:02:19 +00:00
DisplayCover.cpp
Fixes (by Sevenfm)
2013-11-22 21:56:06 +00:00
DisplayCover.h
New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.
2013-10-30 23:05:37 +00:00
Drugs And Alcohol.cpp
Fix: no bullet when not targetting a soldier
2013-04-10 22:52:35 +00:00
Drugs And Alcohol.h
- new drug: etorphine (DRUG_TYPE_STUNANDKILL) stuns the user for its duration. Warning: Lethal if overdosed (lethal dose depends on boytype)
2013-04-09 21:03:42 +00:00
End Game.cpp
Fixed (by Buggler)
2013-10-21 12:24:45 +00:00
End Game.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
Enemy Soldier Save.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +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
- New camo handling:
2013-11-11 12:51:33 +00:00
faces.h
changed hardcoded numbers to enums in preparation for total merc number increase
2013-04-30 21:31:04 +00:00
Food.cpp
Fix: food/water consumption background property removed food/water consumption
2013-11-29 18:44:28 +00:00
Food.h
code changes:
2013-04-26 00:54:22 +00:00
fov.cpp
cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman)
2013-05-27 21:01:04 +00:00
fov.h
**********************************************************
2010-02-28 18:38:52 +00:00
GAP.cpp
79. Brief: //dnl ch79
2013-11-29 22:49:48 +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
Fix: crash when using switches connected to doors
2013-05-25 19:19:59 +00:00
Handle Doors.h
**********************************************************
2010-02-28 18:38:52 +00:00
Handle Items.cpp
Explosive improvements and fixes (by Sevenfm)
2013-11-29 07:38:41 +00:00
Handle Items.h
New Feature: Multi-turn actions allow mercs to perform actions intended on a specific gridno over multiple turns. Currently demonstrated on the adding/removing/filling of sandbags.
2013-01-06 03:51:09 +00:00
Handle UI Plan.cpp
Sandro's feature pack (by Sandro)
2012-08-14 12:19:57 +00:00
Handle UI Plan.h
**********************************************************
2010-02-28 18:38:52 +00:00
Handle UI.cpp
- New Feature/exploit enhancement: enter hostile sector with helicopter and land mercs anywhere (see http://www.bears-pit.com/board/ubbthreads.php/topics/327879.html#Post327879)
2013-11-10 19:35:13 +00:00
Handle UI.h
Bugfix: Feature Swap merc faces
2013-09-07 12:10:45 +00:00
Interface Control.cpp
new feature: dynamic flashlights allows usable flashlights
2013-05-03 23:31:28 +00:00
Interface Control.h
new feature: dynamic flashlights allows usable flashlights
2013-05-03 23:31:28 +00:00
Interface Cursors.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Interface Cursors.h
- new feature: items can be applied to other persons
2013-03-27 22:06:26 +00:00
Interface Dialogue.cpp
- New camo handling:
2013-11-11 12:51:33 +00:00
interface Dialogue.h
- Reworked LuaInitNPCs.cpp\h, Luaglobal.cpp\h and few cosmetic changes (by Jazz)
2013-06-30 19:16:35 +00:00
Interface Enhanced.cpp
This revision requires GameDir 1873 to work because of a new icon in ItemInfoAdvancedIcons.sti!!!
2013-11-16 16:55:32 +00:00
Interface Enhanced.h
************************************************************
2011-01-18 09:11:09 +00:00
Interface Items.cpp
Brief: //dnl ch77
2013-11-25 21:44:39 +00:00
Interface Items.h
Added features (by Buggler)
2012-11-05 09:12:14 +00:00
Interface Panels.cpp
New feature for UDB
2013-09-21 16:03:47 +00:00
Interface Panels.h
New feature for UDB
2013-09-21 16:03:47 +00:00
Interface Utils.cpp
New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.
2013-10-30 23:05:37 +00:00
Interface Utils.h
Fix: status bar of attached grenades was shown incorrectly
2013-05-17 18:05:18 +00:00
Interface.cpp
New Feature: Externalized Enemy taunts (by anv)
2013-11-10 08:26:05 +00:00
Interface.h
Updated Enemy Taunts (by anv)
2013-11-28 08:23:03 +00:00
InterfaceItemImages.cpp
1. PItems are now variable, from 3-20 and can be set in JA2Options.ini via NUM_P_ITEMS
2012-05-30 10:19:53 +00:00
InterfaceItemImages.h
1. PItems are now variable, from 3-20 and can be set in JA2Options.ini via NUM_P_ITEMS
2012-05-30 10:19:53 +00:00
Inventory Choosing.cpp
Brief: //dnl ch75
2013-11-03 16:26:30 +00:00
Inventory Choosing.h
- new feature: we can now equip militia with gear from sectors, see http://www.bears-pit.com/board/ubbthreads.php/topics/315664.html#Post315664 for more information
2013-02-23 18:32:55 +00:00
Item Types.cpp
Brief: //dnl ch75
2013-11-03 16:26:30 +00:00
Item Types.h
Added new merge type "USE_ITEM_NEW" -> MergeType: 13 (by Sevenfm)
2013-12-05 08:05:27 +00:00
Items.cpp
Added new merge type "USE_ITEM_NEW" -> MergeType: 13 (by Sevenfm)
2013-12-05 08:05:27 +00:00
Items.h
This revision requires GameDir 1873 to work because of a new icon in ItemInfoAdvancedIcons.sti!!!
2013-11-16 16:55:32 +00:00
Ja25_Tactical.cpp
- UB Improvements / Cleanup (by Jazz)
2013-08-29 11:53:39 +00:00
Ja25_Tactical.h
- UB Improvements / Cleanup (by Jazz)
2013-08-28 17:06:43 +00:00
Keys.cpp
- new feature: backgrounds allow more personalisation of mercenaries
2013-09-03 20:55:33 +00:00
Keys.h
**********************************************************
2010-02-28 18:38:52 +00:00
LOS.cpp
This revision requires GameDir 1873 to work because of a new icon in ItemInfoAdvancedIcons.sti!!!
2013-11-16 16:55:32 +00:00
LOS.h
This revision requires GameDir 1873 to work because of a new icon in ItemInfoAdvancedIcons.sti!!!
2013-11-16 16:55:32 +00:00
Map Information.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Map Information.h
**********************************************************
2010-02-28 18:38:52 +00:00
Merc Entering.cpp
Fix: first gamestart helidrop after starting exe had wrong dropoff gridno
2013-11-12 18:08:45 +00:00
merc entering.h
- New Feature/exploit enhancement: enter hostile sector with helicopter and land mercs anywhere (see http://www.bears-pit.com/board/ubbthreads.php/topics/327879.html#Post327879)
2013-11-10 19:35:13 +00:00
Merc Hiring.cpp
More buddies/foes (by anv)
2013-10-28 20:02:19 +00:00
Merc Hiring.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
Militia Control.cpp
New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.
2013-10-30 23:05:37 +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
More buddies/foes (by anv)
2013-10-28 20:02:19 +00:00
Morale.h
New feature: food system requires mercs to eat and drink in order to survive
2012-07-21 16:41:04 +00:00
opplist.cpp
Updated Enemy taunts feature (by anv)
2013-11-19 07:52:51 +00:00
opplist.h
Updated Enemy taunts feature (by anv)
2013-11-19 07:52:51 +00:00
Overhead Types.h
- Prisoners of war are now spawned in prison sectors. They have fitting dialogue etc. Harming them slightly lowers global loyalty.
2013-03-05 01:02:59 +00:00
Overhead.cpp
- capped physical resistance at 95%
2013-11-29 18:24:08 +00:00
Overhead.h
Changing MAX_NUMBER_PLAYER_MERCS midgame no longer renders savegames unloadable, as the teamsize is stored in the savegame anyway
2013-08-19 23:27:50 +00:00
PATHAI.cpp
Bugfix: AP deduct is different then shown (by Moa)
2013-10-30 19:36:15 +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
Bugfix: AP deduct is different then shown (by Moa)
2013-10-30 19:36:15 +00:00
Points.h
Bugfix: AP deduct is different then shown (by Moa)
2013-10-30 19:36:15 +00:00
QARRAY.cpp
************************************************************
2011-01-18 09:11:09 +00:00
qarray.h
************************************************************
2011-01-18 09:11:09 +00:00
Rain.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +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
RandomMerc.cpp
Bugfix: "Merc Random Stats Feature" (by Jenilee)
2013-12-03 21:14:58 +00:00
Real Time Input.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Rotting Corpses.cpp
- New camo handling:
2013-11-11 12:51:33 +00:00
Rotting Corpses.h
upon decapitating or gutting, a knife may take damage
2013-03-24 18:56:09 +00:00
rt time defines.h
Improve loading speed of stash (by Moa)
2013-09-23 06:59:29 +00:00
ShopKeeper Interface.cpp
Reworked Encyclopedia (by Moa)
2013-10-31 11:42:05 +00:00
ShopKeeper Interface.h
- new feature: we can now equip militia with gear from sectors, see http://www.bears-pit.com/board/ubbthreads.php/topics/315664.html#Post315664 for more information
2013-02-23 18:32:55 +00:00
ShopKeeper Quotes.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
SkillCheck.cpp
More buddies/foes (by anv)
2013-10-28 20:02:19 +00:00
SkillCheck.h
Zombie Update (by Flugente)
2012-06-02 15:50:54 +00:00
SkillMenu.cpp
Skill Menu target marker did not refresh correctly
2013-11-05 18:18:36 +00:00
SkillMenu.h
New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.
2013-10-30 23:05:37 +00:00
Soldier Add.cpp
- capped physical resistance at 95%
2013-11-29 18:24:08 +00:00
Soldier Add.h
**********************************************************
2010-02-28 18:38:52 +00:00
Soldier Ani.cpp
Updated Enemy taunts feature (by anv)
2013-11-19 07:52:51 +00:00
Soldier Ani.h
**********************************************************
2010-02-28 18:38:52 +00:00
Soldier Control.cpp
- capped physical resistance at 95%
2013-11-29 18:24:08 +00:00
Soldier Control.h
mercs entering combat via air who do not have the 'airdrop' background receive a penalty on their interrupt level
2013-11-25 19:43:07 +00:00
Soldier Create.cpp
- New camo handling:
2013-11-11 12:51:33 +00:00
Soldier Create.h
cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman)
2013-05-27 21:01:04 +00:00
Soldier Find.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +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
- Fixed a few compilation warnings (uninitialized variables, ...)
2013-07-29 09:15:21 +00:00
Soldier Init List.h
- Prisoners of war are now spawned in prison sectors. They have fitting dialogue etc. Harming them slightly lowers global loyalty.
2013-03-05 01:02:59 +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
New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.
2013-10-30 23:05:37 +00:00
Soldier Profile.cpp
Extended "Merc Random Stats Feature" (by Jenilee)
2013-12-03 10:14:15 +00:00
Soldier Profile.h
Fix: usBackGround is now UINT16 (was UINT8) to accommodate more than 255 backgrounds.
2013-10-19 20:45:05 +00:00
Soldier Tile.cpp
Fixes (by Moa)
2013-10-19 12:47:53 +00:00
soldier tile.h
**********************************************************
2010-02-28 18:38:52 +00:00
SoldierTooltips.cpp
Reworked Encyclopedia (by Moa)
2013-10-31 11:42:05 +00:00
Spread Burst.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Spread burst.h
**********************************************************
2010-02-28 18:38:52 +00:00
Squads.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Squads.h
MERGED source code from development trunk revision 4545 up to latest current revision 4882
2012-01-18 11:19:01 +00:00
Strategic Exit GUI.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Strategic Exit GUI.h
**********************************************************
2010-02-28 18:38:52 +00:00
Structure Wrap.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
Structure Wrap.h
- AI controlled soldiers can now jump through windows
2012-11-11 05:31:41 +00:00
Tactical All.h
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
Tactical Save.cpp
- New camo handling:
2013-11-11 12:51:33 +00:00
Tactical Save.h
Brief: //dnl ch75
2013-11-03 16:26:30 +00:00
Tactical Turns.cpp
- somehow lost two condition in previous commit, correct what is missing.
2013-09-10 21:02:53 +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
Extended "Merc Random Stats Feature" (by Jenilee)
2013-12-03 10:14:15 +00:00
Tactical_VS2008.vcproj
Extended "Merc Random Stats Feature" (by Jenilee)
2013-12-03 10:14:15 +00:00
Tactical_VS2010.vcxproj
Extended "Merc Random Stats Feature" (by Jenilee)
2013-12-03 10:14:15 +00:00
Tactical_VS2010.vcxproj.filters
Extended "Merc Random Stats Feature" (by Jenilee)
2013-12-03 10:14:15 +00:00
Tactical_VS2013.vcxproj
Extended "Merc Random Stats Feature" (by Jenilee)
2013-12-03 10:14:15 +00:00
Tactical_VS2013.vcxproj.filters
Extended "Merc Random Stats Feature" (by Jenilee)
2013-12-03 10:14:15 +00:00
TeamTurns.cpp
mercs entering combat via air who do not have the 'airdrop' background receive a penalty on their interrupt level
2013-11-25 19:43:07 +00:00
TeamTurns.h
Merged Multi Player Project into main branch
2008-05-12 08:20:47 +00:00
Turn Based Input.cpp
Hotkey Updates (by Buggler)
2013-12-02 20:14:14 +00:00
UI Cursors.cpp
-Fix for throwing explosives with attachments (by Sevenfm)
2013-11-12 11:46:45 +00:00
UI Cursors.h
****************************************************************************
2011-05-26 11:04:47 +00:00
Vehicles.cpp
Externalizations (by Buggler)
2013-10-17 14:49:52 +00:00
Vehicles.h
Vehicle data is no longer saved and loaded into savegames, as it was externalised to xml a long time ago
2013-05-24 14:25:47 +00:00
Weapons.cpp
Updated Enemy taunts feature (by anv)
2013-11-19 07:52:51 +00:00
Weapons.h
This revision requires GameDir 1873 to work because of a new icon in ItemInfoAdvancedIcons.sti!!!
2013-11-16 16:55:32 +00:00
World Items.cpp
Explosive improvements and fixes (by Sevenfm)
2013-11-29 07:38:41 +00:00
World Items.h
Explosive improvements and fixes (by Sevenfm)
2013-11-29 07:38:41 +00:00
XML_AmmoStrings.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
XML_AmmoTypes.cpp
Fix: AMMOTYPE::highExplosive was sometimes interpreted as an item number, sometimes as boolean, and sometimes a an index over explosives. It is now treated as an item number
2013-06-16 15:05:41 +00:00
XML_Armour.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_AttachmentInfo.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_Attachments.cpp
************************************************************
2011-01-18 09:11:09 +00:00
XML_AttachmentSlots.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_Background.cpp
- capped physical resistance at 95%
2013-11-29 18:24:08 +00:00
XML_BurstSounds.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
XML_CivGroupNames.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
XML_Clothes.cpp
New feature: clothes items allow colouring of your mercs. See http://www.bears-pit.com/board/ubbthreads.php/topics/310208.html#Post310208 for more information.
2012-09-16 02:57:45 +00:00
XML_ComboMergeInfo.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_CompatibleFaceItems.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
XML_Drugs.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
XML_EnemyAmmoDrops.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_EnemyArmourDrops.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_EnemyExplosiveDrops.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_EnemyItemChoice.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_EnemyMiscDrops.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_EnemyNames.cpp
************************************************************
2011-01-18 09:11:09 +00:00
XML_EnemyRank.cpp
- Optimized a few code bits
2012-11-15 00:03:39 +00:00
XML_EnemyWeaponChoice.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_EnemyWeaponDrops.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
XML_Explosive.cpp
New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.
2013-10-30 23:05:37 +00:00
XML_Food.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
XML_HiddenNames.cpp
************************************************************
2011-01-18 09:11:09 +00:00
XML_IMPItemChoices.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_IncompatibleAttachments.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
XML_ItemAdjustments.cpp
Various fixes/improvements (all by Moa):
2013-09-05 17:42:19 +00:00
XML_Launchable.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
XML_LBEPocket.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_LBEPocketPopup.cpp
HAM5.5b2 merged in!
2012-04-10 23:45:46 +00:00
XML_LoadBearingEquipment.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_LoadScreenHints.cpp
added missing parser file
2013-04-25 20:42:46 +00:00
XML_Magazine.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_Merchants.cpp
Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
2013-02-07 22:25:53 +00:00
XML_MercStartingGear.cpp
*** MERGED source code from development trunk revision 4890 up to latest current revision 5105 ***
2012-03-23 18:46:54 +00:00
XML_Merge.cpp
100AP project integration
2008-11-06 00:46:54 +00:00
XML_NewFaceGear.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
XML_Opinions.cpp
increased number of merc opinions to 255
2013-04-16 22:34:49 +00:00
XML_Profiles.cpp
Fix: usBackGround is now UINT16 (was UINT8) to accommodate more than 255 backgrounds.
2013-10-19 20:45:05 +00:00
XML_Profiles.h
*************************
2010-02-20 15:49:46 +00:00
XML_Qarray.cpp
- Bugfix: Fixed the problem with not initialized merc quotes
2012-04-03 08:46:59 +00:00
XML_RandomItem.cpp
- Fix: random items > 200 were not read
2013-03-21 23:13:39 +00:00
XML_RandomStats.cpp
Improved Random Stats Feature (by Buggler)
2013-05-10 20:36:15 +00:00
XML_RPCFacesSmall.cpp
************************************************************
2011-01-18 09:11:09 +00:00
XML_SectorLoadscreens.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
XML_SoldierProfiles.cpp
Fix: CIV_NAMES_VALUES were overwritten after reading
2013-06-30 16:48:43 +00:00
XML_SoundProfile.cpp
************************************************************
2011-01-18 09:11:09 +00:00
XML_Sounds.cpp
Forgot to commit the source changes in the last commit. Sorry. So, here they are.
2013-04-14 15:54:56 +00:00
XML_SpreadPatterns.cpp
significantly cleaned up includes (by IoP)
2013-05-02 22:42:08 +00:00
XML_Taunts.cpp
Updated Enemy Taunts (by anv)
2013-11-28 08:23:03 +00:00
XML_TonyInventory.cpp
Flexible merchant updates
2010-03-17 02:42:30 +00:00
XML_Vehicles.cpp
cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)
2013-05-27 20:38:52 +00:00
XML.h
- Bugfix: Fixed initialization error of enemy taunts. The file was not found in the new location (TableData\EnemyTaunts\EnemyTaunts.xml), because the game looked in the old one (TableData\EnemyTaunts.xml)
2013-11-28 16:06:51 +00:00