Fixed: Build failure (ambiguous conversion of de::Id)

skyjake · Dec 12, 2013 · 40e2741 · 40e2741
1 parent 2f9fb6d
commit 40e2741
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/doomsday/client/src/resource/resourcesystem.cpp b/doomsday/client/src/resource/resourcesystem.cpp
@@ -3649,7 +3649,7 @@ colorpaletteid_t ResourceSystem::defaultColorPalette() const
 
 void ResourceSystem::setDefaultColorPalette(ColorPalette *newDefaultPalette)
 {
-    d->defaultColorPalette = newDefaultPalette? newDefaultPalette->id() : 0;
+    d->defaultColorPalette = newDefaultPalette? newDefaultPalette->id().asUInt32() : 0;
 }
 
 #ifdef __CLIENT__

diff --git a/doomsday/libdeng2/include/de/core/id.h b/doomsday/libdeng2/include/de/core/id.h
@@ -81,6 +81,8 @@ class DENG2_PUBLIC Id : public ISerializable, public LogEntry::Arg::Base
 
     ddouble asDouble() const;
 
+    inline duint32 asUInt32() const { return _id; }
+
     dint64 asInt64() const;
 
     // Implements ISerializable.