Skip to content

Commit 3576f4f

Browse files
kwolekrkwolekr
committedApr 17, 2015
Switch to check_v3s16 in l_mapgen.cpp and l_vmanip.cpp for type safety
·
5.11.00.4.13
1 parent 406d9ba commit 3576f4f

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed
 

‎src/script/lua_api/l_mapgen.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ bool read_schematic_def(lua_State *L, int index,
244244

245245
//// Get schematic size
246246
lua_getfield(L, index, "size");
247-
v3s16 size = read_v3s16(L, -1);
247+
v3s16 size = check_v3s16(L, -1);
248248
lua_pop(L, 1);
249249

250250
schem->size = size;
@@ -995,9 +995,9 @@ int ModApiMapgen::l_generate_ores(lua_State *L)
995995
mg.vm = LuaVoxelManip::checkobject(L, 1)->vm;
996996
mg.ndef = getServer(L)->getNodeDefManager();
997997

998-
v3s16 pmin = lua_istable(L, 2) ? read_v3s16(L, 2) :
998+
v3s16 pmin = lua_istable(L, 2) ? check_v3s16(L, 2) :
999999
mg.vm->m_area.MinEdge + v3s16(1,1,1) * MAP_BLOCKSIZE;
1000-
v3s16 pmax = lua_istable(L, 3) ? read_v3s16(L, 3) :
1000+
v3s16 pmax = lua_istable(L, 3) ? check_v3s16(L, 3) :
10011001
mg.vm->m_area.MaxEdge - v3s16(1,1,1) * MAP_BLOCKSIZE;
10021002
sortBoxVerticies(pmin, pmax);
10031003

@@ -1019,9 +1019,9 @@ int ModApiMapgen::l_generate_decorations(lua_State *L)
10191019
mg.vm = LuaVoxelManip::checkobject(L, 1)->vm;
10201020
mg.ndef = getServer(L)->getNodeDefManager();
10211021

1022-
v3s16 pmin = lua_istable(L, 2) ? read_v3s16(L, 2) :
1022+
v3s16 pmin = lua_istable(L, 2) ? check_v3s16(L, 2) :
10231023
mg.vm->m_area.MinEdge + v3s16(1,1,1) * MAP_BLOCKSIZE;
1024-
v3s16 pmax = lua_istable(L, 3) ? read_v3s16(L, 3) :
1024+
v3s16 pmax = lua_istable(L, 3) ? check_v3s16(L, 3) :
10251025
mg.vm->m_area.MaxEdge - v3s16(1,1,1) * MAP_BLOCKSIZE;
10261026
sortBoxVerticies(pmin, pmax);
10271027

@@ -1040,8 +1040,8 @@ int ModApiMapgen::l_create_schematic(lua_State *L)
10401040

10411041
Map *map = &(getEnv(L)->getMap());
10421042

1043-
v3s16 p1 = read_v3s16(L, 1);
1044-
v3s16 p2 = read_v3s16(L, 2);
1043+
v3s16 p1 = check_v3s16(L, 1);
1044+
v3s16 p2 = check_v3s16(L, 2);
10451045
sortBoxVerticies(p1, p2);
10461046

10471047
std::vector<std::pair<v3s16, u8> > prob_list;
@@ -1050,7 +1050,7 @@ int ModApiMapgen::l_create_schematic(lua_State *L)
10501050
while (lua_next(L, 3)) {
10511051
if (lua_istable(L, -1)) {
10521052
lua_getfield(L, -1, "pos");
1053-
v3s16 pos = read_v3s16(L, -1);
1053+
v3s16 pos = check_v3s16(L, -1);
10541054
lua_pop(L, 1);
10551055

10561056
u8 prob = getintfield_default(L, -1, "prob", MTSCHEM_PROB_ALWAYS);
@@ -1101,7 +1101,7 @@ int ModApiMapgen::l_place_schematic(lua_State *L)
11011101
SchematicManager *schemmgr = getServer(L)->getEmergeManager()->schemmgr;
11021102

11031103
//// Read position
1104-
v3s16 p = read_v3s16(L, 1);
1104+
v3s16 p = check_v3s16(L, 1);
11051105

11061106
//// Read rotation
11071107
int rot = ROTATE_0;

‎src/script/lua_api/l_vmanip.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ int LuaVoxelManip::l_read_from_map(lua_State *L)
4646
LuaVoxelManip *o = checkobject(L, 1);
4747
MMVManip *vm = o->vm;
4848

49-
v3s16 bp1 = getNodeBlockPos(read_v3s16(L, 2));
50-
v3s16 bp2 = getNodeBlockPos(read_v3s16(L, 3));
49+
v3s16 bp1 = getNodeBlockPos(check_v3s16(L, 2));
50+
v3s16 bp2 = getNodeBlockPos(check_v3s16(L, 3));
5151
sortBoxVerticies(bp1, bp2);
5252

5353
vm->initialEmerge(bp1, bp2);
@@ -116,7 +116,7 @@ int LuaVoxelManip::l_get_node_at(lua_State *L)
116116
GET_ENV_PTR;
117117

118118
LuaVoxelManip *o = checkobject(L, 1);
119-
v3s16 pos = read_v3s16(L, 2);
119+
v3s16 pos = check_v3s16(L, 2);
120120

121121
pushnode(L, o->vm->getNodeNoExNoEmerge(pos), env->getGameDef()->ndef());
122122
return 1;
@@ -128,7 +128,7 @@ int LuaVoxelManip::l_set_node_at(lua_State *L)
128128
GET_ENV_PTR;
129129

130130
LuaVoxelManip *o = checkobject(L, 1);
131-
v3s16 pos = read_v3s16(L, 2);
131+
v3s16 pos = check_v3s16(L, 2);
132132
MapNode n = readnode(L, 3, env->getGameDef()->ndef());
133133

134134
o->vm->setNodeNoEmerge(pos, n);
@@ -171,8 +171,8 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L)
171171
v3s16 yblock = v3s16(0, 1, 0) * MAP_BLOCKSIZE;
172172
v3s16 fpmin = vm->m_area.MinEdge;
173173
v3s16 fpmax = vm->m_area.MaxEdge;
174-
v3s16 pmin = lua_istable(L, 2) ? read_v3s16(L, 2) : fpmin + yblock;
175-
v3s16 pmax = lua_istable(L, 3) ? read_v3s16(L, 3) : fpmax - yblock;
174+
v3s16 pmin = lua_istable(L, 2) ? check_v3s16(L, 2) : fpmin + yblock;
175+
v3s16 pmax = lua_istable(L, 3) ? check_v3s16(L, 3) : fpmax - yblock;
176176

177177
sortBoxVerticies(pmin, pmax);
178178
if (!vm->m_area.contains(VoxelArea(pmin, pmax)))
@@ -206,8 +206,8 @@ int LuaVoxelManip::l_set_lighting(lua_State *L)
206206
MMVManip *vm = o->vm;
207207

208208
v3s16 yblock = v3s16(0, 1, 0) * MAP_BLOCKSIZE;
209-
v3s16 pmin = lua_istable(L, 3) ? read_v3s16(L, 3) : vm->m_area.MinEdge + yblock;
210-
v3s16 pmax = lua_istable(L, 4) ? read_v3s16(L, 4) : vm->m_area.MaxEdge - yblock;
209+
v3s16 pmin = lua_istable(L, 3) ? check_v3s16(L, 3) : vm->m_area.MinEdge + yblock;
210+
v3s16 pmax = lua_istable(L, 4) ? check_v3s16(L, 4) : vm->m_area.MaxEdge - yblock;
211211

212212
sortBoxVerticies(pmin, pmax);
213213
if (!vm->m_area.contains(VoxelArea(pmin, pmax)))
@@ -402,7 +402,7 @@ int LuaVoxelManip::create_object(lua_State *L)
402402

403403
Map *map = &(env->getMap());
404404
LuaVoxelManip *o = (lua_istable(L, 1) && lua_istable(L, 2)) ?
405-
new LuaVoxelManip(map, read_v3s16(L, 1), read_v3s16(L, 2)) :
405+
new LuaVoxelManip(map, check_v3s16(L, 1), check_v3s16(L, 2)) :
406406
new LuaVoxelManip(map);
407407

408408
*(void **)(lua_newuserdata(L, sizeof(void *))) = o;

0 commit comments

Comments
 (0)
Please sign in to comment.