From 46a8c35140479f5957e35eeb8cd27da9b9da6630 Mon Sep 17 00:00:00 2001
From: Jonathan Campbell <jonathan@castus.tv>
Date: Thu, 21 Apr 2016 07:22:42 -0700
Subject: [PATCH] textInit() for font. add variable so shinku() knows what page
we're on.
---
src/lib/scroll16.c | 8 +++++---
src/lib/scroll16.h | 2 ++
src/scroll.c | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 24837c4b..1780d960 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -586,14 +586,16 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
//setkb(0);
}*/
+unsigned char shinku_fps_indicator_page = 0;
+
/* sync */
void shinku(global_game_variables_t *gv)
{
//modexCopyPageRegion(pip[1].page, pip[2].page, 16, 16, 16, 16, (14*8)+4, 8+4);
if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))
{
- word x = (16);
- word y = (16);
+ word x = (16) + gv->video.page[shinku_fps_indicator_page].dx; // follow the screen
+ word y = (16) + gv->video.page[shinku_fps_indicator_page].dy; // follow the screen
word col = 7;
word bgcol = 0;
word type = 0;
@@ -602,7 +604,7 @@ void shinku(global_game_variables_t *gv)
sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
// printf("%s\n", gv->pee);
//FIXME PLEASE!!
- modexprint(&(gv->video.page[0]), x, y, type, col, bgcol, gv->pee);
+ modexprint(&(gv->video.page[shinku_fps_indicator_page]), x, y, type, col, bgcol, gv->pee);
//++++ modexprint(&(gv->video.page[0]), x, y, type, col, bgcol, gv->pee);
//(gv->clock_start)=*(gv->clock);
gv->kurokku.tiku=0;
diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 33c7ed15..d3711b5e 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -81,4 +81,6 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);
void shinku(global_game_variables_t *gv);
void near animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch);
+extern unsigned char shinku_fps_indicator_page;
+
#endif /*__SCROLL16_H_*/
diff --git a/src/scroll.c b/src/scroll.c
index ecd48e29..d13d7d01 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -134,7 +134,7 @@ void main(int argc, char *argv[])
modexFadeOff(4, dpal);
#endif
- //textInit();
+ textInit();
VGAmodeX(bakapee, 1, &gvar);
// printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
#ifdef FADE
@@ -194,6 +194,7 @@ void main(int argc, char *argv[])
#endif
modexShowPage(mv[1].page);
+ shinku_fps_indicator_page = 1; // we're on page 1 now, shinku(). follow along please or it will not be visible.
//modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
#ifdef MODEX
#ifdef FADE
--
2.39.5