From 79851476d21eacd5280f20c6dd4d7eddf028afa5 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Mon, 16 Sep 2013 10:15:25 +0200 Subject: Removed cWorld:SaveAllChunks() from the API. Use cWorld:QueueSaveAllChunks() instead, the old function was prone to deadlocks. --- source/Bindings.cpp | 34 +--------------------------------- source/Bindings.h | 2 +- source/World.h | 2 +- 3 files changed, 3 insertions(+), 35 deletions(-) diff --git a/source/Bindings.cpp b/source/Bindings.cpp index 82b4a1d92..6313e79db 100644 --- a/source/Bindings.cpp +++ b/source/Bindings.cpp @@ -1,6 +1,6 @@ /* ** Lua binding: AllToLua -** Generated automatically by tolua++-1.0.92 on 09/16/13 09:19:33. +** Generated automatically by tolua++-1.0.92 on 09/16/13 10:08:23. */ #ifndef __cplusplus @@ -12919,37 +12919,6 @@ static int tolua_AllToLua_cWorld_GetIniFileName00(lua_State* tolua_S) } #endif //#ifndef TOLUA_DISABLE -/* method: SaveAllChunks of class cWorld */ -#ifndef TOLUA_DISABLE_tolua_AllToLua_cWorld_SaveAllChunks00 -static int tolua_AllToLua_cWorld_SaveAllChunks00(lua_State* tolua_S) -{ -#ifndef TOLUA_RELEASE - tolua_Error tolua_err; - if ( - !tolua_isusertype(tolua_S,1,"cWorld",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - cWorld* self = (cWorld*) tolua_tousertype(tolua_S,1,0); -#ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'SaveAllChunks'", NULL); -#endif - { - self->SaveAllChunks(); - } - } - return 0; -#ifndef TOLUA_RELEASE - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'SaveAllChunks'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - /* method: QueueSaveAllChunks of class cWorld */ #ifndef TOLUA_DISABLE_tolua_AllToLua_cWorld_QueueSaveAllChunks00 static int tolua_AllToLua_cWorld_QueueSaveAllChunks00(lua_State* tolua_S) @@ -29864,7 +29833,6 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S) tolua_function(tolua_S,"GetBiomeAt",tolua_AllToLua_cWorld_GetBiomeAt00); tolua_function(tolua_S,"GetName",tolua_AllToLua_cWorld_GetName00); tolua_function(tolua_S,"GetIniFileName",tolua_AllToLua_cWorld_GetIniFileName00); - tolua_function(tolua_S,"SaveAllChunks",tolua_AllToLua_cWorld_SaveAllChunks00); tolua_function(tolua_S,"QueueSaveAllChunks",tolua_AllToLua_cWorld_QueueSaveAllChunks00); tolua_function(tolua_S,"GetNumChunks",tolua_AllToLua_cWorld_GetNumChunks00); tolua_function(tolua_S,"GetGeneratorQueueLength",tolua_AllToLua_cWorld_GetGeneratorQueueLength00); diff --git a/source/Bindings.h b/source/Bindings.h index 8182de938..e7af1a652 100644 --- a/source/Bindings.h +++ b/source/Bindings.h @@ -1,6 +1,6 @@ /* ** Lua binding: AllToLua -** Generated automatically by tolua++-1.0.92 on 09/16/13 09:19:34. +** Generated automatically by tolua++-1.0.92 on 09/16/13 10:08:24. */ /* Exported function */ diff --git a/source/World.h b/source/World.h index 5381dc614..dd856fc72 100644 --- a/source/World.h +++ b/source/World.h @@ -502,7 +502,7 @@ public: } /// Saves all chunks immediately. Dangerous interface, may deadlock, use QueueSaveAllChunks() instead - void SaveAllChunks(void); // tolua_export + void SaveAllChunks(void); /// Queues a task to save all chunks onto the tick thread. The prefferred way of saving chunks from external sources void QueueSaveAllChunks(void); // tolua_export -- cgit v1.2.3