[Scummvm-cvs-logs] SF.net SVN: scummvm:[33572] residual/trunk/engine/lua

[aquadran at users.sourceforge.net]

Revision: 33572
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33572&view=rev
Author:   aquadran
Date:     2008-08-03 10:51:52 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
do not use lua_error, formating

Modified Paths:
--------------
    residual/trunk/engine/lua/lrestore.cpp
    residual/trunk/engine/lua/lsave.cpp
    residual/trunk/engine/lua/lstrlib.cpp

Modified: residual/trunk/engine/lua/lrestore.cpp
===================================================================
--- residual/trunk/engine/lua/lrestore.cpp	2008-08-03 10:17:34 UTC (rev 33571)
+++ residual/trunk/engine/lua/lrestore.cpp	2008-08-03 10:51:52 UTC (rev 33572)
@@ -10,6 +10,7 @@
 #include "engine/lua/lua.h"
 
 #include "common/endian.h"
+#include "common/debug.h"
 
 RestoreCallback restoreCallbackPtr = NULL;
 
@@ -20,9 +21,9 @@
 		case LUA_T_NUMBER:
 		case LUA_T_TASK:
 			{
-				byte *udata = (byte *)(&object->value.n);
+/*				byte *udata = (byte *)(&object->value.n);
 				uint32 v = restoreUint32();
-				restoreUint32();
+*/				object->value.n = restoreUint32();/*
 #if defined(SYSTEM_LITTLE_ENDIAN)
 				byte b[4];
 				*(uint32 *)&b = v;
@@ -32,7 +33,7 @@
 				udata[3] = b[0];
 #else
 				memcpy(&udata, &v, 4);
-#endif
+#endif*/
 			}
 			break;
 		case LUA_T_NIL:
@@ -100,7 +101,7 @@
 				ptr.hi = restoreUint32();
 				object->value.ts = (TaggedString *)makePointerFromId(ptr);
 			} else {
-				lua_error("restoreObjectValue: Unsupported object type");
+				error("restoreObjectValue: Unsupported object type");
 			}
 	}
 }

Modified: residual/trunk/engine/lua/lsave.cpp
===================================================================
--- residual/trunk/engine/lua/lsave.cpp	2008-08-03 10:17:34 UTC (rev 33571)
+++ residual/trunk/engine/lua/lsave.cpp	2008-08-03 10:51:52 UTC (rev 33572)
@@ -10,6 +10,7 @@
 #include "engine/lua/lua.h"
 
 #include "common/endian.h"
+#include "common/debug.h"
 
 PointerId makeIdFromPointer(void *ptr) {
 	PointerId pointer;
@@ -68,7 +69,7 @@
 		case LUA_T_NUMBER:
 		case LUA_T_TASK:
 			{
-				byte *udata = (byte *)(&object->value.n);
+/*				byte *udata = (byte *)(&object->value.n);
 				uint32 v;
 #if defined(SYSTEM_LITTLE_ENDIAN)
 				byte b[4];
@@ -80,7 +81,7 @@
 #else
 				memcpy(&v, udata, 4);
 #endif
-				saveUint32(v);
+*/				saveUint32(object->value.n);
 				saveUint32(0);
 			}
 			break;
@@ -129,7 +130,7 @@
 				saveUint32(makeIdFromPointer(object->value.ts).low);
 				saveUint32(makeIdFromPointer(object->value.ts).hi);
 			} else {
-				lua_error("saveObjectValue: Unsupported object type");
+				error("saveObjectValue: Unsupported object type");
 			}
 	}
 }

Modified: residual/trunk/engine/lua/lstrlib.cpp
===================================================================
--- residual/trunk/engine/lua/lstrlib.cpp	2008-08-03 10:17:34 UTC (rev 33571)
+++ residual/trunk/engine/lua/lstrlib.cpp	2008-08-03 10:51:52 UTC (rev 33572)
@@ -163,7 +163,8 @@
 	case '[': {
 		const char *end = bracket_end(p + 1);
 		int32 sig = *(p + 1) == '^' ? (p++, 0) : 1;
-		if (!end) lua_error("incorrect pattern (missing `]')");
+		if (!end)
+			lua_error("incorrect pattern (missing `]')");
 		*ep = end + 1;
 		while (++p < end) {
 			if (*p == ESC) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.