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

fixed compilation for emsvc4

Browse source 
svn-id: r16917
This commit is contained in:
Paweł Kołodziejski 2005-02-25 20:15:01 +00:00
parent 531ca37040
commit a73906443b
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scumm/gfx.cpp
View file

@ -578,7 +578,7 @@ void Gdi::ditherCGA(byte *dst, int dstPitch, int x, int y, int width, int height
void Gdi::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int *width, int *height) const { void Gdi::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int *width, int *height) const {
byte *srcptr, *dstptr; byte *srcptr, *dstptr;
int xo = *x, yo = *y, widtho = *width, heighto = *height; int xo = *x, yo = *y, widtho = *width, heighto = *height;
int idx1, idx2, dsty = 0; int idx1, idx2, dsty = 0, y1;
static const byte cgaDither[2][2][16] = { static const byte cgaDither[2][2][16] = {
{{0, 1, 0, 1, 2, 2, 0, 0, 3, 1, 3, 1, 3, 2, 1, 3}, {{0, 1, 0, 1, 2, 2, 0, 0, 3, 1, 3, 1, 3, 2, 1, 3},
{0, 0, 1, 1, 0, 2, 2, 3, 0, 3, 1, 1, 3, 3, 1, 3}}, {0, 0, 1, 1, 0, 2, 2, 3, 0, 3, 1, 1, 3, 3, 1, 3}},
@ -586,7 +586,7 @@ void Gdi::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int
{0, 1, 0, 1, 2, 2, 0, 0, 3, 1, 1, 1, 3, 2, 1, 3}}}; {0, 1, 0, 1, 2, 2, 0, 0, 3, 1, 1, 1, 3, 2, 1, 3}}};
// calculate dsty // calculate dsty
for (int y1 = 0; y1 < yo; y1++) { for (y1 = 0; y1 < yo; y1++) {
dsty += 2; dsty += 2;
if (y1 % 4 == 3) if (y1 % 4 == 3)
dsty--; dsty--;
@ -596,7 +596,7 @@ void Gdi::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int
*width *= 2; *width *= 2;
*height = 0; *height = 0;
for (int y1 = 0; y1 < heighto;) { for (y1 = 0; y1 < heighto;) {
srcptr = src + y1 * srcPitch; srcptr = src + y1 * srcPitch;
dstptr = hercbuf + dsty * Common::kHercW + xo * 2; dstptr = hercbuf + dsty * Common::kHercW + xo * 2;

3
scumm/script_v100he.cpp
View file

@ -1582,7 +1582,8 @@ void ScummEngine_v100he::o100_startSound() {
void ScummEngine_v100he::o100_setSpriteInfo() { void ScummEngine_v100he::o100_setSpriteInfo() {
int args[16]; int args[16];
int spriteId, n, tmp[2]; int spriteId, n;
int32 tmp[2];
static int storedFields[2]; static int storedFields[2];
byte string[80]; byte string[80];

3
scumm/script_v90he.cpp
View file

@ -955,7 +955,8 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
void ScummEngine_v90he::o90_setSpriteInfo() { void ScummEngine_v90he::o90_setSpriteInfo() {
int args[16]; int args[16];
int spriteId, tmp[2]; int spriteId;
int32 tmp[2];
static int storedFields[2]; static int storedFields[2];
int n; int n;

2
scumm/sprite_he.cpp
View file

@ -1227,7 +1227,7 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
int res_id, res_state; int res_id, res_state;
Common::Rect *bboxPtr; Common::Rect *bboxPtr;
int rot_angle, zoom; int rot_angle, zoom;
int w, h; int32 w, h;
WizParameters wiz; WizParameters wiz;
if (!_numSpritesToProcess) if (!_numSpritesToProcess)