mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-12 12:09:15 +00:00
Silence MSVC8 warnings.
svn-id: r26062
This commit is contained in:
parent
477372de61
commit
9b0bf64448
@ -172,7 +172,7 @@ void Disk::loadCnv(const char *filename, Cnv *cnv) {
|
||||
|
||||
void Disk::loadTalk(const char *name, Cnv *cnv) {
|
||||
|
||||
char* ext = strstr(name, ".talk");
|
||||
const char *ext = strstr(name, ".talk");
|
||||
if (ext != NULL) {
|
||||
// npc talk
|
||||
loadCnv(name, cnv);
|
||||
|
@ -845,7 +845,7 @@ void Display::decodePCX(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dst
|
||||
}
|
||||
|
||||
void Display::decodeLBM(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dstPitch, uint16 *w, uint16 *h, uint8 *pal, uint16 palStart, uint16 palEnd, uint8 colorBase) {
|
||||
int planeCount, planePitch;
|
||||
int planeCount = 0, planePitch = 0;
|
||||
const uint8 *srcEnd = src + srcSize;
|
||||
src += 12;
|
||||
while (src < srcEnd) {
|
||||
|
@ -176,7 +176,7 @@ void Square::Write(int Reg, byte Val) {
|
||||
break;
|
||||
|
||||
case 4:
|
||||
Enabled = Val;
|
||||
Enabled = (Val != 0);
|
||||
if (!Enabled)
|
||||
Timer = 0;
|
||||
break;
|
||||
@ -294,7 +294,7 @@ void Triangle::Write(int Reg, byte Val) {
|
||||
break;
|
||||
|
||||
case 4:
|
||||
Enabled = Val;
|
||||
Enabled = (Val != 0);
|
||||
if (!Enabled)
|
||||
Timer = 0;
|
||||
break;
|
||||
@ -391,7 +391,7 @@ void Noise::Write(int Reg, byte Val) {
|
||||
break;
|
||||
|
||||
case 4:
|
||||
Enabled = Val;
|
||||
Enabled = (Val != 0);
|
||||
if (!Enabled)
|
||||
Timer = 0;
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user