diff --git a/Minecraft.Client/meson.build b/Minecraft.Client/meson.build index fa0bd92f8..8e8f3e5e5 100644 --- a/Minecraft.Client/meson.build +++ b/Minecraft.Client/meson.build @@ -3,6 +3,7 @@ exclude_sources = [ ' ! -name "SurvivalMode.cpp"', ' ! -name "CreativeMode.cpp"', ' ! -name "GameMode.cpp"', + ' ! -name "DemoMode.cpp"', ' ! -name "PreStitchedTextureMap.cpp"', ] diff --git a/Minecraft.World/Entities/Entity.cpp b/Minecraft.World/Entities/Entity.cpp index 552bf572f..c0f4412ed 100644 --- a/Minecraft.World/Entities/Entity.cpp +++ b/Minecraft.World/Entities/Entity.cpp @@ -51,6 +51,7 @@ inline void EntityTlsSetValue(pthread_key_t key, void* value) { #endif } // namespace +const std::wstring Entity::RIDING_TAG = L"Riding"; int Entity::entityCounter = 2048; // 4J - changed initialiser to 2048, as we are using range 0 - 2047 // as special unique smaller ids for things that need network tracked