FULLPIPE: More signed reads
This commit is contained in:
parent
5283612a7f
commit
d3cf9ed9c0
4 changed files with 19 additions and 19 deletions
|
@ -494,8 +494,8 @@ bool Picture::load(MfcArchive &file) {
|
||||||
debugC(5, kDebugLoading, "Picture::load()");
|
debugC(5, kDebugLoading, "Picture::load()");
|
||||||
MemoryObject::load(file);
|
MemoryObject::load(file);
|
||||||
|
|
||||||
_x = file.readUint32LE();
|
_x = file.readSint32LE();
|
||||||
_y = file.readUint32LE();
|
_y = file.readSint32LE();
|
||||||
_field_44 = file.readUint16LE();
|
_field_44 = file.readUint16LE();
|
||||||
|
|
||||||
assert(g_fp->_gameProjectVersion >= 2);
|
assert(g_fp->_gameProjectVersion >= 2);
|
||||||
|
@ -785,8 +785,8 @@ Bitmap::~Bitmap() {
|
||||||
void Bitmap::load(Common::ReadStream *s) {
|
void Bitmap::load(Common::ReadStream *s) {
|
||||||
debugC(5, kDebugLoading, "Bitmap::load()");
|
debugC(5, kDebugLoading, "Bitmap::load()");
|
||||||
|
|
||||||
_x = s->readUint32LE();
|
_x = s->readSint32LE();
|
||||||
_y = s->readUint32LE();
|
_y = s->readSint32LE();
|
||||||
_width = s->readUint32LE();
|
_width = s->readUint32LE();
|
||||||
_height = s->readUint32LE();
|
_height = s->readUint32LE();
|
||||||
s->readUint32LE(); // pixels
|
s->readUint32LE(); // pixels
|
||||||
|
|
|
@ -61,8 +61,8 @@ bool ExCommand::load(MfcArchive &file) {
|
||||||
|
|
||||||
_parentId = file.readUint16LE();
|
_parentId = file.readUint16LE();
|
||||||
_messageKind = file.readUint32LE();
|
_messageKind = file.readUint32LE();
|
||||||
_x = file.readUint32LE();
|
_x = file.readSint32LE();
|
||||||
_y = file.readUint32LE();
|
_y = file.readSint32LE();
|
||||||
_field_14 = file.readUint32LE();
|
_field_14 = file.readUint32LE();
|
||||||
_sceneClickX = file.readUint32LE();
|
_sceneClickX = file.readUint32LE();
|
||||||
_sceneClickY = file.readUint32LE();
|
_sceneClickY = file.readUint32LE();
|
||||||
|
|
|
@ -2918,9 +2918,9 @@ bool MovGraphNode::load(MfcArchive &file) {
|
||||||
debugC(5, kDebugLoading, "MovGraphNode::load()");
|
debugC(5, kDebugLoading, "MovGraphNode::load()");
|
||||||
|
|
||||||
_field_14 = file.readUint32LE();
|
_field_14 = file.readUint32LE();
|
||||||
_x = file.readUint32LE();
|
_x = file.readSint32LE();
|
||||||
_y = file.readUint32LE();
|
_y = file.readSint32LE();
|
||||||
_z = file.readUint32LE();
|
_z = file.readSint32LE();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -2937,12 +2937,12 @@ ReactParallel::ReactParallel() {
|
||||||
bool ReactParallel::load(MfcArchive &file) {
|
bool ReactParallel::load(MfcArchive &file) {
|
||||||
debugC(5, kDebugLoading, "ReactParallel::load()");
|
debugC(5, kDebugLoading, "ReactParallel::load()");
|
||||||
|
|
||||||
_x1 = file.readUint32LE();
|
_x1 = file.readSint32LE();
|
||||||
_y1 = file.readUint32LE();
|
_y1 = file.readSint32LE();
|
||||||
_x2 = file.readUint32LE();
|
_x2 = file.readSint32LE();
|
||||||
_y2 = file.readUint32LE();
|
_y2 = file.readSint32LE();
|
||||||
_dx = file.readUint32LE();
|
_dx = file.readSint32LE();
|
||||||
_dy = file.readUint32LE();
|
_dy = file.readSint32LE();
|
||||||
|
|
||||||
createRegion();
|
createRegion();
|
||||||
|
|
||||||
|
@ -2995,8 +2995,8 @@ ReactPolygonal::~ReactPolygonal() {
|
||||||
bool ReactPolygonal::load(MfcArchive &file) {
|
bool ReactPolygonal::load(MfcArchive &file) {
|
||||||
debugC(5, kDebugLoading, "ReactPolygonal::load()");
|
debugC(5, kDebugLoading, "ReactPolygonal::load()");
|
||||||
|
|
||||||
_centerX = file.readUint32LE();
|
_centerX = file.readSint32LE();
|
||||||
_centerY = file.readUint32LE();
|
_centerY = file.readSint32LE();
|
||||||
_pointCount = file.readUint32LE();
|
_pointCount = file.readUint32LE();
|
||||||
|
|
||||||
if (_pointCount > 0) {
|
if (_pointCount > 0) {
|
||||||
|
|
|
@ -350,8 +350,8 @@ bool PicAniInfo::load(MfcArchive &file) {
|
||||||
field_8 = file.readUint32LE();
|
field_8 = file.readUint32LE();
|
||||||
sceneId = file.readUint16LE();
|
sceneId = file.readUint16LE();
|
||||||
field_E = file.readUint16LE();
|
field_E = file.readUint16LE();
|
||||||
ox = file.readUint32LE();
|
ox = file.readSint32LE();
|
||||||
oy = file.readUint32LE();
|
oy = file.readSint32LE();
|
||||||
priority = file.readUint32LE();
|
priority = file.readUint32LE();
|
||||||
staticsId = file.readUint16LE();
|
staticsId = file.readUint16LE();
|
||||||
movementId = file.readUint16LE();
|
movementId = file.readUint16LE();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue