commit b5414643

Poul Sander · 2021-08-31 21:34
b5414643337f9af290c0319132db3796d54bb278 patch · browse files
parent f4ce0509b994303031a48da0e6a1b597a300d4dc

Started using properties. Seperated refresh logic.

Changed files

M	src/saland/GameRegion.cpp before
M	src/saland/GameRegion.hpp before

diff --git a/src/saland/GameRegion.cpp b/src/saland/GameRegion.cpp index 21a35a5..99711d9 100644 --- a/src/saland/GameRegion.cpp +++ b/src/saland/GameRegion.cpp

@@ -149,6 +149,20 @@ std::string GameRegion::GetRegionType(int region_x, int region_y) const {

}

+void GameRegion::ProcessRegionEnter(World& world) {

+ if (world.tm.properties["type"].value == "forrest") {

+ std::cout << "Forrest (or start) region\n";

+ ItemDef pineDef = getItem("tree_pine");

+ for (int i=0; i<10; ++i) {

+ int x = (rand()%(world.tm.width-3)+1)*32+rand()%32;

+ int y = (rand()%(world.tm.height-3)+1)*32+rand()%32;

+ SpawnItem(pineDef, x, y);

+ std::cout << "Spawning at " << x << ", " << y << "\n";

+ }

void GameRegion::Init(int x, int y, const std::string& worldName, bool forceResetWorld) {

region_x = x;

@@ -218,16 +232,10 @@ void GameRegion::Init(int x, int y, const std::string& worldName, bool forceRese

//Forrest region

std::string regionType = GetRegionType(region_x, region_y);

- if (regionType == "forrest" || regionType == "start") {

- std::cout << "Forrest (or start) region\n";

- for (int i=0; i<10; ++i) {

- int x = (rand()%(world.tm.width-3)+1)*32+rand()%32;

- int y = (rand()%(world.tm.height-3)+1)*32+rand()%32;

- SpawnItem(pineDef, x, y);

- std::cout << "Spawning at " << x << ", " << y << "\n";

- }

+ if (regionType == "forrest" || regionType == "start" ) {

+ world.tm.properties["type"].value = "forrest";

}

+ ProcessRegionEnter(world);

SpawnPrefab(getPrefab("basic_house"), 32, 32);

diff --git a/src/saland/GameRegion.hpp b/src/saland/GameRegion.hpp index 92c7499..d2911ce 100644 --- a/src/saland/GameRegion.hpp +++ b/src/saland/GameRegion.hpp

@@ -62,6 +62,7 @@ public:

void SpawnItem(const ItemDef& def, float destX, float destY) ;

void SpawnPrefab(const Prefab& prefab, int destX, int destY);

std::string GetRegionType(int x, int y) const;

+ void ProcessRegionEnter(World& world);

private:

int region_x = 0;

int region_y = 0;