diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-08 16:46:21 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-08 16:46:21 +0000 |
| commit | 396c12ee73193f4ac3665ecac2f634fc0b046697 (patch) | |
| tree | 16edb33b60f95f6bda93bc84b3f2eb81e316ba1d /nGenEx/Color.cpp | |
| parent | 50971e84e295033941fac5291b08e593541fe945 (diff) | |
| download | starshatter-396c12ee73193f4ac3665ecac2f634fc0b046697.zip starshatter-396c12ee73193f4ac3665ecac2f634fc0b046697.tar.gz starshatter-396c12ee73193f4ac3665ecac2f634fc0b046697.tar.bz2 | |
Fixes for unsafe string handling, variable scoping errors.
Diffstat (limited to 'nGenEx/Color.cpp')
| -rw-r--r-- | nGenEx/Color.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nGenEx/Color.cpp b/nGenEx/Color.cpp index 41657eb..05f5fa2 100644 --- a/nGenEx/Color.cpp +++ b/nGenEx/Color.cpp @@ -465,11 +465,11 @@ Color::SetPalette(PALETTEENTRY* pal, int palsize, BYTE* invpal) palette[i] = pal[i];
if (invpal) {
- for (i = 0; i < 32768; i++)
+ for (int i = 0; i < 32768; i++)
table[i] = invpal[i];
}
else {
- for (i = 0; i < 32768; i++) {
+ for (int i = 0; i < 32768; i++) {
BYTE r = (i >> 10) & 0x1f;
BYTE g = (i >> 5) & 0x1f;
BYTE b = (i ) & 0x1f;
@@ -483,7 +483,7 @@ Color::SetPalette(PALETTEENTRY* pal, int palsize, BYTE* invpal) // set up formatted palette:
UseFormat(format);
- for (i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++)
UseTextureFormat(texture_format[i], i);
// set up shade table:
@@ -603,8 +603,8 @@ Color::SaveShadeTable(const char* basename) BYTE clut[256*256];
BYTE* pc = clut;
-
- for (int i = 0; i < SHADE_LEVELS*2; i++)
+ int i;
+ for (i = 0; i < SHADE_LEVELS*2; i++)
for (int j = 0; j < 256; j++)
*pc++ = (BYTE) ColorIndex::shade_table[i*256+j];
|