Skip to content
Permalink
Browse files

Rename get_json_value to read_json_value

  • Loading branch information
ShadowNinja committed Jan 11, 2014
1 parent bd8ddf1 commit a9df87ede06f8f0f69e3481cf58f6d59d3f9ebbf
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/script/common/c_content.cpp
  2. +1 −1 src/script/common/c_content.h
  3. +1 −1 src/script/lua_api/l_util.cpp
@@ -1088,7 +1088,7 @@ bool push_json_value(lua_State *L, const Json::Value &value, int nullindex)
}

// Converts Lua table --> JSON
void get_json_value(lua_State *L, Json::Value &root, int index)
void read_json_value(lua_State *L, Json::Value &root, int index)
{
int type = lua_type(L, index);
if (type == LUA_TBOOLEAN) {
@@ -1104,7 +1104,7 @@ void get_json_value(lua_State *L, Json::Value &root, int index)
while (lua_next(L, index)) {
// Key is at -2 and value is at -1
Json::Value value;
get_json_value(L, value, lua_gettop(L));
read_json_value(L, value, lua_gettop(L));

Json::ValueType roottype = root.type();
int keytype = lua_type(L, -1);
@@ -150,7 +150,7 @@ void luaentity_get (lua_State *L,u16 id);
bool push_json_value (lua_State *L,
const Json::Value &value,
int nullindex);
void get_json_value (lua_State *L,
void read_json_value (lua_State *L,
Json::Value &root,
int index);

@@ -192,7 +192,7 @@ int ModApiUtil::l_write_json(lua_State *L)

Json::Value root;
try {
get_json_value(L, root, 1);
read_json_value(L, root, 1);
} catch (SerializationError &e) {
lua_pushnil(L);
lua_pushstring(L, e.what());

0 comments on commit a9df87e

Please sign in to comment.