Stuff

diff --cc assets/door.png
index 7db551dceb672c51222f0a12d7be2986dffe5dd6,582a52db08636df48a49a0b33591e742f658ead5..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ

diff --cc src/entities.cpp
Simple merge

diff --cc src/gameplay.cpp
index 6b6246596f59dd3382c9a64191f6cba1d3fc136d,6cfc91eed7466579ceb078af4d7a1fba1542098c..284bd7803a31bddbdd8e834f68f7b0681d833b93
--- 1/src/gameplay.cpp
--- 2/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@@ -141,8 -141,8 +141,9 @@@ void initEverything(void)
  
  
        currentWorld = worldSpawnHill1;
+       worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2);
        
 +      worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2);
        player = new Player();
        player->spawn(200,100);
        

diff --cc src/world.cpp
Simple merge

diff --cc xcf/door.xcf
index e4edc10c9b7edce3ab4e05c9f0ee61715e94b9f8,ab8e07806394070e38971abaccd36c1178e224f4..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ