mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
rebase fix
This commit is contained in:
parent
a072629978
commit
49807ffa5b
1 changed files with 1 additions and 15 deletions
|
@ -5,7 +5,6 @@
|
||||||
#include "catch.h"
|
#include "catch.h"
|
||||||
#include "dummygamedef.h"
|
#include "dummygamedef.h"
|
||||||
#include "map.h"
|
#include "map.h"
|
||||||
#include "mapsector.h"
|
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class TestMap : public Map {
|
class TestMap : public Map {
|
||||||
|
@ -14,20 +13,7 @@ public:
|
||||||
|
|
||||||
MapBlock * createBlockTest(v3s16 p)
|
MapBlock * createBlockTest(v3s16 p)
|
||||||
{
|
{
|
||||||
v2s16 p2d(p.X, p.Z);
|
return createBlankBlock(p);
|
||||||
s16 block_y = p.Y;
|
|
||||||
|
|
||||||
MapSector *sector = getSectorNoGenerate(p2d);
|
|
||||||
if (!sector) {
|
|
||||||
sector = new MapSector(this, p2d, m_gamedef);
|
|
||||||
m_sectors[p2d] = sector;
|
|
||||||
}
|
|
||||||
|
|
||||||
MapBlock *block = sector->getBlockNoCreateNoEx(block_y);
|
|
||||||
if (block)
|
|
||||||
return block;
|
|
||||||
|
|
||||||
return sector->createBlankBlock(block_y);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue