A little cleanup, and some work on LpxClient
This commit is contained in:
@@ -216,7 +216,7 @@ std::string World::tangible_get_class(int64_t id) const {
|
||||
return result;
|
||||
}
|
||||
|
||||
static bool worlds_identical(const std::unique_ptr<World> &w1, const std::unique_ptr<World> &w2) {
|
||||
static bool worlds_identical(const UniqueWorld &w1, const UniqueWorld &w2) {
|
||||
StreamBuffer sbw1, sbw2;
|
||||
w1->serialize(&sbw1);
|
||||
w2->serialize(&sbw2);
|
||||
@@ -225,9 +225,9 @@ static bool worlds_identical(const std::unique_ptr<World> &w1, const std::unique
|
||||
|
||||
|
||||
LuaDefine(unittests_world1animdiff, "c") {
|
||||
std::unique_ptr<World> m(new World(util::WORLD_TYPE_MASTER));
|
||||
std::unique_ptr<World> ss(new World(util::WORLD_TYPE_S_SYNC));
|
||||
std::unique_ptr<World> cs(new World(util::WORLD_TYPE_C_SYNC));
|
||||
UniqueWorld m(new World(util::WORLD_TYPE_MASTER));
|
||||
UniqueWorld ss(new World(util::WORLD_TYPE_S_SYNC));
|
||||
UniqueWorld cs(new World(util::WORLD_TYPE_C_SYNC));
|
||||
StreamBuffer sb;
|
||||
util::IdVector ids = util::id_vector_create(123, 345);
|
||||
|
||||
@@ -295,8 +295,8 @@ LuaDefine(unittests_world1animdiff, "c") {
|
||||
}
|
||||
|
||||
LuaDefine(unittests_world2pairtab, "c") {
|
||||
std::unique_ptr<World> m(new World(util::WORLD_TYPE_MASTER));
|
||||
std::unique_ptr<World> ss(new World(util::WORLD_TYPE_S_SYNC));
|
||||
UniqueWorld m(new World(util::WORLD_TYPE_MASTER));
|
||||
UniqueWorld ss(new World(util::WORLD_TYPE_S_SYNC));
|
||||
StreamBuffer sb;
|
||||
int ncreate;
|
||||
|
||||
@@ -343,9 +343,9 @@ LuaDefine(unittests_world2pairtab, "c") {
|
||||
}
|
||||
|
||||
LuaDefine(unittests_world3diffluatab, "c") {
|
||||
std::unique_ptr<World> m(new World(util::WORLD_TYPE_MASTER));
|
||||
std::unique_ptr<World> ss(new World(util::WORLD_TYPE_S_SYNC));
|
||||
std::unique_ptr<World> cs(new World(util::WORLD_TYPE_C_SYNC));
|
||||
UniqueWorld m(new World(util::WORLD_TYPE_MASTER));
|
||||
UniqueWorld ss(new World(util::WORLD_TYPE_S_SYNC));
|
||||
UniqueWorld cs(new World(util::WORLD_TYPE_C_SYNC));
|
||||
StreamBuffer sb;
|
||||
|
||||
// Initialize all three models so that a tangible exists.
|
||||
@@ -397,9 +397,9 @@ LuaDefine(unittests_world3diffluatab, "c") {
|
||||
}
|
||||
|
||||
LuaDefine(unittests_world4difftanclass, "c") {
|
||||
std::unique_ptr<World> m(new World(util::WORLD_TYPE_MASTER));
|
||||
std::unique_ptr<World> ss(new World(util::WORLD_TYPE_S_SYNC));
|
||||
std::unique_ptr<World> cs(new World(util::WORLD_TYPE_C_SYNC));
|
||||
UniqueWorld m(new World(util::WORLD_TYPE_MASTER));
|
||||
UniqueWorld ss(new World(util::WORLD_TYPE_S_SYNC));
|
||||
UniqueWorld cs(new World(util::WORLD_TYPE_C_SYNC));
|
||||
StreamBuffer sb;
|
||||
|
||||
// Initialize all three models so that a tangible exists.
|
||||
|
||||
Reference in New Issue
Block a user