diff --git a/src/DETHRACE/common/flicplay.c b/src/DETHRACE/common/flicplay.c index 5ae60f9d..45df88af 100644 --- a/src/DETHRACE/common/flicplay.c +++ b/src/DETHRACE/common/flicplay.c @@ -644,7 +644,7 @@ int StartFlic(char* pFile_name, int pIndex, tFlic_descriptor_ptr pFlic_info, tU3 } pFlic_info->the_index = pIndex; if (pDest_pixelmap) { - pFlic_info->first_pixel = (char*)pDest_pixelmap->pixels + pDest_pixelmap->row_bytes * pFlic_info->y_offset + pFlic_info->x_offset; + pFlic_info->first_pixel = (tU8*)pDest_pixelmap->pixels + pDest_pixelmap->row_bytes * pFlic_info->y_offset + pFlic_info->x_offset; } //LOG_DEBUG("first pixel %p %p", pFlic_info->first_pixel, pDest_pixelmap->pixels); pFlic_info->the_pixelmap = pDest_pixelmap; diff --git a/src/DETHRACE/common/graphics.c b/src/DETHRACE/common/graphics.c index 370ed02f..bae55b95 100644 --- a/src/DETHRACE/common/graphics.c +++ b/src/DETHRACE/common/graphics.c @@ -1029,8 +1029,8 @@ void DRPixelmapRectangleOnscreenCopy(br_pixelmap* pDest, br_int_16 pDest_x, br_i source_row_wrap = pSource->row_bytes - pWidth; dest_row_wrap = pDest->row_bytes - pWidth; - dest_ptr = (char*)pDest->pixels + (pDest->row_bytes * pDest_y + pDest_x); - source_ptr = (char*)pSource->pixels + (pSource->row_bytes * pSource_y + pSource_x); + dest_ptr = (tU8*)pDest->pixels + (pDest->row_bytes * pDest_y + pDest_x); + source_ptr = (tU8*)pSource->pixels + (pSource->row_bytes * pSource_y + pSource_x); for (y_count = 0; y_count < pHeight; y_count++) { for (x_count = 0; x_count < pWidth; x_count++) { @@ -1086,8 +1086,8 @@ void DRPixelmapRectangleVScaledCopy(br_pixelmap* pDest, br_int_16 pDest_x, br_in source_row_wrap = pSource->row_bytes - pWidth; dest_row_wrap = pDest->row_bytes - pWidth; - dest_ptr = (char*)pDest->pixels + (pDest->row_bytes * pDest_y + pDest_x); - source_ptr = (char*)pSource->pixels + (pSource->row_bytes * pSource_y + pSource_x); + dest_ptr = (tU8*)pDest->pixels + (pDest->row_bytes * pDest_y + pDest_x); + source_ptr = (tU8*)pSource->pixels + (pSource->row_bytes * pSource_y + pSource_x); source_y = 0; source_y_delta = (pSource->height << 16) / pHeight - 0x10000; diff --git a/src/DETHRACE/common/input.c b/src/DETHRACE/common/input.c index 4b76db95..04032ebb 100644 --- a/src/DETHRACE/common/input.c +++ b/src/DETHRACE/common/input.c @@ -461,7 +461,7 @@ void RollLettersIn() { if (which_letter < let->number_of_letters && which_letter >= 0 && letter_offset >= 0 && letter_offset < font_height) { // LOG_DEBUG("chars %d, %d, %d, %d", let->letters[0], let->letters[1], let->letters[2], let->letters[3]); - source_ptr = (char*)gFonts[FONT_TYPEABLE].images->pixels + (font_height * (let->letters[which_letter] - 32) + letter_offset) * the_row_bytes; + source_ptr = (tU8*)gFonts[FONT_TYPEABLE].images->pixels + (font_height * (let->letters[which_letter] - 32) + letter_offset) * the_row_bytes; for (k = 0; k < font_width; k++) { the_byte = *source_ptr; if (the_byte) { diff --git a/src/DETHRACE/pc-dos/dossys.c b/src/DETHRACE/pc-dos/dossys.c index e94bfe4b..9abefea4 100644 --- a/src/DETHRACE/pc-dos/dossys.c +++ b/src/DETHRACE/pc-dos/dossys.c @@ -525,7 +525,7 @@ void PDSetPalette(br_pixelmap* pThe_palette) { void PDSetPaletteEntries(br_pixelmap* pPalette, int pFirst_colour, int pCount) { int i; tU8* p; - p = (char*)pPalette->pixels + 4 * pFirst_colour; + p = (tU8*)pPalette->pixels + 4 * pFirst_colour; for (i = pFirst_colour; i < pFirst_colour + pCount; i++) { BrDevPaletteSetEntryOld(i, (p[2] << 16) | (p[1] << 8) | *p); p += 4;