X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui.cpp;fp=src%2Fgui.cpp;h=e53b2389475bb66e354c4f3594ae2677de9a988e;hb=ad913876dd8313ff082819d8cd5a921418670657;hp=77640416e0e4ac53d6432e941d5681008362d481;hpb=daddbc234577dec4d318337f7ee0cf32517f0540;p=thunder diff --git a/src/gui.cpp b/src/gui.cpp index 7764041..e53b238 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -914,7 +914,8 @@ void ShowNumbers(int number) { uint8_t * bnarray[16] = { bn0, bn1, bn2, bn3, bn4, bn5, bn6, bn7, bn8, bn9, bnA, bnB, bnC, bnD, bnE, bnF }; - uint32_t scadr = hScrollOffset + voffsets[vScrollOffset] + 642 + 2560; +// uint32_t scadr = hScrollOffset + voffsets[vScrollOffset] + 642 + 2560; + uint32_t scadr = ((2 * 288) + 2) + (8 * 288); uint16_t bmpptr = 0; uint8_t first_dig = number >> 4, second_dig = number & 0x0F; @@ -924,9 +925,11 @@ void ShowNumbers(int number) for(int x=0; x<6; x++) { if (bnarray[first_dig][bmpptr++] == 1) - my_scr[scadr + x + y * 320] = 7; +// my_scr[scadr + x + y * 320] = 7; + my_scr[scadr + x + y * 288] = 7; else - my_scr[scadr + x + y * 320] = 0; +// my_scr[scadr + x + y * 320] = 0; + my_scr[scadr + x + y * 288] = 0; } } @@ -938,9 +941,11 @@ void ShowNumbers(int number) for(int x=0; x<6; x++) { if (bnarray[second_dig][bmpptr++] == 1) - my_scr[scadr + x + y * 320] = 7; +// my_scr[scadr + x + y * 320] = 7; + my_scr[scadr + x + y * 288] = 7; else - my_scr[scadr + x + y * 320] = 0; +// my_scr[scadr + x + y * 320] = 0; + my_scr[scadr + x + y * 288] = 0; } } } @@ -973,7 +978,8 @@ void DrawText(void) text_life--; // Draw the message here... - uint32_t scadr = hScrollOffset + voffsets[vScrollOffset] + 642; +// uint32_t scadr = hScrollOffset + voffsets[vScrollOffset] + 642; + uint32_t scadr = (288 * 2) + 2; uint16_t bmpptr = 0; for(int y=0; y<7; y++) @@ -983,23 +989,29 @@ void DrawText(void) if (show_which_msg == M60FPS) { if (bmp1[bmpptr++] == 1) - my_scr[scadr + x + y * 320] = 7; +// my_scr[scadr + x + y * 320] = 7; + my_scr[scadr + x + y * 288] = 7; else - my_scr[scadr + x + y * 320] = 0; +// my_scr[scadr + x + y * 320] = 0; + my_scr[scadr + x + y * 288] = 0; } else if (show_which_msg == M30FPS) { if (bmp2[bmpptr++] == 1) - my_scr[scadr + x + y * 320] = 7; +// my_scr[scadr + x + y * 320] = 7; + my_scr[scadr + x + y * 288] = 7; else - my_scr[scadr + x + y * 320] = 0; +// my_scr[scadr + x + y * 320] = 0; + my_scr[scadr + x + y * 288] = 0; } else if (show_which_msg == MSNAPSHOT) { if (bmp3[bmpptr++] == 1) - my_scr[scadr + x + y * 320] = 7; +// my_scr[scadr + x + y * 320] = 7; + my_scr[scadr + x + y * 288] = 7; else - my_scr[scadr + x + y * 320] = 0; +// my_scr[scadr + x + y * 320] = 0; + my_scr[scadr + x + y * 288] = 0; } } }