X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblobs.cpp;h=23ab012fed3a0d31aaca785e327074da2dde6e41;hb=2025d49798b93180237b6ce62d3ff5d6ee8ebc6e;hp=56475029097c8f061ca5ec971d994aac68674200;hpb=7c0cb00fac415d393fc3c3397caeb97e31235e69;p=blobs.git

diff --git a/src/blobs.cpp b/src/blobs.cpp
index 5647502..23ab012 100644
--- a/src/blobs.cpp
+++ b/src/blobs.cpp
@@ -49,16 +49,16 @@ int main(int argc, char *argv[]) {
 	second_planet.AxialTilt(glm::dvec2(PI * 0.95, 0.0));
 	second_planet.AngularMomentum(1.0e8);
 
-	world::Simulation sim(sun);
+	world::Simulation sim(sun, assets.data.resources, assets.data.tile_types);
 	sim.AddSun(sun);
 	sim.AddPlanet(planet);
 	sim.AddPlanet(second_planet);
 	sim.AddPlanet(moon);
 
-	world::GenerateEarthlike(assets.data.tiles, planet);
+	world::GenerateEarthlike(assets.data.tile_types, planet);
 	planet.Atmosphere(assets.data.resources["air"].id);
-	world::GenerateTest(assets.data.tiles, moon);
-	world::GenerateTest(assets.data.tiles, second_planet);
+	world::GenerateTest(assets.data.tile_types, moon);
+	world::GenerateTest(assets.data.tile_types, second_planet);
 
 	std::cout << "length of year: " << planet.OrbitalPeriod() << "s" << std::endl;
 	std::cout << "length of moon cycle: " << moon.OrbitalPeriod() << "s" << std::endl;