diff options
| author | Kostas Nakos | 2009-03-01 19:46:07 +0000 |
|---|---|---|
| committer | Kostas Nakos | 2009-03-01 19:46:07 +0000 |
| commit | bf894deb06f7a26e3962031cd4e7e53c51e7d87b (patch) | |
| tree | 9656b875a0556dd35eedde37faa19cea869a1795 /engines/tinsel/bmv.cpp | |
| parent | 097641f021d924721ad48c9efa0bb59fb52349a1 (diff) | |
| download | scummvm-rg350-bf894deb06f7a26e3962031cd4e7e53c51e7d87b.tar.gz scummvm-rg350-bf894deb06f7a26e3962031cd4e7e53c51e7d87b.tar.bz2 scummvm-rg350-bf894deb06f7a26e3962031cd4e7e53c51e7d87b.zip | |
silence compiler warnings: the names of some tinsel defines were shadowing standard winapi defines
svn-id: r39049
Diffstat (limited to 'engines/tinsel/bmv.cpp')
| -rw-r--r-- | engines/tinsel/bmv.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index 59f524f710..2607ed068b 100644 --- a/engines/tinsel/bmv.cpp +++ b/engines/tinsel/bmv.cpp @@ -439,7 +439,7 @@ static void MoviePalette(int paletteOffset) { r = bigBuffer + paletteOffset; for (i = 0; i < 256; i++, r += 3) { - moviePal[i] = RGB(*r, *(r + 1), *(r + 2)); + moviePal[i] = TINSEL_RGB(*r, *(r + 1), *(r + 2)); } UpdateDACqueue(1, 255, &moviePal[1]); @@ -610,7 +610,7 @@ static int MovieCommand(char cmd, int commandOffset) { PTALK_CMD pCmd; pCmd = (PTALK_CMD)(bigBuffer + commandOffset); - talkColour = RGB(pCmd->r, pCmd->g, pCmd->b); + talkColour = TINSEL_RGB(pCmd->r, pCmd->g, pCmd->b); MovieText(nullContext, (int16)READ_LE_UINT16(&pCmd->stringId), (int16)READ_LE_UINT16(&pCmd->x), |