[Scummvm-cvs-logs] SF.net SVN: scummvm:[33564] residual/trunk/engine/lua
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sun Aug 3 10:20:57 CEST 2008
Revision: 33564
http://scummvm.svn.sourceforge.net/scummvm/?rev=33564&view=rev
Author: aquadran
Date: 2008-08-03 08:20:56 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
better portability
Modified Paths:
--------------
residual/trunk/engine/lua/lrestore.cpp
residual/trunk/engine/lua/lsave.cpp
Modified: residual/trunk/engine/lua/lrestore.cpp
===================================================================
--- residual/trunk/engine/lua/lrestore.cpp 2008-08-03 08:05:36 UTC (rev 33563)
+++ residual/trunk/engine/lua/lrestore.cpp 2008-08-03 08:20:56 UTC (rev 33564)
@@ -92,22 +92,16 @@
restoreSint32();
}
break;
- case MKID_BE('ACTR'):
- case MKID_BE('COLR'):
- case MKID_BE('STAT'):
- case MKID_BE('FONT'):
- case MKID_BE('VBUF'):
- case MKID_BE('PRIM'):
- case MKID_BE('TEXT'):
- { // TODO
+ default:
+ if (object->ttype == MKID_BE('ACTR') || object->ttype == MKID_BE('COLR') || object->ttype == MKID_BE('STAT') || object->ttype == MKID_BE('FONT')
+ || object->ttype == MKID_BE('VBUF') || object->ttype == MKID_BE('PRIM') || object->ttype == MKID_BE('TEXT')) {
PointerId ptr;
ptr.low = restoreUint32();
ptr.hi = restoreUint32();
object->value.ts = (TaggedString *)makePointerFromId(ptr);
+ } else {
+ lua_error("restoreObjectValue: Unsupported object type");
}
- break;
- default:
- lua_error("saveObjectValue: Unsupported object type");
}
}
Modified: residual/trunk/engine/lua/lsave.cpp
===================================================================
--- residual/trunk/engine/lua/lsave.cpp 2008-08-03 08:05:36 UTC (rev 33563)
+++ residual/trunk/engine/lua/lsave.cpp 2008-08-03 08:20:56 UTC (rev 33564)
@@ -123,20 +123,14 @@
saveSint32(0);
}
break;
- case MKID_BE('ACTR'):
- case MKID_BE('COLR'):
- case MKID_BE('STAT'):
- case MKID_BE('FONT'):
- case MKID_BE('VBUF'):
- case MKID_BE('PRIM'):
- case MKID_BE('TEXT'):
- { // TODO
+ default:
+ if (object->ttype == MKID_BE('ACTR') || object->ttype == MKID_BE('COLR') || object->ttype == MKID_BE('STAT') || object->ttype == MKID_BE('FONT')
+ || object->ttype == MKID_BE('VBUF') || object->ttype == MKID_BE('PRIM') || object->ttype == MKID_BE('TEXT')) {
saveUint32(makeIdFromPointer(object->value.ts).low);
saveUint32(makeIdFromPointer(object->value.ts).hi);
+ } else {
+ lua_error("saveObjectValue: Unsupported object type");
}
- break;
- default:
- lua_error("saveObjectValue: Unsupported object type");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list