eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the warnings and some errors.

Browse Source
This commit is contained in:
sorgelig
2018-12-29 21:15:25 +08:00
parent 3aa5c4d438
commit ddd5b75d2b
19 changed files with 136 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osd.cpp
View File

@@ -139,15 +139,15 @@ static void rotatechar(unsigned char *in, unsigned char *out)
}
}
#define OSDHEIGHT (osd_size*8)
#define OSDHEIGHT (uint)(osd_size*8)
void OsdSetTitle(const char *s, int a)
{
// Compose the title, condensing character gaps
arrow = a;
int zeros = 0;
int i = 0, j = 0;
int outp = 0;
uint i = 0, j = 0;
uint outp = 0;
while (1)
{
int c = s[i++];
@@ -178,7 +178,7 @@ void OsdSetTitle(const char *s, int a)
}
// Now centre it:
int c = (OSDHEIGHT - 1 - outp) / 2;
uint c = (OSDHEIGHT - 1 - outp) / 2;
memmove(titlebuffer + c, titlebuffer, outp);
for (i = 0; i<c; ++i) titlebuffer[i] = 0;
@@ -245,7 +245,7 @@ void OsdWriteOffset(unsigned char n, const char *s, unsigned char invert, unsign
if (leftchar)
{
unsigned char tmp2[8];
memcpy(tmp2, charfont[leftchar], 8);
memcpy(tmp2, charfont[(uint)leftchar], 8);
rotatechar(tmp2, tmp);
p = tmp;
}
@@ -333,14 +333,14 @@ void OsdWriteOffset(unsigned char n, const char *s, unsigned char invert, unsign
DisableOsd();
}
void OsdDrawLogo(unsigned char n, char row, char superimpose)
void OsdDrawLogo(int row)
{
unsigned short i;
const unsigned char *p;
int linelimit = OSDLINELEN;
int mag = (osd_size / 8);
n = n * mag;
uint n = row * mag;
// select buffer and line to write to
if (!is_minimig())
@@ -357,7 +357,7 @@ void OsdDrawLogo(unsigned char n, char row, char superimpose)
unsigned char bt = 0;
const unsigned char *lp = logodata[row];
int bytes = sizeof(logodata[0]);
if (row >= (sizeof(logodata) / sizeof(logodata[0]))) lp = 0;
if ((uint)row >= (sizeof(logodata) / sizeof(logodata[0]))) lp = 0;
char *bg = framebuffer[n + k];
@@ -441,20 +441,20 @@ void OSD_PrintText(unsigned char line, const char *text, unsigned long start, un
if (offset) {
width -= 8 - offset;
p = &charfont[*text++][offset];
p = &charfont[(uint)(*text++)][offset];
for (; offset < 8; offset++)
spi8(*p++^invert);
}
while (width > 8) {
unsigned char b;
p = &charfont[*text++][0];
p = &charfont[(uint)(*text++)][0];
for (b = 0; b<8; b++) spi8(*p++^invert);
width -= 8;
}
if (width) {
p = &charfont[*text++][0];
p = &charfont[(uint)(*text++)][0];
while (width--)
spi8(*p++^invert);
}
@@ -530,7 +530,7 @@ void OSD_PrintInfo(const char *message, int *width, int *height, int frame)
for (x = 0; x < w; x++)
{
const unsigned char *p = charfont[str[(y*INFO_MAXW) + x]];
const unsigned char *p = charfont[(uint)str[(y*INFO_MAXW) + x]];
for (int i = 0; i < 8; i++) spi8(*p++);
}
@@ -655,7 +655,7 @@ void ScrollText(char n, const char *str, int off, int len, int max_len, unsigned
if (off+len > max_len) // scroll name if longer than display size
{
// reset scroll position if it exceeds predefined maximum
if (scroll_offset >= (len + BLANKSPACE) << 3) scroll_offset = 0;
if (scroll_offset >= (uint)(len + BLANKSPACE) << 3) scroll_offset = 0;
offset = scroll_offset >> 3; // get new starting character of the name (scroll_offset is no longer in 2 pixel unit)
len -= offset; // remaining number of characters in the name