[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.10,1.11 debug.cpp,1.18,1.19 simon.cpp,1.238,1.239 vga.cpp,1.63,1.64
Max Horn
fingolfin at users.sourceforge.net
Sat Jun 14 11:53:07 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush imuse_channel.cpp,1.17,1.18 saud_channel.cpp,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.78,1.79 gfx.cpp,2.158,2.159 imuse.cpp,2.64,2.65 imuse_digi.cpp,1.16,1.17 object.cpp,1.121,1.122 resource.cpp,1.97,1.98 resource.h,1.3,1.4 saveload.cpp,1.88,1.89 script_v5.cpp,1.118,1.119 scummvm.cpp,2.241,2.242 sound.cpp,1.134,1.135 verbs.cpp,1.54,1.55
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv12056/simon
Modified Files:
charset.cpp debug.cpp simon.cpp vga.cpp
Log Message:
Patch #754151: Removed READ_*_UNALIGNED and always read stuff bytewise; augmented by some more changes of mine
Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- charset.cpp 1 Jun 2003 09:41:55 -0000 1.10
+++ charset.cpp 14 Jun 2003 18:52:29 -0000 1.11
@@ -79,7 +79,7 @@
*(uint16 *)(p + 4) = TO_BE_16(height);
*(uint16 *)(p + 6) = TO_BE_16(width);
- dst += READ_BE_UINT32_UNALIGNED(p);
+ dst += READ_BE_UINT32(p);
memset(dst, 0, count);
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- debug.cpp 1 Jun 2003 09:41:55 -0000 1.18
+++ debug.cpp 14 Jun 2003 18:52:29 -0000 1.19
@@ -175,7 +175,7 @@
do {
if (!(_game & GF_SIMON2)) {
- opcode = READ_BE_UINT16_UNALIGNED(src);
+ opcode = READ_BE_UINT16(src);
src += 2;
} else {
opcode = *src++;
@@ -205,21 +205,21 @@
fprintf(_dump_file, "%d ", *src++);
break;
case 'd':
- fprintf(_dump_file, "%d ", READ_BE_UINT16_UNALIGNED(src));
+ fprintf(_dump_file, "%d ", READ_BE_UINT16(src));
src += 2;
break;
case 'v':
- fprintf(_dump_file, "[%d] ", READ_BE_UINT16_UNALIGNED(src));
+ fprintf(_dump_file, "[%d] ", READ_BE_UINT16(src));
src += 2;
break;
case 'i':
- fprintf(_dump_file, "%d ", (int16)READ_BE_UINT16_UNALIGNED(src));
+ fprintf(_dump_file, "%d ", (int16)READ_BE_UINT16(src));
src += 2;
break;
case 'q':
- while (READ_BE_UINT16_UNALIGNED(src) != 999) {
- fprintf(_dump_file, "(%d,%d) ", READ_BE_UINT16_UNALIGNED(src),
- READ_BE_UINT16_UNALIGNED(src + 2));
+ while (READ_BE_UINT16(src) != 999) {
+ fprintf(_dump_file, "(%d,%d) ", READ_BE_UINT16(src),
+ READ_BE_UINT16(src + 2));
src += 4;
}
src++;
@@ -240,13 +240,13 @@
int count;
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);
+ p = pp + READ_BE_UINT16(&((VgaFile1Header *) pp)->hdr2_start);
+ count = READ_BE_UINT16(&((VgaFile1Header2 *) p)->id_count);
+ p = pp + READ_BE_UINT16(&((VgaFile1Header2 *) p)->id_table);
while (--count >= 0) {
- int id = READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->id);
+ int id = READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->id);
- dump_vga_script_always(vga + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->script_offs), id / 100, id);
+ dump_vga_script_always(vga + READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->script_offs), id / 100, id);
p += sizeof(VgaFile1Struct0x6);
}
}
@@ -256,14 +256,14 @@
int c;
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);
+ b = bb + READ_BE_UINT16(&((VgaFile1Header *) bb)->hdr2_start);
+ c = READ_BE_UINT16(&((VgaFile1Header2 *) b)->unk1);
+ b = bb + READ_BE_UINT16(&((VgaFile1Header2 *) b)->unk2_offs);
while (--c >= 0) {
- int id = READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->id);
+ int id = READ_BE_UINT16(&((VgaFile1Struct0x8 *) b)->id);
- dump_vga_script_always(vga + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->script_offs), id / 100, id);
+ dump_vga_script_always(vga + READ_BE_UINT16(&((VgaFile1Struct0x8 *) b)->script_offs), id / 100, id);
b += sizeof(VgaFile1Struct0x8);
}
}
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- simon.cpp 14 Jun 2003 14:58:08 -0000 1.238
+++ simon.cpp 14 Jun 2003 18:52:29 -0000 1.239
@@ -2248,11 +2248,11 @@
// ensure flipping complete
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);
+ b = bb + READ_BE_UINT16(&((VgaFile1Header *) bb)->hdr2_start);
+ c = READ_BE_UINT16(&((VgaFile1Header2 *) b)->unk1);
+ b = bb + READ_BE_UINT16(&((VgaFile1Header2 *) b)->unk2_offs);
- while (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->id) != vga_res_id)
+ while (READ_BE_UINT16(&((VgaFile1Struct0x8 *) b)->id) != vga_res_id)
b += sizeof(VgaFile1Struct0x8);
if (!(_game & GF_SIMON2)) {
@@ -2272,7 +2272,7 @@
vc_ptr_org = _vc_ptr;
- _vc_ptr = _cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->script_offs);
+ _vc_ptr = _cur_vga_file_1 + READ_BE_UINT16(&((VgaFile1Struct0x8 *) b)->script_offs);
//dump_vga_script(_vc_ptr, num, vga_res_id);
run_vga_script();
_vc_ptr = vc_ptr_org;
@@ -2795,15 +2795,15 @@
_video_palette_mode = vsp->unk6;
_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);
+ params[0] = READ_BE_UINT16(&vsp->image);
+ params[1] = READ_BE_UINT16(&vsp->base_color);
+ params[2] = READ_BE_UINT16(&vsp->x);
+ params[3] = READ_BE_UINT16(&vsp->y);
if (_game & GF_SIMON2) {
*(byte *)(¶ms[4]) = (byte)vsp->unk4;
} else {
- params[4] = READ_BE_UINT16_UNALIGNED(&vsp->unk4);
+ params[4] = READ_BE_UINT16(&vsp->unk4);
}
_vc_ptr = (byte *)params;
@@ -2837,7 +2837,7 @@
}
src = _vga_var7 + x * 4;
- decodeStripA(dst, src + READ_BE_UINT32_UNALIGNED(&*((uint32 *)src)), _vga_var5);
+ decodeStripA(dst, src + READ_BE_UINT32(&*((uint32 *)src)), _vga_var5);
dx_unlock_2();
@@ -2875,11 +2875,11 @@
if (vsp->image)
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);
+ params[0] = READ_BE_UINT16(&vsp->image);
+ params[1] = READ_BE_UINT16(&vsp->base_color);
+ params[2] = READ_BE_UINT16(&vsp->x);
+ params[3] = READ_BE_UINT16(&vsp->y);
+ params[4] = READ_BE_UINT16(&vsp->unk4);
_vc_ptr = (byte *)params;
vc_10_draw();
@@ -3108,9 +3108,9 @@
p = (uint16 *)_pathfind_array[20 - i];
if (!p)
continue;
- for (j = 0; READ_BE_UINT16_UNALIGNED(&p[0]) != 999; j++, p += 2) { // 0xE703 = byteswapped 999
- x_diff = abs((int)(READ_BE_UINT16_UNALIGNED(&p[0]) - x));
- y_diff = abs((int)(READ_BE_UINT16_UNALIGNED(&p[1]) - 12 - y));
+ for (j = 0; READ_BE_UINT16(&p[0]) != 999; j++, p += 2) { // 0xE703 = byteswapped 999
+ x_diff = abs((int)(READ_BE_UINT16(&p[0]) - x));
+ y_diff = abs((int)(READ_BE_UINT16(&p[1]) - 12 - y));
if (x_diff < y_diff) {
x_diff >>= 2;
@@ -3714,17 +3714,17 @@
}
pp = _cur_vga_file_1;
- p = pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header *) pp)->hdr2_start);
+ p = pp + READ_BE_UINT16(&((VgaFile1Header *) pp)->hdr2_start);
- count = READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2 *) p)->id_count);
- p = pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Header2 *) p)->id_table);
+ count = READ_BE_UINT16(&((VgaFile1Header2 *) p)->id_count);
+ p = pp + READ_BE_UINT16(&((VgaFile1Header2 *) p)->id_table);
for (;;) {
- if (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->id) == vga_struct_id) {
+ if (READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->id) == vga_struct_id) {
- //dump_vga_script(pp + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), vga_res, vga_struct_id);
+ //dump_vga_script(pp + READ_BE_UINT16(&((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);
+ add_vga_timer(gss->VGA_DELAY_BASE, pp + READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->script_offs), vga_struct_id, vga_res);
break;
}
p += sizeof(VgaFile1Struct0x6);
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- vga.cpp 1 Jun 2003 09:41:56 -0000 1.63
+++ vga.cpp 14 Jun 2003 18:52:30 -0000 1.64
@@ -120,7 +120,7 @@
}
if (!(_game & GF_SIMON2)) {
- opcode = READ_BE_UINT16_UNALIGNED(_vc_ptr);
+ opcode = READ_BE_UINT16(_vc_ptr);
_vc_ptr += 2;
} else {
opcode = *_vc_ptr++;
@@ -144,7 +144,7 @@
}
uint SimonEngine::vc_read_next_word() {
- uint a = READ_BE_UINT16_UNALIGNED(_vc_ptr);
+ uint a = READ_BE_UINT16(_vc_ptr);
_vc_ptr += 2;
return a;
}
@@ -245,15 +245,15 @@
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);
+ b = bb + READ_BE_UINT16(&((VgaFile1Header *) bb)->hdr2_start);
+ b = bb + READ_BE_UINT16(&((VgaFile1Header2 *) b)->unk2_offs);
- while (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x8 *) b)->id) != num)
+ while (READ_BE_UINT16(&((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);
+ _vc_ptr = _cur_vga_file_1 + READ_BE_UINT16(&((VgaFile1Struct0x8 *) b)->script_offs);
//dump_vga_script(_vc_ptr, res, num);
run_vga_script();
@@ -317,10 +317,10 @@
}
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);
+ p = pp + READ_BE_UINT16(&((VgaFile1Header *) pp)->hdr2_start);
+ p = pp + READ_BE_UINT16(&((VgaFile1Header2 *) p)->id_table);
- while (READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6 *) p)->id) != b)
+ while (READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->id) != b)
p += sizeof(VgaFile1Struct0x6);
#ifdef DUMP_FILE_NR
@@ -343,9 +343,9 @@
}
#endif
- //dump_vga_script(_cur_vga_file_1 + READ_BE_UINT16_UNALIGNED(&((VgaFile1Struct0x6*)p)->script_offs), res, b);
+ //dump_vga_script(_cur_vga_file_1 + READ_BE_UINT16(&((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);
+ add_vga_timer(gss->VGA_DELAY_BASE, _cur_vga_file_1 + READ_BE_UINT16(&((VgaFile1Struct0x6 *) p)->script_offs), b, res);
}
void SimonEngine::vc_4_dummy_op() {
@@ -599,9 +599,9 @@
state.image = vc_read_var(-state.image);
p2 = _cur_vga_file_2 + state.image * 8;
- state.depack_src = _cur_vga_file_2 + READ_BE_UINT32_UNALIGNED(&*(uint32 *)p2);
+ state.depack_src = _cur_vga_file_2 + READ_BE_UINT32(p2);
- width = READ_BE_UINT16_UNALIGNED(p2 + 6) >> 4;
+ width = READ_BE_UINT16(p2 + 6) >> 4;
height = p2[5];
flags = p2[4];
@@ -640,7 +640,7 @@
src = state.depack_src + _x_scroll * 4;
for (w = 0; w < 40; w++) {
- decodeStripA(dst, src + READ_BE_UINT32_UNALIGNED(&*(uint32 *)src), height);
+ decodeStripA(dst, src + READ_BE_UINT32(src), height);
dst += 8;
src += 4;
}
@@ -1031,7 +1031,7 @@
void SimonEngine::vc_17_set_pathfind_item() {
uint a = vc_read_next_word();
_pathfind_array[a - 1] = (uint16 *)_vc_ptr;
- while (READ_BE_UINT16_UNALIGNED(_vc_ptr) != 999)
+ while (READ_BE_UINT16(_vc_ptr) != 999)
_vc_ptr += 4;
_vc_ptr += 2;
}
@@ -1483,9 +1483,9 @@
vp = &_variableArray[20];
do {
- y2 = READ_BE_UINT16_UNALIGNED(p);
+ y2 = READ_BE_UINT16(p);
p += step;
- y1 = READ_BE_UINT16_UNALIGNED(p) - y2;
+ y1 = READ_BE_UINT16(p) - y2;
vp[0] = y1 >> 1;
vp[1] = y1 - (y1 >> 1);
@@ -1738,11 +1738,11 @@
_cur_vga_file_2 = vpe->vgaFile2;
_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);
+ params[0] = READ_BE_UINT16(&vsp->image);
+ params[1] = READ_BE_UINT16(&vsp->base_color);
+ params[2] = READ_BE_UINT16(&vsp->x);
+ params[3] = READ_BE_UINT16(&vsp->y);
+ params[4] = READ_BE_UINT16(&vsp->unk4);
_vc_ptr = (byte *)params;
vc_10_draw();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush imuse_channel.cpp,1.17,1.18 saud_channel.cpp,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.78,1.79 gfx.cpp,2.158,2.159 imuse.cpp,2.64,2.65 imuse_digi.cpp,1.16,1.17 object.cpp,1.121,1.122 resource.cpp,1.97,1.98 resource.h,1.3,1.4 saveload.cpp,1.88,1.89 script_v5.cpp,1.118,1.119 scummvm.cpp,2.241,2.242 sound.cpp,1.134,1.135 verbs.cpp,1.54,1.55
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list