From b7bd15c8d6b5793934e7d723c64c2434deda9c01 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 21 Jul 2013 17:09:14 +0000 Subject: [PATCH] o Externalized ja2_options.ini value if you want to use / or not the cleaned up version of CalcNewChanceToHitGun: USE_NEW_CTH_CALCULATION (by silversurfer) o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/322986/Re_Potential_NCTH_Code_Change_.html#Post322986 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1710 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/Ja2_Options.INI | 7 +++++++ Data-UB/Ja2_Options.ini | 7 +++++++ Data/Ja2_Options.INI | 7 +++++++ INIEditorJA2Options.xml | Bin 841894 -> 843214 bytes 4 files changed, 21 insertions(+) diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI index c77866317..b69e81417 100644 --- a/Data-1.13/Ja2_Options.INI +++ b/Data-1.13/Ja2_Options.INI @@ -123,6 +123,13 @@ MAX_ITEM_SIZE = 34 MAX_WEAPON_SIZE = 9 OLD_INVENTORY_ITEM_NUMBER = 99 +;------------------------------------------------------------------------------------------------------------------------------ +; USE_NEW_CTH_CALCULATION is an experimental switch which causes the game to use a cleaned up version of NCTH calculation. +; This switch will do nothing if you play with OCTH. +; The new code is easier to read for programmers and therefore (hopefully) easier to improve. ;-) +; The switch and the old code will probably be removed in the future. +;------------------------------------------------------------------------------------------------------------------------------ +USE_NEW_CTH_CALCULATION = TRUE ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/Data-UB/Ja2_Options.ini b/Data-UB/Ja2_Options.ini index 3ae3c79b3..c052583d4 100644 --- a/Data-UB/Ja2_Options.ini +++ b/Data-UB/Ja2_Options.ini @@ -123,6 +123,13 @@ MAX_ITEM_SIZE = 34 MAX_WEAPON_SIZE = 9 OLD_INVENTORY_ITEM_NUMBER = 99 +;------------------------------------------------------------------------------------------------------------------------------ +; USE_NEW_CTH_CALCULATION is an experimental switch which causes the game to use a cleaned up version of NCTH calculation. +; This switch will do nothing if you play with OCTH. +; The new code is easier to read for programmers and therefore (hopefully) easier to improve. ;-) +; The switch and the old code will probably be removed in the future. +;------------------------------------------------------------------------------------------------------------------------------ +USE_NEW_CTH_CALCULATION = TRUE ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI index aa9856ea0..cf9513685 100644 --- a/Data/Ja2_Options.INI +++ b/Data/Ja2_Options.INI @@ -123,6 +123,13 @@ MAX_ITEM_SIZE = 34 MAX_WEAPON_SIZE = 9 OLD_INVENTORY_ITEM_NUMBER = 99 +;------------------------------------------------------------------------------------------------------------------------------ +; USE_NEW_CTH_CALCULATION is an experimental switch which causes the game to use a cleaned up version of NCTH calculation. +; This switch will do nothing if you play with OCTH. +; The new code is easier to read for programmers and therefore (hopefully) easier to improve. ;-) +; The switch and the old code will probably be removed in the future. +;------------------------------------------------------------------------------------------------------------------------------ +USE_NEW_CTH_CALCULATION = TRUE ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml index c21c028d883ebf7f41e7a58769d1bb935cf3cddc..e87de4f76c7c6cac2e570ea2d477d1138f34bbac 100644 GIT binary patch delta 656 zcmZ`%ze~el5WUo-t+j$!tB8Z?A_^LWiVhY;9TWsB;-ol~G|_@>V*1OvI0!npr~$vh z#mPybog5ql{{a66H)nC{qVK-cO^0{+zIT^@&9jU!J{3dgo1v(-Ok1=n zF0P}GzPlLqx26Wg#<4Q9Tq2z;IwBX*qXHH2EK!AWbbw5m>fkD5(mrl=#6st6qN0kt zMP{364{_TxN*wjJt&LsIc-GPvt4~Bze<+uWMLro z>7a_4K%YIAapraC&|+0jPQp{zxHIn}I&k2jx+s_CN%uT2*Re6 z>)^2(G=aollKdqCks9&_s^)15)&HzYqz=Q$h@6*9arF{U_z(GkUY2DOMd;Rqvacq) zS-Jvverj?-ynm>J!d+6v