Backups/librw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing the fix

Browse Source
This commit is contained in:
aap 2020-04-25 00:47:40 +02:00
parent 13307f0a27
commit 1371a421e5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/charset.cpp
View File

@ -135,7 +135,7 @@ Charset::flushBuffer(void)
} }
void void
Charset::printChar(uint32 c, int32 x, int32 y) Charset::printChar(int32 c, int32 x, int32 y)
{ {
Camera *cam; Camera *cam;
float recipZ; float recipZ;
@ -143,7 +143,7 @@ Charset::printChar(uint32 c, int32 x, int32 y)
RWDEVICE::Im2DVertex *vert; RWDEVICE::Im2DVertex *vert;
uint16 *ix; uint16 *ix;
if((int32)c >= this->desc.count) if(c >= this->desc.count)
return; return;
if(this->raster != lastRaster || numChars >= NUMCHARS) if(this->raster != lastRaster || numChars >= NUMCHARS)

2
src/rwcharset.h
View File

@ -19,7 +19,7 @@ struct Charset
void printBuffered(const char *str, int32 x, int32 y, bool32 hideSpaces); void printBuffered(const char *str, int32 x, int32 y, bool32 hideSpaces);
static void flushBuffer(void); static void flushBuffer(void);
private: private:
void printChar(uint32 c, int32 x, int32 y); void printChar(int32 c, int32 x, int32 y);
}; };
} }

4
tools/clumpview/ras_test.cpp
View File

@ -287,11 +287,11 @@ putpixel(Canvas *canvas, Point3 p, Color c)
case DEPTHTEST_ALWAYS: case DEPTHTEST_ALWAYS:
break; break;
case DEPTHTEST_GEQUAL: case DEPTHTEST_GEQUAL:
if(p.z < (int)*z) if((u32)p.z < *z)
return; return;
break; break;
case DEPTHTEST_GREATER: case DEPTHTEST_GREATER:
if(p.z <= (int)*z) if((u32)p.z <= *z)
return; return;
break; break;
} }