diff --git a/data/maps/desert.tmx b/data/maps/desert.tmx new file mode 100644 index 0000000..a95218e --- /dev/null +++ b/data/maps/desert.tmx @@ -0,0 +1,24 @@ + + + + + + + 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 + + + + + + + diff --git a/src/saland/Game.cpp b/src/saland/Game.cpp index 10ee143..074cd6b 100644 --- a/src/saland/Game.cpp +++ b/src/saland/Game.cpp @@ -210,7 +210,7 @@ void Game::ResetWorldNoSave(int x, int y, bool forceResetWorld) { data->human->body = data->gameRegion.physicsBox->CreateBody(&myBodyDef); b2CircleShape circleShape; circleShape.m_p.Set(0, 0); //position, relative to body position - circleShape.m_radius = 0.5f; //radius 16 pixel (32 pixel = 1) + circleShape.m_radius = data->human->Radius/pixel2unit; // 0.48f; //radius 16 pixel (32 pixel = 1) b2FixtureDef myFixtureDef; myFixtureDef.shape = &circleShape; //this is a pointer to the shape above myFixtureDef.density = 10.0f; diff --git a/src/saland/GameRegion.cpp b/src/saland/GameRegion.cpp index c4dc482..554acf4 100644 --- a/src/saland/GameRegion.cpp +++ b/src/saland/GameRegion.cpp @@ -166,7 +166,7 @@ void GameRegion::ProcessRegionEnter(World& world) { static std::string RegionChooseMapTemplate(int region_x, int region_y) { - std::string loadMap = "maps/sample1.tmx"; + std::string loadMap = "maps/desert.tmx"; if (GetRegionType(region_x, region_y) == "forrest") { loadMap = "maps/template_forrest.tmx"; } diff --git a/src/saland/model/placeables.hpp b/src/saland/model/placeables.hpp index 744c89f..3b1cc52 100644 --- a/src/saland/model/placeables.hpp +++ b/src/saland/model/placeables.hpp @@ -36,7 +36,7 @@ public: float health = 10.0; float X = 20.0; float Y = 20.0; - float Radius = 16.0; + float Radius = 14.0; bool removeMe = false; bool destructible = true; b2Body* body = nullptr;