tresinformal / drakkar

The tresinformal video game called 'Drakkar'
GNU General Public License v3.0
11 stars 4 forks source link

#679 rm all mentions of food #686

Closed EvoLandEco closed 1 year ago

EvoLandEco commented 1 year ago

fixes #679

EvoLandEco commented 1 year ago

check failed:

Run make debug --silent
error: #endif without #if
 1336 | #endif // no tests in release
      |  ^~~~~
make[1]: *** [Makefile.Debug:463: debug/game.o] Error 1
make: *** [Makefile:56: debug] Error 2
Error: Process completed with exit code 2.

but there is no line 1336 in file game.cpp, what could be wrong here? There is no warning no error on my machine

TheoPannetier commented 1 year ago

but there is no line 1336 in file game.cpp, what could be wrong here? There is no warning no error on my machine

The error message says that the final closing #endif directive has not been matched by a corresponding opening #ifdef or #ifndef, while we know it should be matched by the first #ifndef NDEBUG // no tests in release (on line 365 or so). This implies that another #ifdef earlier has lost its own matching #endif.

TheoPannetier commented 1 year ago

I have investigated a bit and found two places with dangling processives. One of them is recent my fault I believe (comes from #683), apologies! The other is older, in the middle of the tests. I have fixed those, let's see if it fixes the build. Also, it's odd that building on GHA catches this issue while our local builds do not.

codecov-commenter commented 1 year ago

Codecov Report

Merging #686 (b79a4f6) into develop (a15d6fd) will decrease coverage by 1.41%. The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop     #686      +/-   ##
===========================================
- Coverage    89.48%   88.06%   -1.42%     
===========================================
  Files           42       38       -4     
  Lines         2016     1735     -281     
  Branches       146      129      -17     
===========================================
- Hits          1804     1528     -276     
+ Misses         212      207       -5     
Impacted Files Coverage Δ
src/game.cpp 96.79% <ø> (-0.62%) :arrow_down:
src/game.h 100.00% <ø> (ø)
src/game_functions.cpp 80.88% <ø> (-5.58%) :arrow_down:
src/main.cpp 93.18% <ø> (-0.44%) :arrow_down:
src/food.h
src/food_type.cpp
src/food_state.cpp
src/food.cpp

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

EvoLandEco commented 1 year ago

@TheoPannetier Great work! Thanks for the fix