From 651c7ca15e263b427e60d274b62fe08b39a61109 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 13 Oct 2006 20:41:33 +0000 Subject: [PATCH] simplify; use luaL_loadbuffer --- stepmania/src/LuaManager.cpp | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp index 40bd8e1b5d..9711070507 100644 --- a/stepmania/src/LuaManager.cpp +++ b/stepmania/src/LuaManager.cpp @@ -36,29 +36,6 @@ namespace LuaHelpers template<> bool FromStack( Lua *L, RString &Object, int iOffset ); } -struct ChunkReaderString -{ - ChunkReaderString( const RString &sBuf ): m_sBuf(sBuf) { m_bDone = false; } - static const char *Reader( lua_State *L, void *ptr, size_t *size ); - - const RString m_sBuf; - bool m_bDone; -}; - -const char *ChunkReaderString::Reader( lua_State *L, void *pPtr, size_t *pSize ) -{ - ChunkReaderString *pData = (ChunkReaderString *) pPtr; - if( pData->m_bDone ) - return NULL; - - pData->m_bDone = true; - - *pSize = pData->m_sBuf.size(); - const char *pRet = pData->m_sBuf.data(); - - return pRet; -} - void LuaManager::SetGlobal( const RString &sName, int val ) { Lua *L = LUA->Get(); @@ -467,9 +444,7 @@ bool LuaHelpers::RunScript( Lua *L, const RString &sScript, const RString &sName { // load string { - ChunkReaderString data( sScript ); - int ret = lua_load( L, ChunkReaderString::Reader, &data, sName ); - + int ret = luaL_loadbuffer( L, sScript.data(), sScript.size(), sName ); if( ret ) { LuaHelpers::Pop( L, sError );