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
1,011 Commits 9 Branches 6 Tags
91087ca8c019e3f534a9774706f4f09e1379d210
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 91087ca8c0 ************************************************************ 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 09:11:09 +00:00
Wanne 44e1646410 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3753 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2010-10-08 17:21:14 +00:00
Wanne e4a9cb5785 - Improved Bugfix for grenade throwing range on Big Maps 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3525 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-06-07 09:24:27 +00:00
Wanne ef24311ac6 - Fixed a bug with grenade and item throwing range that was introduced in revision 3488 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-06-03 22:11:49 +00:00
Wanne 025c3742b4 - Bugfix: Chinese Version crashed on start (problem with font initialization) 
- Bugfix: Assertion erro if "ja2_settings.ini" was not present
 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-13 18:11:35 +00:00
Wanne 6608673e3c - New EXE Release (Build: 3356) 
- New Map Editor (Build: 3356)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-07 18:50:35 +00:00
Wanne 0081c0ec51 - New EXE Release (Build: 3356) 
- New Map Editor (Build: 3356)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-07 18:49:56 +00:00
Wanne 09ad70f868 ************************************************************************* 
** Merged source code from development (MP+BMP) trunk (Revision: 3352) **
** https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP    **
*************************************************************************

1 (Rev. 3343)
Changes:
	Control hardcoded list of unclickable ("bad") sectors via XML file. (by Realist)
	On the strategic map, the player cannot click or highlight specific
	sectors (e.g. A4, A5). Introduce a <BadSector> tag in MovementCosts.xml
	that flags a sector as "bad". (<BadSector>1</BadSector>)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Map Screen Interface Map.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic Movement Costs.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/mapscreen.cpp
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/TableData/Map
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/TableData/Map/MovementCosts.xml
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/TableData/Map
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/TableData/Map/MovementCosts.xml

2 (Rev. 3344)
Changes:
	Move hardcoded underground sectors initialization to Lua script file. (by Realist)
	Locate "initunderground.lua" at data-xyz\scripts ("xyz" subject to change).
	Lua script allows easily adding underground sectors at arbitrary locations and defining enemy garrisons and creature population.
	Also enables underground bloodcat population.
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Campaign Init.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Campaign Types.h
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Queen Command.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic AI.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic_2005Express.vcproj
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic_VS2008.vcproj
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/UndergroundInit.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/UndergroundInit.h
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/strategicmap.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Soldier Init List.cpp
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/Scripts
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/Scripts/initunderground.lua
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/Scripts
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/Scripts/initunderground.lua

3 (Rev. 3345)
Changes:
	Bugfix: In Method CreateDestroyMouseRegionsForFacilityAssignmentMenu() (by Headrock)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Assignments.cpp

4 (Rev. 3346)
Changes:
	Changed order of properties in GameSettings.cpp (by Headrock)
	HAM 3.6 fixes (by Headrock)
	Sorted Data-1.13\ja2_options.ini (by Headrock)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/GameSettings.cpp
	/branches/Wanne/JA2 1.13 MP/Build/GameSettings.h
	/branches/Wanne/JA2 1.13 MP/Build/Laptop/BobbyRGuns.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Assignments.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/MilitiaSquads.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Strategic Mines.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Strategic/Town Militia.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Campaign.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Interface Enhanced.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Interface Items.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Items.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Items.h
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Overhead.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Soldier Control.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Soldier Profile.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Weapons.cpp
	/branches/Wanne/JA2 1.13 MP/Build/TileEngine/Explosion Control.cpp
	/branches/Wanne/JA2 1.13 MP/GameDir/Data-1.13/Ja2_Options.INI
	/branches/Wanne/JA2 1.13 MP/GameDir/INIEditorJA2Options.xml

5 (Rev. 3347)
Changes:
	Bugfix: Turns out that the program is saving the number of used Placement Slots to the temp file fine, 
	but if that number is equal to the limit of how many enemies/civvies are allowed in a sector by the INI settings, 
	it leads to an assertion error instead when trying to re-load that sector. (by Headrock)
	Re-ordered Data/Ja2_Options.INI (by Headrock)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Enemy Soldier Save.cpp
	/branches/Wanne/JA2 1.13 MP/GameDir/Data/Ja2_Options.INI

6 (Rev. 3348)
Changes:
	Translated missing HAM 3.6 German Texts (by systemfehler)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Utils/_GermanText.cpp

7 (Rev. 3351)
Changes:
	PlusAI 1.0 Patch (by Headrock)
Files:
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Points.cpp
	/branches/Wanne/JA2 1.13 MP/Build/Tactical/Points.h
	/branches/Wanne/JA2 1.13 MP/Build/TacticalAI/Attacks.cpp
	/branches/Wanne/JA2 1.13 MP/Build/TacticalAI/DecideAction.cpp
	/branches/Wanne/JA2 1.13 MP/Build/TacticalAI/FindLocations.cpp
	/branches/Wanne/JA2 1.13 MP/Build/TacticalAI/ai.h

8 (Rev. 3352)
Changes:
	Bugfix: The DEBUG only setting "fEnableInventoryPoolQ" is now only enabled in a DEBUG version. In all other builds it is set to FALSE.
Files:
	/branches/Wanne/JA2 1.13 MP/Build/GameSettings.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-07 11:37:32 +00:00
Wanne 4f1fb9dc6b - New EXE Release Build (3342) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3342 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-01 18:54:54 +00:00
Wanne 14750c6903 ********************************************************** 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-28 18:38:52 +00:00
Wanne a98c44ac78 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3336 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2010-02-28 08:35:46 +00:00
Wanne 7024919b15 - Added missing HAM 3.6 texts to GermanText.cpp 
- Updated ChineseText.cpp (by zwoo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3329 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-24 10:16:22 +00:00
Wanne da4bef0a4a - Fixed return values in FindAnyAwakeTrainers() and FindAnyAwakeTrainees() 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 22:31:13 +00:00
Wanne c45a64ee33 - Added missing language text strings for HAM 3.6 
- Search for "TODO.Translate" 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 16:47:14 +00:00
Wanne f010769397 ************************* 
* HAM 3.6 (by Headrock) *
*************************
- Info: Needed GameDir files for HAM 3.6 are not committed yet to the SVN GameDir. Will do that in the next few days
- For more infos on HAM 3.6 check out: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=244808&page=0&fpart=1


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 15:49:46 +00:00
Wanne 53821fcf49 Various Bugfixes by Headrock: 
- Fixed: NPC and PC movement errors
- Fixed: Boxers in San Mona do not leave the boxing ring after the fight
- Fixed: Darren does not pay the cash after you won the boxing fight 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-18 19:16:57 +00:00
Wanne c8bf95490a Cover Patch (by CptMoore) 
- Removed a line of code which fiddled with chance to hit calculation.
- Cover Display now works correctly with multiple enemies.
- Cover Display has no problems with stance anymore.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-02 12:41:02 +00:00
Wanne b3dd563694 - Bugfix: Enhanced IMP Creation: When choosing female, after leaving color choosing, the "email" button is removed. That's because the code tries to remove a button which do not exist (for big/small body) so it grabs the first one around (fixed by Sandro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3307 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-11-24 14:59:40 +00:00
Wanne ea1b814e8f - Bugfix: Fixed CTD when throwing item (grenade, rock, throwing knife, ...) in tactical when item description box is open 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-31 17:33:15 +00:00
Wanne 8f1f24499b - New Release EXE build: 3287 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-23 09:40:34 +00:00
Wanne 527fc97784 - Updated Cover system (by CptMorre) 
o made display cover system performance independant of map size. 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-23 07:52:39 +00:00
Wanne a94cfc2492 - Updated cover system (by CptMoore) 
o New settings:

* New settings *

gGameExternalOptions.ubStanceEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "STANCE_EFFECTIVENESS", 10, 0, 100);
How much the stance influences the view range reduction. Prone will give you 10% (default) view reduction / cover.

gGameExternalOptions.ubLBEEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "LBE_EFFECTIVENESS", 50, 0, 100);
Dual welding the longest sniper rifles with full attachements, having a third backup sniper rifle, one combat pack and one backpack will give a 50% (default) sight penalty with the default settings.

* Removed settings *

gGameExternalOptions.fMovementSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "MOVEMENT_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fStanceSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "STANCE_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fLBESightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "LBE_SIGHT_ADJUSTMENT", TRUE); 



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-23 07:42:17 +00:00
Wanne 1e036ea548 - Updated Chinese text file (by zwoo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3279 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-21 18:52:52 +00:00
Wanne 9bbd342855 - Reverted test changes in Buildings.cpp 
- Updated Exe release build: 3274

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3276 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-21 18:13:37 +00:00
Wanne a98eda12a5 - Moved the new cover properties to section "JA2 Tactical Section" 
- Updated texts for new cover system
- Updated build number to 3274
- New exe release build: 3274

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-21 13:27:41 +00:00
Wanne defc028a14 - Updated Build number 
- Cover System Infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=235489&page=0&fpart=1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3272 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-19 21:12:20 +00:00
Wanne 5ae8695264 - Translated new cover texts for German version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-19 21:04:59 +00:00
Wanne 09268b81e8 Updated Version of the Cover System (by CptMoore) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3270 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-19 20:35:43 +00:00
Wanne ba6cb14f9b - Bugfix: Fixed bug, where enemies do not climb on rooftops anymore, when ASTAR is disabled 
.) The bug was introduced in revision 1534 (TileEngine/Buildings.cpp)
.) Overhaul reworked the code for climbing on buildings and it seems the bug was introduced there
.) I created a new define "VANILLA_BUILDING_CLIMBING" (defined in Building.h). If defined the "old" building climbing code will be used. If not defined Overhauls code will be used (and so enemies do not climb on buildings). Overhauls code should be fixed and then used instead of the "old" vanilla building climbing code.
.) I also disabled ASTAR pathing, because it is a HUGH PERFORMANCE killer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-05 15:28:59 +00:00
Wanne 3641bc6770 - Updated "JA2 windowed mode ..." for Dutch version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-09-04 07:56:37 +00:00
Wanne 45d3a04362 Externalized "Bobby Ray tooltips show possible attachments" from HAM 3 (BOBBY_RAY_TOOLTIPS_SHOW_POSSIBLE_ATTACHMENTS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3174 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-09-04 07:37:11 +00:00
Wanne a20ac7fb1c - Bobby Ray Tooltips (Fixes) (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-09-03 07:39:34 +00:00
Wanne da7e88e759 - Automatic cancellation of running if the merc is in a running state and was not moved since last turn (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3138 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-26 07:29:46 +00:00
Wanne 33b5bbe863 - Bugfix: Character in running state will loose breath points each turn if no action is performed (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3136 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-25 11:28:28 +00:00
Wanne 5c9f9e71f9 - Fixed a few Visual Studio compiler warnings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3129 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-22 21:35:50 +00:00
Wanne 3a2db52065 - Bugfix: Refreshing bug in strategy merc list in resolution 640x480 and 800x600 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3125 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-22 19:02:55 +00:00
Wanne 80eebe69bd - Bugfix: Enemies should also drop LBE gear (by Roadkill) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3123 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-22 07:36:42 +00:00
Wanne e47495fe0d - Bugfix: EDB: Rendering of "Hide Muzzle Flash" icon 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3120 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-21 08:12:15 +00:00
Wanne 06a2af0fa6 Win 98 VFS Fixes (by BirdFlu) 
- add ini option to disable UNICODE in VFS (and use the current codepage)
- when UNICODE disabled in VFS, open files with default encoding (instead of UTF8/16) filenames


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3118 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-20 08:14:37 +00:00
Wanne 98507b972b - Merged 2 fixes from MP Branch 
o VFS: don't convert empty strings
o Updated _PolishText.cpp

- New EXE Release (Build: 3111)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3111 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-15 17:25:07 +00:00
Wanne 5a9f0b16b1 - Merged 2 fixes from MP Branch 
o VFS: don't convert empty strings
o Updated _PolishText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3109 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-14 08:37:08 +00:00
Wanne 826340978a - Bugfix: If user changes shipping destination location in "ShippingDestinations.xml", Bobby Ray was still under construction if the "original" shipping destination was not under players control. 
This occured because of hardcoded DRASSEN AIRPORT COORDINATES (BOBBYR_SHIPPING_DEST_SECTOR_X, BOBBYR_SHIPPING_DEST_SECTOR_Y, BOBBYR_SHIPPING_DEST_SECTOR_Z)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-11 12:01:26 +00:00
Wanne 2cae5ff707 - Bugfix: Adding or removing "possible placement locations" for bloodcats, in any of the bloodcat maps, causes the program to create 0 bloodcats as a "defense mechanism" (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-08 09:03:11 +00:00
Wanne 8f3f28aea8 - TEMPORARY Bugfix: Temporary fix in method "NumEnemiesInSector()" to avoid assertion errors if the "source" sector was along the map's edge (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-07 08:44:02 +00:00
Wanne 3b4b76cf56 - Bugfix: At the end of an underground battle, all stationary enemy garrisons in the SURFACE sector directly above disappear completely (by Headrock & Wil473) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3087 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-07 08:37:43 +00:00
Wanne daee7613a8 - New MP Connect Screen STI image 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3073 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-02 17:15:02 +00:00
Wanne dfda109971 - Bugfix: IMP Creation -> String Array for holding the Attribute selection text was too short and so we got a buffer overrun in Debug version 
- IMP Creation: Moved second info text for skill page some pixels up, because in Russian version text is longer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-30 14:45:12 +00:00
Wanne 8a129722ac New EXE Release (Build: 3042) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-28 18:10:56 +00:00
Wanne cb0ceabb82 *** Merged Code from Multiplayer Branch Revision 3040 *** 
Bugfixes: Bobby Ray Shipment
- Re-enabled stealing from delivery sector (STEALING_FROM_SHIPMENTS_DISABLED)
- Re-enabled & externalized chance that whole shipment is lost (CHANCE_OF_SHIPMENT_LOST)
- Re-enabled delivery from John Kulba

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-28 16:51:52 +00:00
Wanne efa9df5930 - Updated _ChineseText.cpp 
- Fixed compilation Error in Chinese Version in "Multi Language Graphic Utils.cpp" (because of missing ";")

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-27 07:16:18 +00:00
Wanne 0e078dd386 * Merged Source Code from MP branch Revision 3025 * 
- Shipment Bugfix: Stop time compression when shipment and email arrives
- Shipment Bugfix: Fixed duplication of items from shipment. This bug occured, when loading a savegame with at least 2 depending shipment orders



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-26 16:18:05 +00:00
Wanne 20c8fb646d - Bugfix: Reset the pressed keys (ALT, \) after the console opened 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3031 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-26 08:36:20 +00:00
Wanne 7fc0de5ccd - Bugfix: On "sell all" also unreachable items were sold (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-25 18:20:08 +00:00
Wanne 178629d2c0 - Bugfix: Stop Time when Skyrider arrives in the destination sector (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-22 19:39:44 +00:00
Wanne 7521db7ae7 - Bugfix: Need for soldier sleep was calculated wrong (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-22 11:35:46 +00:00
Wanne 46cd01e366 - Merged Source Code from MP branch Revision 3021 
. clip surface coordinates before blitting
. track surface data pointer, to identify the surface's clip rectangle
. editor : test if item index is smaller than the number of items 
. other minor updates
. update png loader to work with new appdata.xml structure
. VFS updates
. fix radar maps : write to <userprofile>\RADARMAPS

* New Map Editor Release (Build: 3023)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3023 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-19 15:19:49 +00:00
Wanne 1d3313182d Spread Patterns MOD (by Zilpin) 
- VS 2008 Update

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3010 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-15 18:20:01 +00:00
Wanne 5cd81280bc Spread Patterns MOD (by Zilpin) 
* You also have to update GameDir folder *

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3009 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-15 18:00:07 +00:00
Wanne f0424c1ef4 - Bugfix: Mine income was not correctly initialized in GameSettings (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3007 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-13 09:46:15 +00:00
Wanne 772e77ffe3 - Added missing VFS\Tools files and folder. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3000 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-10 21:12:37 +00:00
Wanne e240037535 - Bugfix: Fixed CTD when item could not be rendered in the Editor Toolbar 
- Fixed compilation error while compiling with disabled #define USE_VFS

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2997 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-10 15:12:58 +00:00
Wanne 76b990f133 - Fixed compilation errors in VS 2005 
- Updated Revision number: 2996

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-10 10:13:02 +00:00
Wanne 1c69e1a019 *** Merged Code from Multiplayer Branch Revision 2993 *** 
- Updated VFS
- Fixed Map Editor not properly initialized with VFS
- New Map Editor Release (Build: 2993(


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2994 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-09 11:40:08 +00:00
Wanne 5291e3b127 - Bugfix: Console now works in VS 2008 (by SpaceViking and The_Bob) 
- Bugfix: Reset the ALT + \ keys after opening the console in the SGP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-09 09:31:43 +00:00
Wanne fd947789f2 - Updated _ChineseText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2984 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-07 02:23:46 +00:00
Wanne a3a69728ce New Map Editor Release (Build: 2975) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-06 22:28:46 +00:00
Wanne 23b3210d83 - Spelling mistake in _EnglishText.cpp 
- Updated GameVersion.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-06 17:38:17 +00:00
Wanne aebc4f2e88 Bugfix: EDB Fix by Headrock 
- Show Burst AND Auto penalty instead of only ONE (usually Burst penalty) 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2974 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-06 16:47:31 +00:00
Wanne 3850e27bc5 - Merged Source Code from MP branch Revision 2972 
enable intro videos in VFS mode
workaround for original intro hack
allow to get real path of a file (only CVFSFile)
streamline Allocator usage in VFile
small non-VFS mode fixes in MPHostScreen.cpp
Synced "Cutting Fences" in a multiplayer game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-06 16:13:00 +00:00
Wanne 8c07f244f3 - Bugfix: Enhanced IMP Creation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2969 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-05 09:10:28 +00:00
Wanne 03c952f16a New Release EXE (Build: 2963) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2965 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 22:32:03 +00:00
Wanne 2d86d43817 - Bugfix: Enhanced IMP Creation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2963 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 21:15:34 +00:00
Wanne ff0067c983 - Added missing project file 
- Added files to ignore list

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 21:06:49 +00:00
Wanne 47db604b50 *** Merged Code from Multiplayer Branch Revision 2960 *** 
- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 21:01:45 +00:00
Wanne 17f44f63e8 Corrected one sentence for Enhanced IMP Creation in the language specific text files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2957 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 17:27:54 +00:00
Wanne 7445ba2051 Merged "Enhanced IMP Creation" (by Sandro) 
- For code changes search for // SANDRO
- Tooltips can now be toggled on/off in the options screen instead of "Random IMP Personality" option
- Updated Version Number for new Release Build (2949)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2949 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 10:44:23 +00:00
Wanne e983a0ccc6 Updated _ChineseText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-02 18:49:01 +00:00
Wanne 5cb077f0e3 New Release Build (2929) 
- Updated Build Number

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2930 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-02 14:23:38 +00:00
Wanne 12f0ed5554 Externalized new messages for the Real-Time Mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2926 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-02 13:19:33 +00:00
Wanne 7367f5266a "Real Time Mode" update: Forgot the move the 2 new INI values to the [JA2 Tactical Settings] section 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2922 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-02 10:28:23 +00:00
Wanne afaba958c5 Added "Real Time Mode" (by borys762 and The_Bob) 
- To look for code changes search for "The_Bob" comments
- There are 2 new entries in the ja2_options.ini in the [JA2 Tactical Settings] section: ALLOW_REAL_TIME_SNEAK, QUIET_REAL_TIME_SNEAK

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2921 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-02 10:25:42 +00:00
Wanne 2f36054c50 Updated language spec text files from MP branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2914 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-30 00:01:02 +00:00
Wanne f7e798aa01 Update comment for UDT 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2897 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-27 12:44:18 +00:00
Wanne 6bf05babcb - Added Ultra Dynamic Tooltips by Telpscorei (to see the changes, search the code for //SCORE) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2896 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-27 12:43:45 +00:00
Wanne 128e7e7647 - Updated language text files from MP branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2894 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-27 08:43:11 +00:00
Wanne 895367162c - Bugfix: New Airport code was not working correctly for multiplayer version (merged changes from MP branch) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2883 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-24 20:50:18 +00:00
Wanne 8491b9b09b Code now handles localized version of ShippingDestinations.xml (German.ShippingDestinations.xml, Russian.ShippingDestinations.xml, ...) (by Arynn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-22 11:53:38 +00:00
Wanne c0ca3631f4 Updated _ChineseText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-19 08:38:06 +00:00
Wanne 067a3a5899 Bugfix: Memory Leak in CIniReader::ReadString (by Arynn) 
Fixed an array off by one issue in game setting structure (by Arynn)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2869 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-19 06:24:06 +00:00
Wanne c8c547eba9 Updated translations of _ChineseText.cpp and _GermanText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2850 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-13 08:08:25 +00:00
Wanne 0e1c8b48bd Bugfix: Error occured when loading savegames with Release EXE compiled in Visual Studio 2008 (fixed by birdflu) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2849 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-13 07:59:49 +00:00
Wanne 2e99cbe784 Improved Game Settings (by Arynn) 
- fixed corruption of ja2.set
- ja2.set will no be saved to ja2_settings.ini
- a few more minor game setting fixes and error tracings


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2844 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-12 11:52:35 +00:00
Wanne 516e08e905 - Merged/updated text files from multiplayer project branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2837 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-11 11:26:38 +00:00
Wanne 4df4073cd0 Improved temporary Bugfix: Freeze when shippment from Bobby Rays arrive (by Arynn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2836 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-10 21:12:39 +00:00
Wanne 4e5939a289 Temporary Bugfix: Freeze when shippment from Bobby Rays arrive. It is only a temp fix, I don't know which side effects on the shippment this fix has. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2832 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-08 21:09:26 +00:00
Wanne 85c27b5d28 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2831 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2009-05-08 13:54:43 +00:00
Wanne b0eb1baf7e Bugfix: Enable all terrorists in game, if all terrorists should be available (defined in the ja2_options.ini) (fix by Sandro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2830 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-08 13:37:22 +00:00
Wanne c989565c44 Fixed Compiler Error: Replaced "#include afxres.h" with "#include "windows.h" in Res\ja2.rc, because it did not compile on a few machines. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2829 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-08 13:34:29 +00:00
Wanne a0b75319ad Bugfix: Problems with refreshing fast help text in mapscreen (by jones bearpit) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-07 20:07:22 +00:00
Wanne c54e61ce75 Bugfix: Morale and ice-cream truck (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2823 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-07 19:10:04 +00:00