diff --git a/th04/main/score.h b/th04/main/score.h new file mode 100644 index 00000000..57a511a0 --- /dev/null +++ b/th04/main/score.h @@ -0,0 +1,9 @@ +#include "th04/score.h" + +extern unsigned char extends_gained; +extern unsigned long score_delta; + +void pascal near score_update_and_render(void); + +// Adds the entire score delta at once to the current score. +void pascal score_delta_commit(void); diff --git a/th04/score.h b/th04/score.h index 52305d89..b0ea5260 100644 --- a/th04/score.h +++ b/th04/score.h @@ -4,5 +4,3 @@ typedef union { unsigned char continues_used; unsigned char digits[SCORE_DIGITS]; } score_lebcd_t; - -extern unsigned char extends_gained; diff --git a/th04/shared.hpp b/th04/shared.hpp index 2a8c09c7..043184e9 100644 --- a/th04/shared.hpp +++ b/th04/shared.hpp @@ -21,7 +21,6 @@ /// Player /// ------ #include "th04/main/player/player.h" -#include "th04/score.h" /// ------ /// Stages @@ -29,13 +28,3 @@ extern nearfunc_t_near stage_invalidate; extern nearfunc_t_near stage_render; /// ------ - -/// Score -/// ----- -extern unsigned long score_delta; - -void pascal near score_update_and_render(void); - -// Adds the entire score delta at once to the current score. -void pascal score_delta_commit(void); -/// ----- diff --git a/th05/main013.cpp b/th05/main013.cpp index 45acc607..27c58fea 100644 --- a/th05/main013.cpp +++ b/th05/main013.cpp @@ -14,6 +14,7 @@ extern "C" { #include "th01/math/area.hpp" #include "th04/shared.hpp" #include "th04/main/null.hpp" +#include "th04/main/score.h" #include "th04/main/rank.hpp" #include "th04/main/item/items.hpp" #include "th05/formats/bb.h" @@ -25,7 +26,6 @@ extern "C" { #include "th04/formats/bb_stage.c" #include "th05/main/stage/setup.cpp" -// Adds the entire score delta at once to the current score. void pascal score_delta_commit(void) { while(score_delta > 0) {