X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=b3b330036b5e2f0c855266c0219dee023a2eebee;hb=57d3e33b47c92d56de4007e23800d9bcdb353463;hp=ab5170f8ebc70233546b22b3d658ed92a629126d;hpb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;p=blank.git diff --git a/src/app/app.cpp b/src/app/app.cpp index ab5170f..b3b3300 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -318,6 +318,7 @@ CuboidBounds slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }}); void AssetLoader::LoadBlockTypes( const string &set_name, BlockTypeRegistry ®, + ResourceIndex &snd_index, ResourceIndex &tex_index, const ShapeRegistry &shapes ) const { @@ -364,6 +365,12 @@ void AssetLoader::LoadBlockTypes( in.ReadVec(type.outline_color); } else if (name == "label") { in.ReadString(type.label); + } else if (name == "place_sound") { + in.ReadString(tex_name); + type.place_sound = snd_index.GetID(tex_name); + } else if (name == "remove_sound") { + in.ReadString(tex_name); + type.remove_sound = snd_index.GetID(tex_name); } else if (name == "luminosity") { type.luminosity = in.GetInt(); } else if (name == "block_light") { @@ -520,6 +527,8 @@ void AssetLoader::LoadModels( in.Skip(Token::EQUALS); if (prop_name == "root") { model.RootPart().Read(in, tex_index, shapes); + } else if (prop_name == "eyes") { + model.SetEyes(in.GetULong()); } else { while (in.HasMore() && in.Peek().type != Token::SEMICOLON) { in.Next();