mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

planner: turn error argument of add_plan_to_notes() into a boolean flag

Browse source 
This used to have multiple values, but is currently only checked for
true/false. Reflect that in the type.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-08 11:29:11 +01:00 • committed by bstoeger
parent b542a39a00
commit 15b17a0aca
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/planner.cpp
View file

@ -684,7 +684,7 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
bool o2break_next = false; bool o2break_next = false;
int break_cylinder = -1, breakfrom_cylinder = 0; int break_cylinder = -1, breakfrom_cylinder = 0;
bool last_segment_min_switch = false; bool last_segment_min_switch = false;
int error = 0; bool error = false;
bool decodive = false; bool decodive = false;
int first_stop_depth = 0; int first_stop_depth = 0;
int laststoptime = timestep; int laststoptime = timestep;
@ -1031,7 +1031,7 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
laststoptime = new_clock - clock; laststoptime = new_clock - clock;
/* Finish infinite deco */ /* Finish infinite deco */
if (laststoptime >= 48 * 3600 && depth >= 6000) { if (laststoptime >= 48 * 3600 && depth >= 6000) {
error = LONGDECO; error = true;
break; break;
} }

5
core/planner.h
View file

@ -2,9 +2,6 @@
#ifndef PLANNER_H #ifndef PLANNER_H
#define PLANNER_H #define PLANNER_H
#define LONGDECO 1
#define NOT_RECREATIONAL 2
#include "units.h" #include "units.h"
#include "divemode.h" #include "divemode.h"
@ -44,7 +41,7 @@ extern int validate_gas(const char *text, struct gasmix *gas);
extern int validate_po2(const char *text, int *mbar_po2); extern int validate_po2(const char *text, int *mbar_po2);
extern int get_cylinderid_at_time(struct dive *dive, struct divecomputer *dc, duration_t time); extern int get_cylinderid_at_time(struct dive *dive, struct divecomputer *dc, duration_t time);
extern bool diveplan_empty(struct diveplan *diveplan); extern bool diveplan_empty(struct diveplan *diveplan);
extern void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_disclaimer, int error); extern void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_disclaimer, bool error);
extern const char *get_planner_disclaimer(); extern const char *get_planner_disclaimer();
extern void free_dps(struct diveplan *diveplan); extern void free_dps(struct diveplan *diveplan);

2
core/plannernotes.cpp
View file

@ -93,7 +93,7 @@ extern std::string get_planner_disclaimer_formatted()
return format_string_std(get_planner_disclaimer(), deco); return format_string_std(get_planner_disclaimer(), deco);
} }
extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_disclaimer, int error) extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_disclaimer, bool error)
{ {
std::string buf; std::string buf;
std::string icdbuf; std::string icdbuf;