upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-06 17:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

use our loggers in lua map generator, make a better dtor for Rng

Browse Source
This commit is contained in:
Chris Beck 2014-11-05 10:46:25 -05:00
parent a964bd0e88
commit 6c85b4f4d8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/generators/lua_map_generator.cpp
View File

@ -15,6 +15,7 @@
#include "lua_map_generator.hpp" #include "lua_map_generator.hpp"
#include "config.hpp" #include "config.hpp"
#include "log.hpp"
#include "lua/lauxlib.h" #include "lua/lauxlib.h"
#include "lua/lua.h" #include "lua/lua.h"
@ -32,6 +33,10 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
static lg::log_domain log_mapgen("mapgen");
#define ERR_NG LOG_STREAM(err, log_mapgen)
#define LOG_NG LOG_STREAM(info, log_mapgen)
#define DBG_NG LOG_STREAM(debug, log_mapgen)
// Add compiler directive suppressing unused variable warning // Add compiler directive suppressing unused variable warning
#if defined(__GNUC__) || defined(__clang__) || defined(__MINGW32__) #if defined(__GNUC__) || defined(__clang__) || defined(__MINGW32__)
@ -125,7 +130,13 @@ int impl_rng_create(lua_State* L)
} }
int impl_rng_destroy(lua_State* L) int impl_rng_destroy(lua_State* L)
{ {
static_cast< mt_rng * >( lua_touserdata( L , 1 ) )->~mt_rng(); mt_rng * d = static_cast< mt_rng *> (luaL_testudata(L, 1, Rng));
if (d == NULL) {
ERR_NG << "rng_destroy called on data of type: " << lua_typename( L, lua_type( L, 1 ) ) << std::endl;
ERR_NG << "This may indicate a memory leak, please report at bugs.wesnoth.org" << std::endl;
} else {
d->~mt_rng();
}
return 0; return 0;
} }
int impl_rng_seed(lua_State* L) int impl_rng_seed(lua_State* L)