Rooba
/
ReC98
mirror of https://github.com/nmlgc/ReC98.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Maintenance] Make the playfield fraction functions available to ≥TH02 

Part of P0146, funded by -Tom- and Ember2528.
This commit is contained in:
nmlgc 2021-05-31 21:11:48 +02:00
parent 08bc188e7d
commit 8426f3e13f
13 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
th01/main/playfld.hpp
View File

@ -1,20 +1,22 @@
static const screen_x_t PLAYFIELD_LEFT = 0; #if (GAME == 1)
static const screen_y_t PLAYFIELD_TOP = 64; static const screen_x_t PLAYFIELD_LEFT = 0;
static const screen_x_t PLAYFIELD_RIGHT = RES_X; static const screen_y_t PLAYFIELD_TOP = 64;
static const screen_y_t PLAYFIELD_BOTTOM = RES_Y; static const screen_x_t PLAYFIELD_RIGHT = RES_X;
static const screen_y_t PLAYFIELD_BOTTOM = RES_Y;
static const pixel_t PLAYFIELD_W = (PLAYFIELD_RIGHT - PLAYFIELD_LEFT); static const pixel_t PLAYFIELD_W = (PLAYFIELD_RIGHT - PLAYFIELD_LEFT);
static const pixel_t PLAYFIELD_H = (PLAYFIELD_BOTTOM - PLAYFIELD_TOP); static const pixel_t PLAYFIELD_H = (PLAYFIELD_BOTTOM - PLAYFIELD_TOP);
static const screen_x_t PLAYFIELD_CENTER_X = ( static const screen_x_t PLAYFIELD_CENTER_X = (
((PLAYFIELD_RIGHT - PLAYFIELD_LEFT) / 2) + PLAYFIELD_LEFT ((PLAYFIELD_RIGHT - PLAYFIELD_LEFT) / 2) + PLAYFIELD_LEFT
); );
static const screen_y_t PLAYFIELD_CENTER_Y = ( static const screen_y_t PLAYFIELD_CENTER_Y = (
((PLAYFIELD_BOTTOM - PLAYFIELD_TOP) / 2) + PLAYFIELD_TOP ((PLAYFIELD_BOTTOM - PLAYFIELD_TOP) / 2) + PLAYFIELD_TOP
); );
#endif
inline pixel_t playfield_fraction_x(float fraction = 1.0f) { static inline pixel_t playfield_fraction_x(float fraction = 1.0f) {
return ((int)(PLAYFIELD_W * fraction)); return ((int)(PLAYFIELD_W * fraction));
} }

2
th02/formats/mpn_l_i.cpp
View File

@ -6,7 +6,7 @@ extern "C" {
#include "pc98.h" #include "pc98.h"
#include "planar.h" #include "planar.h"
#include "master.hpp" #include "master.hpp"
#include "th02/main/playfld.h" #include "th02/main/playfld.hpp"
#include "th02/main/tile.hpp" #include "th02/main/tile.hpp"
#include "th02/formats/mpn.hpp" #include "th02/formats/mpn.hpp"

2
th02/main/playfld.h → th02/main/playfld.hpp
View File

@ -23,3 +23,5 @@
// (Future games use a near function.) // (Future games use a near function.)
void far playfield_tram_wipe(void); void far playfield_tram_wipe(void);
#endif #endif
#include "th01/main/playfld.hpp"

2
th02/main02_1.cpp
View File

@ -11,7 +11,7 @@ extern "C" {
#include "pc98.h" #include "pc98.h"
#include "planar.h" #include "planar.h"
#include "master.hpp" #include "master.hpp"
#include "th02/main/playfld.h" #include "th02/main/playfld.hpp"
#include "th02/main/tile.hpp" #include "th02/main/tile.hpp"
#include "th02/formats/mpn.hpp" #include "th02/formats/mpn.hpp"

2
th04/formats/mpn_free.cpp
View File

@ -6,7 +6,7 @@ extern "C" {
#include "pc98.h" #include "pc98.h"
#include "planar.h" #include "planar.h"
#include "master.hpp" #include "master.hpp"
#include "th04/main/playfld.h" #include "th04/main/playfld.hpp"
#include "th04/main/tile.hpp" #include "th04/main/tile.hpp"
#include "th04/formats/mpn.hpp" #include "th04/formats/mpn.hpp"

2
th04/formats/mpn_l_i.cpp
View File

@ -7,7 +7,7 @@ extern "C" {
#include "pc98.h" #include "pc98.h"
#include "planar.h" #include "planar.h"
#include "master.hpp" #include "master.hpp"
#include "th04/main/playfld.h" #include "th04/main/playfld.hpp"
#include "th04/main/tile.hpp" #include "th04/main/tile.hpp"
#include "th04/formats/mpn.hpp" #include "th04/formats/mpn.hpp"

2
th04/main/hud/popup.cpp
View File

@ -9,7 +9,7 @@
#include "th04/hardware/grcg.h" #include "th04/hardware/grcg.h"
#include "th04/math/motion.hpp" #include "th04/math/motion.hpp"
#include "th04/main/null.hpp" #include "th04/main/null.hpp"
#include "th04/main/playfld.h" #include "th04/main/playfld.hpp"
#include "th04/main/tile.hpp" #include "th04/main/tile.hpp"
#include "th04/main/scroll.hpp" #include "th04/main/scroll.hpp"
#include "th04/main/hud/popup.hpp" #include "th04/main/hud/popup.hpp"

2
th04/main/playfld.h → th04/main/playfld.hpp
View File

@ -1,4 +1,4 @@
#include "th02/main/playfld.h" #include "th02/main/playfld.hpp"
// Fills the playfield area on the text RAM with transparent spaces. // Fills the playfield area on the text RAM with transparent spaces.
void near playfield_tram_wipe(void); void near playfield_tram_wipe(void);

2
th04/shared.hpp
View File

@ -24,7 +24,7 @@
#include "th04/score.h" #include "th04/score.h"
/// ------ /// ------
#include "th04/main/playfld.h" #include "th04/main/playfld.hpp"
/// Stages /// Stages
/// ------ /// ------

1
th05/main/boss/b4_both.cpp
View File

@ -3,7 +3,6 @@
* Update code for Part 1 of the Stage 4 boss fight, against both Mai and Yuki * Update code for Part 1 of the Stage 4 boss fight, against both Mai and Yuki
*/ */
#include "th04/main/playfld.h"
#include "th04/math/vector.hpp" #include "th04/math/vector.hpp"
#include "th05/sprites/main_pat.h" #include "th05/sprites/main_pat.h"

2
th05/main/boss/render.cpp
View File

@ -9,7 +9,7 @@
#include "th01/math/subpixel.hpp" #include "th01/math/subpixel.hpp"
#include "th04/math/vector.hpp" #include "th04/math/vector.hpp"
#include "th04/main/drawp.hpp" #include "th04/main/drawp.hpp"
#include "th04/main/playfld.h" #include "th04/main/playfld.hpp"
/// Structures /// Structures
/// ---------- /// ----------

2
th05/main/player/bombanim.cpp
View File

@ -3,7 +3,7 @@
#include "th01/math/subpixel.hpp" #include "th01/math/subpixel.hpp"
#include "th04/math/vector.hpp" #include "th04/math/vector.hpp"
#include "th04/math/randring.h" #include "th04/math/randring.h"
#include "th04/main/playfld.h" #include "th04/main/playfld.hpp"
#include "th04/main/frames.h" #include "th04/main/frames.h"
#include "th04/main/circles.hpp" #include "th04/main/circles.hpp"
#include "th05/sprites/main_pat.h" #include "th05/sprites/main_pat.h"

2
th05/main034.cpp
View File

@ -9,7 +9,7 @@ extern "C" {
#include "ReC98.h" #include "ReC98.h"
#include "th01/math/subpixel.hpp" #include "th01/math/subpixel.hpp"
#include "th01/math/area.hpp" #include "th01/math/area.hpp"
#include "th04/main/playfld.h" #include "th04/main/playfld.hpp"
#include "th04/math/motion.hpp" #include "th04/math/motion.hpp"
#include "th05/main/boss/boss.hpp" #include "th05/main/boss/boss.hpp"
#include "th05/main/boss/bx.cpp" #include "th05/main/boss/bx.cpp"