diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
| commit | 9c9bcee1e2fbd3fd374023146f99d0417cd8ab52 (patch) | |
| tree | 848c1688fe743dd0410183b182024ee961f07980 /src/engine/time_events.c | |
| parent | ce74d72c31a3ebda26adc6ae888700213f64b113 (diff) | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
fix merge conflicts
Diffstat (limited to 'src/engine/time_events.c')
| -rw-r--r-- | src/engine/time_events.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/time_events.c b/src/engine/time_events.c index 831048add..3e3054aa3 100644 --- a/src/engine/time_events.c +++ b/src/engine/time_events.c @@ -85,9 +85,9 @@ void UpdateShoalTideFlag(void) { RtcCalcLocalTime(); if (tide[gLocalTime.hours]) - FlagSet(SYS_SHOAL_TIDE); + FlagSet(FLAG_SYS_SHOAL_TIDE); else - FlagClear(SYS_SHOAL_TIDE); + FlagClear(FLAG_SYS_SHOAL_TIDE); } } |