thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TWINE: convert parameter type and removed casting

Browse source
This commit is contained in:
Martin Gerhardy 2020-11-27 23:11:15 +01:00
parent 89bc8dcfb2
commit a17d752cf3
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/twine/interface.cpp
View file

@ -50,8 +50,8 @@ int32 Interface::checkClipping(int32 x, int32 y) {
}
// TODO: check if Graphics::drawLine() works here
void Interface::drawLine(int32 startWidth, int32 startHeight, int32 endWidth, int32 endHeight, int32 lineColor) {
int32 currentLineColor = lineColor;
void Interface::drawLine(int32 startWidth, int32 startHeight, int32 endWidth, int32 endHeight, uint8 lineColor) {
uint8 currentLineColor = lineColor;
// draw line from left to right
if (startWidth > endWidth) {
@ -114,7 +114,7 @@ void Interface::drawLine(int32 startWidth, int32 startHeight, int32 endWidth, in
uint8 *out = (uint8*)_engine->frontVideoBuffer.getBasePtr(startWidth, startHeight);
int16 color = currentLineColor;
uint8 color = currentLineColor;
if (endWidth < endHeight) { // significant slope
int16 xchg = endWidth;
endWidth = endHeight;
@ -125,7 +125,7 @@ void Interface::drawLine(int32 startWidth, int32 startHeight, int32 endWidth, in
endHeight <<= 1;
endWidth++;
do {
*out = (uint8)color;
*out = color;
startHeight -= endHeight;
if (startHeight > 0) {
out += flag2;
@ -141,7 +141,7 @@ void Interface::drawLine(int32 startWidth, int32 startHeight, int32 endWidth, in
endHeight <<= 1;
endWidth++;
do {
*out = (uint8)color;
*out = color;
out++;
startHeight -= endHeight;
if (startHeight < 0) {

2
engines/twine/interface.h
View file

@ -64,7 +64,7 @@ public:
* @param endHeight height value where the line ends
* @param lineColor line color in the current palette
*/
void drawLine(int32 startWidth, int32 startHeight, int32 endWidth, int32 endHeight, int32 lineColor);
void drawLine(int32 startWidth, int32 startHeight, int32 endWidth, int32 endHeight, uint8 lineColor);
/**
* Blit button box from working buffer to front buffer