revert!

[16.git] / src / lib / scroll16.c

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index df693c1236f30d300fec7232d31d1b7891caa52f..965f5f0406a2c93787ead449b14280be903bf2be 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -623,8 +623,6 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 //sync!
 void shinku(page_t *page, global_game_variables_t *gv)
 {
-       if(((*clockdw)!=gv->clock_start)&&gv->tiku>0)
-       {
        byte *pee;
        word x = (16);
        word y = (8+16);
@@ -633,26 +631,18 @@ void shinku(page_t *page, global_game_variables_t *gv)
        word type = 1;
        float t;
        //gv->clock=*hwclockw;
-               t=((*clockdw)-gv->clock_start)/18.2;
-               //if(gv->tiku<=0) return;
-               //if(elapsed_timer(gv) >= (1.0 / gv->frames_per_second))
-               //{
+       t=(((*hwclockw)-gv->clock_start) /18.2);
+       //if(elapsed_timer(gv) >= (1.0 / gv->frames_per_second))
+       //{
                pee = _fmalloc(sizeof(byte)*64);
                sprintf(pee, "%lu", gv->tiku);
                modexprint(page, 16, 16, 1, 15, 0, pee);
-               //sprintf(pee, "%f", t);
-               //modexprint(page, x, y, type, col, bgcol, pee);
-               //printf("%f time\n", t);
-               /*printf("%lu gv->cs    ", gv->clock_start);
-               printf("%lu time        ", (*clockdw));
-               printf("%f fps  ", gv->tiku/t);
-               printf("%lu tiku\n", gv->tiku);*/
-               gv->tiku=0;
-       }
+               //sprintf(pee, "%f", gv->tiku/t);
+               modexprint(page, x, y, type, col, bgcol, pee);
                //sprintf(pee, "%f", *gv->tiku/\*time_in_seconds(gv));
                //modexprint(page, x, y+8, type, col, bgcol, pee);
        //}
-       (gv->clock_start)=*clockdw;
+       (gv->clock_start)=*hwclockw;
 }
 
 void near animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch)