m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load_IFF() cleanup. remove counter variable

Browse Source
This commit is contained in:
Thomas Bernard 2018-03-01 19:23:18 +01:00
parent 141d0bf698
commit 975c343cd7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fileformats.c
View File

@ -892,7 +892,6 @@ void Load_IFF(T_IO_Context * context)
dword section_size; dword section_size;
short x_pos; short x_pos;
short y_pos; short y_pos;
short counter;
short line_size = 0; // Taille d'une ligne en octets short line_size = 0; // Taille d'une ligne en octets
short plane_line_size = 0; // Size of line in bytes for 1 plane short plane_line_size = 0; // Size of line in bytes for 1 plane
short real_line_size = 0; // Taille d'une ligne en pixels short real_line_size = 0; // Taille d'une ligne en pixels
@ -1561,6 +1560,7 @@ void Load_IFF(T_IO_Context * context)
} }
else if (memcmp(section, "SHAM", 4) == 0) // Sliced HAM else if (memcmp(section, "SHAM", 4) == 0) // Sliced HAM
{ {
int i;
word version; word version;
dword SHAM_palette_count; dword SHAM_palette_count;
T_IFF_PCHG_Palette * prev_pal = NULL; T_IFF_PCHG_Palette * prev_pal = NULL;
@ -1583,13 +1583,13 @@ void Load_IFF(T_IO_Context * context)
} }
new_pal->Next = NULL; new_pal->Next = NULL;
new_pal->StartLine = y_pos; new_pal->StartLine = y_pos;
for (counter = 0; counter < 16; counter++) for (i = 0; i < 16; i++)
{ {
Read_byte(IFF_file, &temp_byte); // 0R Read_byte(IFF_file, &temp_byte); // 0R
new_pal->Palette[counter].R = (temp_byte & 0x0f) * 0x11; // 4 bits to 8 bits new_pal->Palette[i].R = (temp_byte & 0x0f) * 0x11; // 4 bits to 8 bits
Read_byte(IFF_file, &temp_byte); // GB Read_byte(IFF_file, &temp_byte); // GB
new_pal->Palette[counter].G = (temp_byte & 0xf0) | (temp_byte >> 4); new_pal->Palette[i].G = (temp_byte & 0xf0) | (temp_byte >> 4);
new_pal->Palette[counter].B = (temp_byte & 0x0f) * 0x11; // 4 bits to 8 bits new_pal->Palette[i].B = (temp_byte & 0x0f) * 0x11; // 4 bits to 8 bits
section_size -= 2; section_size -= 2;
} }
if (prev_pal != NULL) if (prev_pal != NULL)