diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-12-18 02:23:39 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:37 +0200 |
| commit | 95b8b49b7602e4e2d3cd9e38273fa94451bec780 (patch) | |
| tree | 2680f7beffc79957bb057cb018d4d7bc5c8ff2a3 /src/win95/chunkpal.cpp | |
| parent | abab1011ac9f80ca3b734bd70415ff255965441b (diff) | |
More Warning cleanups (Tim Beckmann)
Diffstat (limited to 'src/win95/chunkpal.cpp')
| -rw-r--r-- | src/win95/chunkpal.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/win95/chunkpal.cpp b/src/win95/chunkpal.cpp index 8bf84da..1e98413 100644 --- a/src/win95/chunkpal.cpp +++ b/src/win95/chunkpal.cpp @@ -154,8 +154,8 @@ Preset_Palette::Preset_Palette (Preset_Palette const & c) , reserved1(c.reserved1) , reserved2(c.reserved2) , startpos(c.startpos) -, pixel_data(grab_pixel_data(c.size, c.pixel_data)) , name(0) +, pixel_data(grab_pixel_data(c.size, c.pixel_data)) { if (c.name) { @@ -223,8 +223,8 @@ RIF_IMPLEMENT_DYNCREATE("PRSETPAL",Preset_Palette_Chunk) Preset_Palette_Chunk::Preset_Palette_Chunk(Chunk_With_Children * const parent, char const * sdata, size_t const /*ssize*/) : Chunk(parent,"PRSETPAL") -, version_num(*(int *)sdata) , flags(*(int *)(sdata+4)) +, version_num(*(int *)sdata) , reserved1(*(int *)(sdata+8)) , reserved2(*(int *)(sdata+12)) , reserved3(*(int *)(sdata+16)) @@ -291,7 +291,7 @@ RIF_IMPLEMENT_DYNCREATE("ENVTXLIT",Environment_TLT_Chunk) Environment_TLT_Chunk::Environment_TLT_Chunk (Chunk_With_Children * parent, const char * sdata, size_t ssize) : Chunk (parent, "ENVTXLIT"), width (*((int*)(sdata))), - num_levels (*((int*)(sdata+4))), flags(*(int *)(sdata+28)), table (0), filename(0) + num_levels (*((int*)(sdata+4))), flags(*(int *)(sdata+28)), filename(0), table (0) { int i; @@ -417,8 +417,8 @@ TLT_Config_Chunk::TLT_Config_Chunk (Chunk_With_Children * parent, const char * s : Chunk (parent, "TLTCONFG") , num_shades_white(*(unsigned int const *)sdata) , table_size(*(unsigned int const *)(sdata+4)) -, flags(*(unsigned int const *)(sdata+8)) , palette_size(*(unsigned int const *)(sdata+12)) +, flags(*(unsigned int const *)(sdata+8)) { if (!table_size) table_size = 256; @@ -833,8 +833,8 @@ RIF_IMPLEMENT_DYNCREATE("SETPALST",Preset_Palette_Store_Chunk) Preset_Palette_Store_Chunk::Preset_Palette_Store_Chunk(Chunk_With_Children * const parent, char const * sdata, size_t const /*ssize*/) : Chunk(parent,"SETPALST") -, version_num(*(int *)sdata) , flags(*(int *)(sdata+4)) +, version_num(*(int *)sdata) , reserved1(*(int *)(sdata+8)) , reserved2(*(int *)(sdata+12)) , reserved3(*(int *)(sdata+16)) |