Commit Graph
1890 Commits
Author SHA1 Message Date
silversurfer 0668d04e1f Bugfix for JaggZilla bug #543
During an interrupt it is not possible anymore to drop the backpack with Shift+B if you are not among the interrupters.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6464 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-02 13:45:19 +00:00
silversurfer cc51c13529 New modifiers for Item Properties
The new Item_Settings.ini is there to host modifiers for item properties in the different XML files. For now it is only used for the Weapon Overheating feature to adjust parameters based on gun class.
It uses the new struct gItemSettings which is populated in function void LoadItemSettings() on game start.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6463 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-02 12:40:08 +00:00
silversurfer bc7b3e2d62 Bugfix for superheated weapons in loaded sector inventory after saving the game (by Moa)
In revision 6434 a bug was introduced where all weapons in a loaded sector would be set to 45000 temperature after the game was saved. This is a temporary fix.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-01 17:31:18 +00:00
Wanne 7b1124a596 Reduces render calls when mouse over compatible item in stash and soldier inventory (highlighting) (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 19:46:59 +00:00
Flugente 3c01b5364e - new item: when planting tripwire roll (Item# 1640), a tripwire item is created, thereby making planting multiple wires much easier. Teipwires can be merged to create a roll
- new item tag: <buddyitem> connects items to other items. Connection specifics depend on items involved

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6455 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 17:06:37 +00:00
silversurfer 2169fbd6a9 New trait modifier for Ranger
POSSIBLE_AIM_CLICK_ADDED_SHOTGUNS was added to adjust the number of aim clicks for shotguns. The default is 1.

Also fixed the broken aim click modifiers for Gunslinger and Sniper.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 16:03:35 +00:00
silversurfer 5fc1ab95a1 Fixed Carmen's terrorist counter
When terrorists had fixed placements in MercProfiles.xml they were not taken into account for the terrorist counter. Now all terrorists count no matter if fixed placement or random placement.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 09:28:05 +00:00
Kriplo f65719e801 Brief: //dnl ch72
- Fixing bad APs deduction when using hand grenades, mortars, rocket launchers, grenade launchers and attached grenade launchers from different stances and need turn to your target.
Details:
- Add APs cost for stance change and turnover for mortar and rocket launchers.
- Rocket launchers cannot be fire from prone any more as there are no animation for that stance.
- Attached grenade launchers now take raise gun cost for launcher instead for gun.
- No more problems with APs for grenades from different stances and turnover, add proper costs for crouch too as someone add animation for that.
- Fix wrong APs deduction for grenade launcher from prone and turnover in general.
- Fix incorrect values for APs cost under throwing/launching cursor.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-27 22:03:42 +00:00
Wanne ebef9b6df3 Bugfix: Repair assignment sub-menu goes out of rendering range (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-27 06:41:49 +00:00
silversurfer 09ea0d8ec2 Changed code for sex in brothel to use the externalized grid numbers.
This change only helps if you use the fixed LUA script in GameDir 1792.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6445 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-26 18:23:29 +00:00
silversurfer 393790f817 Bugfix for game clock mouse region in map screen (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6441 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-25 06:47:17 +00:00
silversurfer a389081a9a Bugfix for crash with empty sector inventory (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-24 20:34:43 +00:00
silversurfer 08f5b05c82 When checking if a gun barrel extender should be damaged and fall off the game will not use item ID GUN_BARREL_EXTENDER anymore because that was tied to item 310.
Instead the game will now use the attachment class AC_EXTENDER. 
With this we can have more extenders that can be damaged and fall off and also other extenders that are not damaged by shooting.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6438 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-24 15:13:56 +00:00
Flugente deb0a65f46 Carried weight percentage can now change on uneven strength points.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6436 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-23 19:29:13 +00:00
Wanne 5df38d5042 Improve loading speed of stash (by Moa)
- improved processing of sector stash (opening/closing)
- improved loading speed of save games
- improved processing of items droped by militia (most noteable after autoresolve)
- and some other code related changes
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/325332/FIX_improve_loading_speed_of_s.html#Post325332

Notes:
removed some functions, still in code so but renamed to *_OLD() because they are from Sirtech and should be kept as I have read in "§18) If possible, we don't just delete the old code, but comment it out (or #ifdef it out) for reference. We delete it only if it's really necessary."

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6434 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-23 06:59:29 +00:00
silversurfer 78b4e784b6 New trait bonus for Ranger
Oops. Forgot to copy two files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-22 18:31:43 +00:00
silversurfer 810df5bce0 New trait bonus for Ranger
FIRING_SPEED_BONUS_SHOTGUNS will reduce the APs needed to fire shotguns. Default is 10 (percent).


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6429 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-22 18:25:57 +00:00
silversurfer f3a36ee7c6 New feature for UDB
It is now possible to see secondary attributes on the general tab for weapons. Just click on the tab a second time.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6428 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-21 16:03:47 +00:00
inshy 6f2c3bc833 French translation by hrvvillers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-21 06:42:24 +00:00
silversurfer 9094283046 Bugfix for advanced repair system
The pSoldier that was passed to the ability check was the owner of the item and not the person that does the repairs.
So no Technician trait on the owner -> no repair...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 19:10:56 +00:00
silversurfer 58f6e2d188 ATTENTION! This requires at least GameDir 1782!
More secondary attributes are now shown on general page of UDB. The following item tags were added:

<Damageable>0
<Metal>1
<Sinks>1
<TwoHanded>1
<BlockIronSight>1

The new icons were added to ItemInfoSecondaryIcons.sti.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6425 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 14:46:06 +00:00
Wanne 8221472bc2 - Externalized Kingpin money sector and Hospital sector (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 08:19:56 +00:00
silversurfer 1e06d2a725 Bugfix for merc availability on M.E.R.C
When loading a savegame mercs that became available automatically where not enabled because they couldn't meet a condition anymore. This condition will not be checked anymore because it is not needed for functionality.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6421 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-19 16:57:53 +00:00
silversurfer 113e54b4b1 Fix for new repair ease display
- tooltip takes into account if MERCS_CAN_DO_ADVANCED_REPAIRS = TRUE/FALSE
- added forgotten tooltip for OCTH
- formatting changes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6420 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 20:03:18 +00:00
silversurfer 6d431cd2e8 ATTENTION! This needs at least GameDir 1777!
Fix and Enhancement for Repair Ease display in UDB

- Repair Ease is now displayed for all items and not only for weapons because other items use the <bRepairEase> tag too
- fixed tooltip display for explosives, half the values didn't show tooltips

There are new icons for repair ease display (ID 34 and 35 in ItemInfoWeaponIcons.sti). The old icon was changed to green color (ID 10).

The colors are used to show if the item is repairable and by whom:

- green for items that can be repaired by anyone
- yellow for items that need a technician or NPC to repair them beyond repair threshold
- red for items that have <Repairable> tag set to 0 in items.xml


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6417 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 18:14:30 +00:00
Flugente 8c643ef6fa Fix: background running speed bonus should only influence walking/running animations
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6416 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 16:57:46 +00:00
Kriplo 5ebe26bc29 Brief: //dnl ch71
- Fix more problems of deducting APs when try to shoot from different stances but need turn to your target.
Details:
- Problems raised after introduction of conditional APs charge in case that you need to rise gun and turn, so charging only higher of this to two value if not prone.
- Another problem is alternative fire mode from hip which is currently allowed only in stand so was missing such condition as well for change scope mode if going down.
- As run into problems from above for our merc, need adopt it to CalcBestShot for AI too.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 09:45:50 +00:00
Flugente fd2202be01 New feature: When more than one merc is selected, they will keep their current formation. This behaviour can be toggled via [CTRL] + [Shift]+ [g].
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6413 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-17 19:16:20 +00:00
silversurfer 3c3383540c Bugfix for laser performance bonus
The brightness modifier was calculated incorrectly. Also changed formula a bit to allow a better range of values.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6411 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-17 14:48:24 +00:00
Wanne b268d330ed - externalized samsite coordinates concerning strategic AI action and Skyrider dialogue (by Buggler)
- minor ENG language tweaks to traits popup help text (by Buggler)
- translated a few missing German Texts in _Ja25GermanText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6410 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-17 14:44:55 +00:00
Kriplo 30cc0160cf Brief: //dnl ch70
- Some APs fixing for throwing knives and backpack, with doing some correction to my previous changes.
Details:
- Do some correction and missing parts to ch58 and ch69.
- Throwing knives will add you bonus for throwing knives to same target as was suppose from v1.12 but never works.
- Fix AI use gun calculation for throwing knives instead for throw.
- Fix incorrect showing and deducting APs when try to shoot from prone with backpack or throw from prone and crouch positions with turning in general.
- Fix cheating when sLastTarget is set just for raise gun in that direction, this was always done after you fire.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6409 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-17 11:33:47 +00:00
Wanne c3d88744b9 - Fixed mouse boundary to game window for multi-monitor setup in full screen mode (vanilla bug) (by Buggler)
- Freed 'Ctrl+y' hotkey in tactical & laptop screen for other uses (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6407 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-16 06:22:00 +00:00
Wanne 0f17320e8f - Fixed placement of money splitting icons in strategic screen for non-standard game resolutions (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6406 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-16 06:16:04 +00:00
silversurfer 2cc6233913 Bugfix for item repair
When ADVANCED_REPAIR was active it wasn't even possible for technicians to repair weapons and armor beyond repair threshold when MERCS_CAN_DO_ADVANCED_REPAIRS was set to TRUE.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6405 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-15 22:43:00 +00:00
Kriplo 569eba300a - small change to ch58 for change facing, so now will first try to turn to last target if exist then to closest enemy.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6404 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-15 18:45:45 +00:00
Kriplo d24b54cb5a Brief: //dnl ch69
- Add alternative fix for CalcBestShot which should remove existing APs problems maybe even create AI deadlier then ever ;-)
Details:
- Existing CalcBestShot simply became inadequate and buggier for so many add ons to game, so compiling with dnlCALCBESTSHOT is alternative option which calculate all turning, stance and raising gun cost for different stances and all available scopes, and after all hoping fix incorrect APs calculation as well, hitrate formula is adapt to 100AP system, also try to optimize a bit to get less AICalcChanceToHitGun calls and to use with different stance decisions.
- From ch58 aiming for burst and autofire was disabled as was causing invalid action handle due to incorrect APs calculation so from now aiming AI also use aiming before bursting.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6403 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-15 15:59:51 +00:00
silversurfer 2e4a12173a Bugfix for target tracking modifier <PercentTargetTrackingSpeed>
The description of this modifier says that "Higher is better."
Before this fix a higher value actually made target tracking worse. Now it should work like it was supposed to be.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-15 11:36:57 +00:00
silversurfer 728f7267e0 Bugfix for item handling
When you click at an item with a valid attachment at the hand cursor the game will no longer move that item to an empty slot and instead open the UDB.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6401 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-13 17:03:56 +00:00
Wanne 2ee80f2be3 Mobile Militia Improvements (by moa)
Each setting in ini now has the effect that the user expects, he now sees the correct restrictions on the map, and is able to adjust manually as neccessary
- RESTRICT_ROAMING = TRUE
activates the manual adjustable restrictions based on exploration and/or conquest.
Any of the following settings can be mixed as you like
- ALLOW_MILITIA_MOVEMENT_THROUGH_EXPLORED_SECTORS = TRUE 
Exploration based: any liberated sector is potentially accessible for mobile militia.
You need to load the map and defeat all enemies. Walking through on strategic view is unsufficient!
- ALLOW_DYNAMIC_RESTRICTED_ROAMING = TRUE
Conquest based: Liberating a town will increase the accessible sector count. 
See Data-1.13/TableData/Map/DynamicRestrictions.XML
- ALLOW_MILITIA_MOVEMENT_THROUGH_MINOR_CITIES = TRUE
Mobile militia can move thru cities where militia training is not allowed(e.g. Tixa, San Mona, Omerta,...)
In earlier versions those cities where allready included in DynamicRestrictions.XML which rendered this setting allmost useless.

NOTE: 
  Older savegames have still the 'gray' sector restriction set.
  Those will be converted to 'red' according to the settings in Ja2_Options.INI on load.

see: http://www.bears-pit.com/board/ubbthreads.php/topics/325133/Re_Fix_Catched_the_mobiles.html#Post325133


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-13 06:32:46 +00:00
Wanne 156c414206 - Updated number of possible load screen hints from 200 to 1000
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6397 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-12 13:06:17 +00:00
Wanne aba5c67ec8 - Improved LoadScreenHint feature
o The load screen hint is now also shown in strategic log and tactical log

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-12 11:09:25 +00:00
silversurfer 6b37cd418b Fixes for inventory handling since revision 6375
I had to remove some pieces of the code because they lead to problems with item stacks and access to UDB.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-11 13:40:07 +00:00
Wanne 604000517e - Improved creature cutscene not playing after liberating 3 mine sectors (by Jazz)
o see also GameDir Rev: 1764

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6388 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-11 07:31:51 +00:00
Kriplo d760d34d7e - somehow lost two condition in previous commit, correct what is missing.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-10 21:02:53 +00:00
Kriplo f5ac5be03f Brief: //dnl ch68
- Magically appeared reinforcements for enemy and militia just turn after they are called from now could be delayed and randomized.
Details:
- Practically all enemy reinforcement which can populate available slots was always appeared next turn after they are called so now we have game settings under "Strategic Gameplay Settings" for fine tunning enemy and militia reinforce entry:
  MIN_DELAY_ENEMY_REINFORCEMENTS enemy reinforcement will arrive minimum this number of turns after they are called, if 0 then is disabled.
  RND_DELAY_ENEMY_REINFORCEMENTS additional random delay added to minimum when reinforcements will arrive after they are called.
  MIN_ENTER_ENEMY_REINFORCEMENTS minimum enemy units which will enter after above delay is over.
  RND_ENTER_ENEMY_REINFORCEMENTS additional random enemy units to appear after passing delay.
  MIN_DELAY_MILITIA_REINFORCEMENTS enemy reinforcement will arrive minimum this number of turns after they are called, if 0 then is disabled.
  RND_DELAY_MILITIA_REINFORCEMENTS additional random delay added to minimum when reinforcements will arrive after they are called.
  MIN_ENTER_MILITIA_REINFORCEMENTS minimum enemy units which will enter after above delay is over.
  RND_ENTER_MILITIA_REINFORCEMENTS additional random enemy units to appear after passing delay.
- After first delay ends any other reinforcement appeared more frequently or if already arrive (but no free slot), they will pop up soon after slot is free.
- Add option NO_REMOVE_RANDOM_SECTOR_ITEMS under "Strategic Gameplay Settings" to prevent permanent random removal of your sector items.
- Add missing function DisplaySectorItemsInfo.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6386 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-10 20:49:49 +00:00
Wanne f65bc9d649 - Bugfix: The mapped LUA function "SectorEnemyControlled" (mapped to l_fEnemyControlled) retrieved the wrong sector from the StrategicMap array
o This fixes the bug, that the creature cutscene was never triggered (because of wrong sector infos)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6385 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-10 13:35:22 +00:00
silversurfer 8b65e37cfd Changed handling of aiming in realtime mode
Before it was not possible to aim in realtime mode because the UI didn't support it. It still doesn't support it but from now on the game will assume that we used the maximum number of aim clicks. Turn based combat is not affected by this.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-10 13:35:03 +00:00
Wanne 7c70b7a6d2 - Fixed hardcoded (not LUA externalized) CheckConditionsForTriggeringCreatureQuest quest trigger (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6383 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-10 07:24:02 +00:00
Wanne a0a409c355 - Fixed compilation error in MapEditor build (by Faalagorn)
o Forgot to add the NEWMUSIC define

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6382 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-09 08:50:44 +00:00
Wanne f05139556f - Disabled the new music externalization code from revision 6296 (by Jazz)
o The new music code is now surrounded by a define called NEWMUSIC
o Jazz will rework the new music code in the future
o For now we have the old music code back, which should fix the mentioned bugs
-> Music in the main menu is starting again from beginning when going from preferences screen back to main menu screen
-> The battle tracks can play only 5-15 second then they start from all over again
-> The win music after tactical battle never run
-> ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6381 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-09 07:01:36 +00:00