# HG changeset patch
# User heinrichsweikamp
# Date 1418199229 -3600
# Node ID 5fd93901b73537ecacdcd2c2b7f7b2fc0c7e3e8d
# Parent  4147cd5c0c8eb44365b9a4a6a2f26250dbc42990# Parent  7dbc1d780ca572e6e1cec853f69839d21d8396f1
Merge

diff -r 4147cd5c0c8e -r 5fd93901b735 src/p2_deco.c
--- a/src/p2_deco.c	Wed Dec 10 09:13:36 2014 +0100
+++ b/src/p2_deco.c	Wed Dec 10 09:13:49 2014 +0100
@@ -634,7 +634,6 @@
         for(y++; y<NUM_STOPS; y++)
         {
             char_O_deco_time_for_log [y] = 0;
-            char_O_deco_gas  [y] = 0;
         }
     }
 }
@@ -2061,7 +2060,7 @@
         {
             overlay unsigned char stop_gas;
 
-            //---- Get next stop, possibly in reverse order ------------------
+            //---- Get next stop ---------------------------------------------
             {
                 time             = char_O_deco_time[(NUM_STOPS-1)-i];
                 temp_depth_limit = char_O_deco_depth[(NUM_STOPS-1)-i];
diff -r 4147cd5c0c8e -r 5fd93901b735 src/shared_definitions.h
--- a/src/shared_definitions.h	Wed Dec 10 09:13:36 2014 +0100
+++ b/src/shared_definitions.h	Wed Dec 10 09:13:49 2014 +0100
@@ -75,6 +75,7 @@
 bank3   udata_ovr  0x300
 #endif
 
+
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     Define model dimensions.
     NUM_COMP  is the number of compartiments in the Bühlmann ZH-L16 model, ie 16.
@@ -154,8 +155,6 @@
 VAR_UCHAR (char_I_dive_interval);          // Delay before next dive simulation.
 VAR_UCHAR (char_I_const_ppO2);             // new in v.101
 
-TAB_UCHAR (char_I_deco_enable, NUM_GAS);    // new in v.101
-
 TAB_UCHAR (char_I_deco_gas_change,NUM_GAS); // new in v.101
 TAB_UCHAR (char_I_dil_change,NUM_GAS);      // Must be placed after char_I_deco_gas_change!