Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/simulator.asm @ 229:85ea09d3b9d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Nofly should not be reset after dive simulation (bug BB18).
author JeanDo
date Tue, 15 Mar 2011 18:13:51 +0100
parents 2dc4a7340510
children 9406a5b0ba5e
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Sat Mar 05 10:09:32 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Tue Mar 15 18:13:51 2011 +0100
@@ -437,19 +437,22 @@
 	return
 
 simulator_restore_tissue_data:
-	bcf		restore_deco_data		; clear restore flag
-	ostc_debug	'S'							; Sends debug-information to screen if debugmode active
+	bcf		restore_deco_data           ; clear restore flag
+	ostc_debug	'S'                     ; Sends debug-information to screen if debugmode active
 	call	deco_pull_tissues_from_vault
 	movlb	0x01						; Back to RAM Bank1
-	ostc_debug	'T'							; Sends debug-information to screen if debugmode active
+	ostc_debug	'T'                     ; Sends debug-information to screen if debugmode active
 
 	ostc_debug	'G'		; Sends debug-information to screen if debugmode active
 	call	deco_calc_desaturation_time	; calculate desaturation time
-	movlb	b'00000001'						; select ram bank 1
-	call	calculate_noflytime				; Calc NoFly time
+	movlb	b'00000001'                 ; select ram bank 1
+	
+	; Note: should not reset nofly-time here: the true value have continued to be decremented
+	;       during simulation, which is the right thing to do...
 	ostc_debug	'H'		; Sends debug-information to screen if debugmode active
 
 	; Calculate CNS	
-	call	deco_calc_CNS_fraction		; calculate CNS
-	movlb	b'00000001'					; rambank 1 selected
+	call	deco_calc_CNS_fraction      ; calculate CNS
+	movlb	b'00000001'                 ; rambank 1 selected
+
 	return