Mercurial > public > ostc4

comparison Discovery/Src/tMenuGas.c @ 696:cc542448fb28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author heinrichsweikamp
date Fri, 19 Aug 2022 11:30:24 +0200
parents 1b995079c045
children
comparison
equal deleted inserted replaced
661:87bee7cc77b3 696:cc542448fb28
53 { 53 {
54 gas_mode = OCGAS_STANDARD; 54 gas_mode = OCGAS_STANDARD;
55 } 55 }
56 else 56 else
57 { 57 {
58 if (stateUsed->diveSettings.diveMode == DIVEMODE_CCR) 58 if (isLoopMode(stateUsed->diveSettings.diveMode))
59 gas_mode = OCGAS_BAILOUT_INACTIVE; 59 gas_mode = OCGAS_BAILOUT_INACTIVE;
60 else 60 else
61 gas_mode = OCGAS_BAILOUT_ACTIVE; 61 gas_mode = OCGAS_BAILOUT_ACTIVE;
62 } 62 }
63 63
326 text[textPointer++] = '\n'; 326 text[textPointer++] = '\n';
327 text[textPointer++] = '\r'; 327 text[textPointer++] = '\r';
328 text[textPointer++] = 0; 328 text[textPointer++] = 0;
329 } 329 }
330 else /* switch to bailout selection in surface mode */ 330 else /* switch to bailout selection in surface mode */
331 if((settingsGetPointer()->dive_mode == DIVEMODE_CCR) || (stateUsed->diveSettings.ccrOption == 1)) 331 if((isLoopMode(settingsGetPointer()->dive_mode)) || (stateUsed->diveSettings.ccrOption == 1))
332 { 332 {
333 text[textPointer++] = '\024'; 333 text[textPointer++] = '\024';
334 if(gasMode == CCGAS_STANDARD) 334 if(gasMode == CCGAS_STANDARD)
335 { 335 {
336 textPointer += snprintf(&text[textPointer], 14,"Bailout\n"); 336 textPointer += snprintf(&text[textPointer], 14,"Bailout\n");