load resource colors

[blobs.git] / src / app / app.cpp

diff --git a/src/app/app.cpp b/src/app/app.cpp
index e4dc1a58eef0de9166254142f5ea19073810c9e3..f2d0e5904d209ccba1113692877974e36e884ac8 100644 (file)
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -176,6 +176,7 @@ Assets::Assets()
 , font_path(path + "fonts/")
 , skin_path(path + "skins/")
 , tile_path(path + "tiles/")
+, random(0x6283B64CEFE47925)
 , fonts{
        graphics::Font(font_path + "DejaVuSans.ttf", 32),
        graphics::Font(font_path + "DejaVuSans.ttf", 24),
@@ -251,6 +252,8 @@ void Assets::ReadResources(io::TokenStreamReader &in) {
                        in.Skip(io::Token::EQUALS);
                        if (name == "label") {
                                in.ReadString(data.resources[id].label);
+                       } else if (name == "density") {
+                               data.resources[id].density = in.GetDouble();
                        } else if (name == "state") {
                                in.ReadIdentifier(name);
                                if (name == "solid") {
@@ -264,6 +267,8 @@ void Assets::ReadResources(io::TokenStreamReader &in) {
                                } else {
                                        throw std::runtime_error("unknown resource state '" + name + "'");
                                }
+                       } else if (name == "base_color") {
+                               in.ReadVec(data.resources[id].base_color);
                        } else {
                                throw std::runtime_error("unknown resource property '" + name + "'");
                        }