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

indention fixed

Browse source 
svn-id: r6704
This commit is contained in:
Max Horn 2003-03-06 02:37:37 +00:00
parent b525feba24
commit 32b84fe2ba
4 changed files with 240 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sky/disk.cpp
View file

@ -168,11 +168,10 @@ uint16 *SkyState::load_file(uint16 file_nr, uint8 *dest)
return (uint16 *)file_dest;
}
if (! (uint8)(file_flags >> (22) & 0x1) ) { //include header?
if (! (uint8)(file_flags >> (22) & 0x1) ) { // include header?
eax += sizeof(struct dataFileHeader);
if (eax != decomp_size)
{
if (eax != decomp_size) {
debug(1, "ERROR: invalid decomp size! (was: %d, should be: %d)", eax, decomp_size);
}
}
@ -196,16 +195,14 @@ uint16 *SkyState::get_file_info(uint16 file_nr)
uint16 i;
uint16 *dnr_tbl_16_ptr = (uint16 *)dinner_table_area;
for (i = 0; i < dinner_table_size/2; i++)
{
if (READ_LE_UINT16(dnr_tbl_16_ptr+(i*4)) == file_nr)
{
for (i = 0; i < dinner_table_size/2; i++) {
if (READ_LE_UINT16(dnr_tbl_16_ptr+(i*4)) == file_nr) {
debug(1, "file %d found!", file_nr);
return (dnr_tbl_16_ptr+(i*4));
}
}
//if file is speech file then return NULL if not found
// if file is speech file then return NULL if not found
printf("get_file_info() - speech file support not implemented yet!\n");
return (uint16 *)NULL;
}

6
sky/intro.cpp
View file

@ -230,9 +230,9 @@ void SkyState::init_virgin()
if (_work_screen != NULL)
show_screen();
//free the memory that was malloc'ed indirectly via load_file
free (_work_screen);
free (_temp_pal);
// free the memory that was malloc'ed indirectly via load_file
free(_work_screen);
free(_temp_pal);
}
void SkyState::show_screen(void)

2
sky/screen.cpp
View file

@ -65,7 +65,7 @@ void SkyState::initialise_screen(void)
memset(tmp_pal, 0, game_colours * 4);
//set the remaining colors
for (i=0; i<(vga_colours-game_colours); i++) {
for (i = 0; i < (vga_colours-game_colours); i++) {
tmp_pal[game_colours+i*4] = (top_16_colours[i*3] << 2) + (top_16_colours[i*3] & 3);
tmp_pal[game_colours+i*4+1] = (top_16_colours[i*3+1] << 2) + (top_16_colours[i*3+1] & 3);
tmp_pal[game_colours+i*4+2] = (top_16_colours[i*3+2] << 2) + (top_16_colours[i*3+2] & 3);