[Scummvm-cvs-logs] CVS: scummvm/simon simonsys.cpp,1.2,1.3 simon.h,1.4,1.5 simon.cpp,1.7,1.8 midi.cpp,1.5,1.6
Ludvig Strigeus
strigeus at users.sourceforge.net
Sat Apr 13 13:10:07 CEST 2002
Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv3938
Modified Files:
simonsys.cpp simon.h simon.cpp midi.cpp
Log Message:
made more endian safe
Index: simonsys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simonsys.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** simonsys.cpp 13 Apr 2002 10:41:26 -0000 1.2
--- simonsys.cpp 13 Apr 2002 20:08:58 -0000 1.3
***************
*** 32,42 ****
#endif
! uint16 swap16(uint16 a) {
! return (a>>8)|(a<<8);
! }
! uint32 swap32(uint32 a) {
! return (a>>24)|(a>>8)&0xFF00|(a<<8)&0xFF0000|(a<<24);
! }
--- 32,42 ----
#endif
! //uint16 swap16(uint16 a) {
! // return (a>>8)|(a<<8);
! //}
! //uint32 swap32(uint32 a) {
! // return (a>>24)|(a>>8)&0xFF00|(a<<8)&0xFF0000|(a<<24);
! //}
***************
*** 73,82 ****
void fileWriteBE32(FILE *in, uint32 value) {
! value = swap32(value);
fwrite(&value, sizeof(value), 1, in);
}
void fileWriteBE16(FILE *in, uint16 value) {
! value = swap16(value);
fwrite(&value, sizeof(value), 1, in);
}
--- 73,82 ----
void fileWriteBE32(FILE *in, uint32 value) {
! value = TO_BE_32(value);
fwrite(&value, sizeof(value), 1, in);
}
void fileWriteBE16(FILE *in, uint16 value) {
! value = TO_BE_16(value);
fwrite(&value, sizeof(value), 1, in);
}
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** simon.h 13 Apr 2002 19:02:55 -0000 1.4
--- simon.h 13 Apr 2002 20:08:58 -0000 1.5
***************
*** 1024,1029 ****
void CDECL warning(const char *errmsg, ...);
! uint16 swap16(uint16 a);
! uint32 swap32(uint32 a);
--- 1024,1029 ----
void CDECL warning(const char *errmsg, ...);
! //uint16 swap16(uint16 a);
! //uint32 swap32(uint32 a);
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** simon.cpp 13 Apr 2002 18:31:45 -0000 1.7
--- simon.cpp 13 Apr 2002 20:08:58 -0000 1.8
***************
*** 41,44 ****
--- 41,45 ----
SimonState *g_simon;
+
static const GameSpecificSettings simon1_settings = {
1, /* VGA_DELAY_BASE */
***************
*** 3685,3693 ****
bb = _cur_vga_file_1;
! b = bb + swap16(((VgaFile1Header*)bb)->hdr2_start);
! c = swap16(((VgaFile1Header2*)b)->unk1);
! b = bb + swap16(((VgaFile1Header2*)b)->unk2_offs);
! while (swap16(((VgaFile1Struct0x8*)b)->id) != vga_res_id)
b += sizeof(VgaFile1Struct0x8);
--- 3686,3694 ----
bb = _cur_vga_file_1;
! b = bb + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header*)bb)->hdr2_start);
! c = READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)b)->unk1);
! b = bb + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)b)->unk2_offs);
! while (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8*)b)->id) != vga_res_id)
b += sizeof(VgaFile1Struct0x8);
***************
*** 3709,3713 ****
vc_ptr_org = _vc_ptr;
! _vc_ptr = _cur_vga_file_1 + swap16(((VgaFile1Struct0x8*)b)->script_offs);
// dump_vga_script(_vc_ptr, num, vga_res_id);
run_vga_script();
--- 3710,3714 ----
vc_ptr_org = _vc_ptr;
! _vc_ptr = _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8*)b)->script_offs);
// dump_vga_script(_vc_ptr, num, vga_res_id);
run_vga_script();
***************
*** 3880,3884 ****
if (!(_game & GAME_SIMON2)) {
! opcode = swap16(*(uint16*)_vc_ptr);
_vc_ptr += 2;
} else {
--- 3881,3885 ----
if (!(_game & GAME_SIMON2)) {
! opcode = READ_BE_UINT16_UNALIGNED(_vc_ptr);
_vc_ptr += 2;
} else {
***************
*** 3897,3901 ****
int SimonState::vc_read_var_or_word(void *ptr) {
! int16 var = swap16(*(uint16*)ptr);
if (var < 0)
var = vc_read_var(-var);
--- 3898,3902 ----
int SimonState::vc_read_var_or_word(void *ptr) {
! int16 var = READ_BE_UINT16_UNALIGNED(ptr);
if (var < 0)
var = vc_read_var(-var);
***************
*** 3904,3908 ****
uint SimonState::vc_read_next_word() {
! uint a = swap16(*(uint16*)_vc_ptr);
_vc_ptr += 2;
return a;
--- 3905,3909 ----
uint SimonState::vc_read_next_word() {
! uint a = READ_BE_UINT16_UNALIGNED(_vc_ptr);
_vc_ptr += 2;
return a;
***************
*** 3986,3998 ****
bb = _cur_vga_file_1;
! b = bb + swap16(((VgaFile1Header*)bb)->hdr2_start);
! b = bb + swap16(((VgaFile1Header2*)b)->unk2_offs);
! while (swap16(((VgaFile1Struct0x8*)b)->id) != num)
b += sizeof(VgaFile1Struct0x8);
vc_ptr_org = _vc_ptr;
! _vc_ptr = _cur_vga_file_1 + swap16(((VgaFile1Struct0x8*)b)->script_offs);
--- 3987,3999 ----
bb = _cur_vga_file_1;
! b = bb + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header*)bb)->hdr2_start);
! b = bb + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)b)->unk2_offs);
! while (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8*)b)->id) != num)
b += sizeof(VgaFile1Struct0x8);
vc_ptr_org = _vc_ptr;
! _vc_ptr = _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8*)b)->script_offs);
***************
*** 4058,4065 ****
pp = _cur_vga_file_1;
! p = pp + swap16(((VgaFile1Header*)pp)->hdr2_start);
! p = pp + swap16(((VgaFile1Header2*)p)->id_table);
! while (swap16(((VgaFile1Struct0x6*)p)->id) != b)
p += sizeof(VgaFile1Struct0x6);
--- 4059,4066 ----
pp = _cur_vga_file_1;
! p = pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header*)pp)->hdr2_start);
! p = pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)p)->id_table);
! while (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->id) != b)
p += sizeof(VgaFile1Struct0x6);
***************
*** 4084,4091 ****
#endif
! dump_vga_script(_cur_vga_file_1 + swap16(((VgaFile1Struct0x6*)p)->script_offs), res, b);
add_vga_timer(gss->VGA_DELAY_BASE,
! _cur_vga_file_1 + swap16(((VgaFile1Struct0x6*)p)->script_offs),b , res);
}
--- 4085,4092 ----
#endif
! dump_vga_script(_cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), res, b);
add_vga_timer(gss->VGA_DELAY_BASE,
! _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs),b , res);
}
***************
*** 4367,4373 ****
p2 = _cur_vga_file_2 + state.image * 8;
! state.depack_src = _cur_vga_file_2 + swap32(*(uint32*)p2);
! width = swap16(*(uint16*)(p2+6))>>4;
height = p2[5];
flags = p2[4];
--- 4368,4374 ----
p2 = _cur_vga_file_2 + state.image * 8;
! state.depack_src = _cur_vga_file_2 + READ_BE_UINT32_UNALIGNED(&*(uint32*)p2);
! width = READ_BE_UINT16_UNALIGNED(p2+6)>>4;
height = p2[5];
flags = p2[4];
***************
*** 4408,4412 ****
w = 40;
do {
! vc_10_helper_8(dst, src + swap32(*(uint32*)src));
dst += 8;
src += 4;
--- 4409,4413 ----
w = 40;
do {
! vc_10_helper_8(dst, src + READ_BE_UINT32_UNALIGNED(&*(uint32*)src));
dst += 8;
src += 4;
***************
*** 4776,4780 ****
uint a = vc_read_next_word();
_pathfind_array[a - 1] = (uint16*)_vc_ptr;
! while ( *(uint16*)_vc_ptr != 0xE703) /* this is a byte swapped 999 */
_vc_ptr += 4;
_vc_ptr += 2;
--- 4777,4781 ----
uint a = vc_read_next_word();
_pathfind_array[a - 1] = (uint16*)_vc_ptr;
! while ( READ_BE_UINT16_UNALIGNED(_vc_ptr) != 999)
_vc_ptr += 4;
_vc_ptr += 2;
***************
*** 4792,4795 ****
--- 4793,4797 ----
}
+ /* FIXME: unaligned access */
void SimonState::vc_20() {
/* no idea what's going on */
***************
*** 4799,4802 ****
--- 4801,4805 ----
}
+ /* FIXME: unaligned access */
void SimonState::vc_21() {
if (!(_game & GAME_SIMON2)) {
***************
*** 5207,5215 ****
do{
! y2 = swap16(*p);
p += step;
! y1 = swap16(*p) - y2;
! // assert(swap16(p[1]) != 999);
vp[0] = y1>>1;
--- 5210,5218 ----
do{
! y2 = READ_BE_UINT16_UNALIGNED(p);
p += step;
! y1 = READ_BE_UINT16_UNALIGNED(p) - y2;
! // assert(READ_BE_UINT16_UNALIGNED(&p[1]) != 999);
vp[0] = y1>>1;
***************
*** 5321,5325 ****
_vga_cur_sprite_id = vc_read_next_word();
! tmp = swap16(vc_read_next_word());
vc_ptr = _vc_ptr;
--- 5324,5328 ----
_vga_cur_sprite_id = vc_read_next_word();
! tmp = TO_BE_16(vc_read_next_word());
vc_ptr = _vc_ptr;
***************
*** 5452,5460 ****
_video_palette_mode = vsp->unk6;
! params[0] = swap16(vsp->image);
! params[1] = swap16(vsp->base_color);
! params[2] = swap16(vsp->x);
! params[3] = swap16(vsp->y);
! params[4] = swap16(vsp->unk4);
_vc_ptr = (byte*)params;
vc_10();
--- 5455,5463 ----
_video_palette_mode = vsp->unk6;
! params[0] = READ_BE_UINT16_UNALIGNED(&vsp->image);
! params[1] = READ_BE_UINT16_UNALIGNED(&vsp->base_color);
! params[2] = READ_BE_UINT16_UNALIGNED(&vsp->x);
! params[3] = READ_BE_UINT16_UNALIGNED(&vsp->y);
! params[4] = READ_BE_UINT16_UNALIGNED(&vsp->unk4);
_vc_ptr = (byte*)params;
vc_10();
***************
*** 5699,5703 ****
VgaTimerEntry *vte;
! // assert( (uint)swap16(*(uint16*)code_ptr) <= 63);
_lock_word |= 1;
--- 5702,5706 ----
VgaTimerEntry *vte;
! // assert( (uint)READ_BE_UINT16_UNALIGNED(&*(uint16*)code_ptr) <= 63);
_lock_word |= 1;
***************
*** 5760,5764 ****
void SimonState::o_unk_120(uint a) {
! uint16 id = swap16(a);
_lock_word |= 0x4000;
_vc_ptr = (byte*)&id;
--- 5763,5767 ----
void SimonState::o_unk_120(uint a) {
! uint16 id = READ_BE_UINT16_UNALIGNED(&a);
_lock_word |= 0x4000;
_vc_ptr = (byte*)&id;
***************
*** 5819,5831 ****
_vga_cur_sprite_id = vsp->id;
! params[0] = swap16(vsp->image);
! params[1] = swap16(vsp->base_color);
! params[2] = swap16(vsp->x);
! params[3] = swap16(vsp->y);
if(_game & GAME_SIMON2) {
*(byte*)(¶ms[4]) = (byte)vsp->unk4;
} else {
! params[4] = swap16(vsp->unk4);
}
--- 5822,5834 ----
_vga_cur_sprite_id = vsp->id;
! params[0] = READ_BE_UINT16_UNALIGNED(&vsp->image);
! params[1] = READ_BE_UINT16_UNALIGNED(&vsp->base_color);
! params[2] = READ_BE_UINT16_UNALIGNED(&vsp->x);
! params[3] = READ_BE_UINT16_UNALIGNED(&vsp->y);
if(_game & GAME_SIMON2) {
*(byte*)(¶ms[4]) = (byte)vsp->unk4;
} else {
! params[4] = READ_BE_UINT16_UNALIGNED(&vsp->unk4);
}
***************
*** 5861,5865 ****
src = _vga_var7 + x*4;
! vc_10_helper_8(dst,src+swap32(*((uint32*)src)));
dx_unlock_2();
--- 5864,5868 ----
src = _vga_var7 + x*4;
! vc_10_helper_8(dst,src+READ_BE_UINT32_UNALIGNED(&*((uint32*)src)));
dx_unlock_2();
***************
*** 5900,5908 ****
fprintf(_dump_file,"id:%5d image:%3d base-color:%3d x:%3d y:%3d flags:%x\n",
vsp->id, vsp->image, vsp->base_color, vsp->x, vsp->y, vsp->unk4 );
! params[0] = swap16(vsp->image);
! params[1] = swap16(vsp->base_color);
! params[2] = swap16(vsp->x);
! params[3] = swap16(vsp->y);
! params[4] = swap16(vsp->unk4);
_vc_ptr = (byte*)params;
vc_10();
--- 5903,5911 ----
fprintf(_dump_file,"id:%5d image:%3d base-color:%3d x:%3d y:%3d flags:%x\n",
vsp->id, vsp->image, vsp->base_color, vsp->x, vsp->y, vsp->unk4 );
! params[0] = READ_BE_UINT16_UNALIGNED(&vsp->image);
! params[1] = READ_BE_UINT16_UNALIGNED(&vsp->base_color);
! params[2] = READ_BE_UINT16_UNALIGNED(&vsp->x);
! params[3] = READ_BE_UINT16_UNALIGNED(&vsp->y);
! params[4] = READ_BE_UINT16_UNALIGNED(&vsp->unk4);
_vc_ptr = (byte*)params;
vc_10();
***************
*** 6034,6038 ****
void SimonState::o_unk_99_simon1(uint a) {
! uint16 b = swap16(a);
_lock_word |= 0x4000;
_vc_ptr = (byte*)&b;
--- 6037,6041 ----
void SimonState::o_unk_99_simon1(uint a) {
! uint16 b = READ_BE_UINT16_UNALIGNED(&a);
_lock_word |= 0x4000;
_vc_ptr = (byte*)&b;
***************
*** 6044,6049 ****
uint16 items[2];
! items[0] = swap16(a);
! items[1] = swap16(b);
_lock_word |= 0x4000;
--- 6047,6052 ----
uint16 items[2];
! items[0] = READ_BE_UINT16_UNALIGNED(&a);
! items[1] = READ_BE_UINT16_UNALIGNED(&b);
_lock_word |= 0x4000;
***************
*** 6183,6188 ****
continue;
for(j=0; p[0] != 0xE703; j++,p+=2) { /* 0xE703 = byteswapped 999 */
! x_diff = abs(swap16(p[0]) - x);
! y_diff = abs(swap16(p[1]) - 12 - y);
if (x_diff < y_diff) {
--- 6186,6191 ----
continue;
for(j=0; p[0] != 0xE703; j++,p+=2) { /* 0xE703 = byteswapped 999 */
! x_diff = abs(READ_BE_UINT16_UNALIGNED(&p[0]) - x);
! y_diff = abs(READ_BE_UINT16_UNALIGNED(&p[1]) - 12 - y);
if (x_diff < y_diff) {
***************
*** 6806,6821 ****
pp = _cur_vga_file_1;
! p = pp + swap16(((VgaFile1Header*)pp)->hdr2_start);
! count = swap16(((VgaFile1Header2*)p)->id_count);
! p = pp + swap16(((VgaFile1Header2*)p)->id_table);
for(;;) {
! if (swap16(((VgaFile1Struct0x6*)p)->id) == vga_struct_id) {
! dump_vga_script(pp + swap16(((VgaFile1Struct0x6*)p)->script_offs), vga_res, vga_struct_id);
add_vga_timer(gss->VGA_DELAY_BASE,
! pp + swap16(((VgaFile1Struct0x6*)p)->script_offs),
vga_struct_id, vga_res);
break;
--- 6809,6824 ----
pp = _cur_vga_file_1;
! p = pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header*)pp)->hdr2_start);
! count = READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)p)->id_count);
! p = pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)p)->id_table);
for(;;) {
! if (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->id) == vga_struct_id) {
! dump_vga_script(pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), vga_res, vga_struct_id);
add_vga_timer(gss->VGA_DELAY_BASE,
! pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs),
vga_struct_id, vga_res);
break;
***************
*** 7156,7162 ****
p = dst + num_1 * 8;
! *(uint16*)(p+4) = swap16(height);
! *(uint16*)(p+6) = swap16(width);
! dst += swap32(*(uint32*)p);
memset(dst, 0, count);
--- 7159,7165 ----
p = dst + num_1 * 8;
! *(uint16*)(p+4) = READ_BE_UINT16_UNALIGNED(&height);
! *(uint16*)(p+6) = READ_BE_UINT16_UNALIGNED(&width);
! dst += READ_BE_UINT32_UNALIGNED(&*(uint32*)p);
memset(dst, 0, count);
***************
*** 8570,8574 ****
do {
if (!(_game & GAME_SIMON2)) {
! opcode = swap16(*(uint16*)src);
src+=2;
} else {
--- 8573,8577 ----
do {
if (!(_game & GAME_SIMON2)) {
! opcode = READ_BE_UINT16_UNALIGNED(&*(uint16*)src);
src+=2;
} else {
***************
*** 8589,8598 ****
case 'x': fprintf(_dump_file,"\n"); return;
case 'b': fprintf(_dump_file,"%d ", *src++); break;
! case 'd': fprintf(_dump_file,"%d ", swap16(*(uint16*)src)); src+=2; break;
! case 'v': fprintf(_dump_file,"[%d] ", swap16(*(uint16*)src)); src+=2; break;
! case 'i': fprintf(_dump_file,"%d ", (int16)swap16(*(uint16*)src)); src+=2; break;
case 'q':
while (*(uint16*)src != 0xE703) {
! fprintf(_dump_file,"(%d,%d) ", swap16(((uint16*)src)[0]), swap16(((uint16*)src)[1]));
src += 4;
}
--- 8592,8601 ----
case 'x': fprintf(_dump_file,"\n"); return;
case 'b': fprintf(_dump_file,"%d ", *src++); break;
! case 'd': fprintf(_dump_file,"%d ", READ_BE_UINT16_UNALIGNED(&*(uint16*)src)); src+=2; break;
! case 'v': fprintf(_dump_file,"[%d] ", READ_BE_UINT16_UNALIGNED(&*(uint16*)src)); src+=2; break;
! case 'i': fprintf(_dump_file,"%d ", (int16)READ_BE_UINT16_UNALIGNED(&*(uint16*)src)); src+=2; break;
case 'q':
while (*(uint16*)src != 0xE703) {
! fprintf(_dump_file,"(%d,%d) ", READ_BE_UINT16_UNALIGNED(&((uint16*)src)[0]), READ_BE_UINT16_UNALIGNED(&((uint16*)src)[1]));
src += 4;
}
***************
*** 8615,8625 ****
pp = vga;
! p = pp + swap16(((VgaFile1Header*)pp)->hdr2_start);
! count = swap16(((VgaFile1Header2*)p)->id_count);
! p = pp + swap16(((VgaFile1Header2*)p)->id_table);
while (--count >= 0) {
! int id = swap16(((VgaFile1Struct0x6*)p)->id);
! dump_vga_script_always(vga + swap16(((VgaFile1Struct0x6*)p)->script_offs), id/100, id);
p += sizeof(VgaFile1Struct0x6);
}
--- 8618,8628 ----
pp = vga;
! p = pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header*)pp)->hdr2_start);
! count = READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)p)->id_count);
! p = pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)p)->id_table);
while (--count >= 0) {
! int id = READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->id);
! dump_vga_script_always(vga + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), id/100, id);
p += sizeof(VgaFile1Struct0x6);
}
***************
*** 8631,8642 ****
bb = vga;
! b = bb + swap16(((VgaFile1Header*)bb)->hdr2_start);
! c = swap16(((VgaFile1Header2*)b)->unk1);
! b = bb + swap16(((VgaFile1Header2*)b)->unk2_offs);
while (--c >= 0) {
! int id = swap16(((VgaFile1Struct0x8*)b)->id);
! dump_vga_script_always(vga + swap16(((VgaFile1Struct0x8*)b)->script_offs), id/100, id);
b += sizeof(VgaFile1Struct0x8);
}
--- 8634,8645 ----
bb = vga;
! b = bb + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header*)bb)->hdr2_start);
! c = READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)b)->unk1);
! b = bb + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2*)b)->unk2_offs);
while (--c >= 0) {
! int id = READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8*)b)->id);
! dump_vga_script_always(vga + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8*)b)->script_offs), id/100, id);
b += sizeof(VgaFile1Struct0x8);
}
Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** midi.cpp 13 Apr 2002 19:02:55 -0000 1.5
--- midi.cpp 13 Apr 2002 20:08:58 -0000 1.6
***************
*** 41,45 ****
uint32 num;
read_from_file(&num, 4);
! return swap32(num);
}
--- 41,45 ----
uint32 num;
read_from_file(&num, 4);
! return READ_BE_UINT32(&num);
}
***************
*** 47,51 ****
uint16 num;
read_from_file(&num, 2);
! return swap16(num);
}
--- 47,51 ----
uint16 num;
read_from_file(&num, 2);
! return READ_BE_UINT16(&num);
}
More information about the Scummvm-git-logs
mailing list