From 0ebb146225d97af73386a2de6ab0296c8add2f0e Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Fri, 1 Jun 2012 12:04:50 +0000
Subject: [PATCH] - Added descriptions for the 2 new properties
 (USE_XML_TILESETS, NUM_P_ITEMS) to the INI Editor "INIEditorJA2Options.xml"
 file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1447 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 Data-1.13/Ja2_Options.INI |   4 +---
 Data/Ja2_Options.INI      |   2 +-
 INIEditorJA2Options.xml   | Bin 797538 -> 800362 bytes
 Ja2.ini                   |   4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI
index 73c64ce99..a79c4dade 100644
--- a/Data-1.13/Ja2_Options.INI
+++ b/Data-1.13/Ja2_Options.INI
@@ -171,7 +171,7 @@ WRITE_PROFILE_DATA_TO_XML = FALSE
 USE_EXTERNALIZED_ENEMY_ITEM_DROPS =	1
 
 ;------------------------------------------------------------------------------------------------------------------------------
-; Tells the game to load ja2set.dat.xml instead of the old binary file
+; Tells the game to load ja2set.dat.xml (located in the MODs "Data" folder) instead of the old "BinaryData\ja2.set.dat" file
 ; Must be TRUE if NUM_P_ITEMS (below) is > 3
 ; If an xml file doesn't exist, setting the value to true will create one.
 ; Issues have been reported using big maps with this value set to TRUE
@@ -192,8 +192,6 @@ USE_XML_TILESETS = FALSE
 NUM_P_ITEMS = 3
 
 
-
-
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
 
diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI
index 836bbb78e..c2d963aac 100644
--- a/Data/Ja2_Options.INI
+++ b/Data/Ja2_Options.INI
@@ -171,7 +171,7 @@ WRITE_PROFILE_DATA_TO_XML = FALSE
 USE_EXTERNALIZED_ENEMY_ITEM_DROPS = 0
 
 ;------------------------------------------------------------------------------------------------------------------------------
-; Tells the game to load ja2set.dat.xml instead of the old binary file
+; Tells the game to load ja2set.dat.xml (located in the MODs "Data" folder) instead of the old "BinaryData\ja2.set.dat" file
 ; Must be TRUE if NUM_P_ITEMS (below) is > 3
 ; If an xml file doesn't exist, setting the value to true will create one.
 ; Issues have been reported using big maps with this value set to TRUE
diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml
index 865ab205785d01a12e58936325cc745f7f717018..1644e0757505ab39890c4d6c1e0bc28fa7835ed5 100644
GIT binary patch
delta 1282
zcmbVLT}V@57=F*re$Lrab3cwD;hA8$&@nU+r9?%8!B*l=ge`RHoXf50=1<*J8sT;9
z;_E81i>?an%9{#=E(32w2)xKHBO<yE?0LWARKy_S@Sg8{?|I&z=lS06>rUj`_sIJ0
zEmbF7tTpN(&rOO`j7DjQqFDQAkotsj+xl4_q7-HE6vgJ2qqa3mc}mhG8FUA03l;Hu
zp2F}X<$8~D02|bZcb+ELE2>qiuOUv?sTXjA>aj97i7$hu0LvmgMFk3#Dxv|=wWDYc
zO(%nUC_{GvF3|nMz{ElI@QM0n!VD6o&{G9D!D<1Rc@!Fl&j7yx8U{ZDS*P&6hFu)I
z`(aW1?Za-6j1dsv04A|SAqnT+J7KK{siQJM63rP@ragtUT-*SoJk}!qUXbNez+|`;
zk&oK~A`-J$#k)6(yL}$a7G%hh3}*Ev;7du7I8`1=%6y_oQIz<i*n6P(+ZZ?tNC8z+
z@?e-SOO{6HIKFtzA=xba2H0ePoEC4RN<h5$Wz$4wgR9bEs&%6@=M2<c0qjU8PHoUt
z>c(7PDyT^Wdo)iKgN~fx(z2&^<57p=RYYXea!KXEdip~TxsC}d);?OgMb`(HU4%z;
zZ)vPi6aCMei{kgL;uc>DtjKfS+uV<nU@|$BNTWKpK8>~~B!RNTOa@d%_p-$&Ub|H-
zXmS`p<Q)EFq=pA5>>!A!JMZ)jmd|Ptz=G6@1!kFfAWj==b4po;MKqH&<;U)D8cO^7
z=frvk#C)}C^NO)b%_?5bXzn)Fnu!!KGv&Hv0;iGVTagB-y-zlu*r`%0+y7MzlYB2&
z7+{mfoCTk#wc_lGt;WZfhX*MK|0Et$j5W9FaWuh=6Bf%M%_Fw$s#_nI;3Un6_i?+w
zIw-Hv$*~*$&#^<bzetF?%G2lb8>r8hDlJ>)F>9q}YAJ0t_-%4`Y}D2-o>?jVyj=e{
emROA?6qp63!mKbG%nozFG?)%^Zp0F<nyo*Hm<+4{

delta 63
zcmaF$#^BL4gAI40rw9CDE@%!(Zx2al1Y#y2W(HywAZ7((HXvpPVh$kY1Y)l3A?e&=
F=K*pD7?%J5

diff --git a/Ja2.ini b/Ja2.ini
index ab7be9391..2d7a964e7 100644
--- a/Ja2.ini
+++ b/Ja2.ini
@@ -36,7 +36,7 @@ VFS_CONFIG_INI = vfs_config.JA2113.ini
 ; This Executable will be the default file to start JA2 1.13 from the INI Editor.
 ;******************************************************************************************************************************
 
-DEFAULT_JA2_EXECUTABLE = ja2.exe
+DEFAULT_JA2_EXECUTABLE = 
 
 ;******************************************************************************************************************************
 ; You can choose from the following screen resolutions.
@@ -98,4 +98,4 @@ PLAY_INTRO = 1
 ; CLOCK_SPEED_PERCENT value in the ja2_options.ini or simply disable the HIGHSPEED_TIMER option.
 ;******************************************************************************************************************************
 
-HIGHSPEED_TIMER = TRUE
\ No newline at end of file
+HIGHSPEED_TIMER = FALSE