Allow null handles to be created from nullptr

diff --git a/source/game/handle.h b/source/game/handle.h
index d384f35c3c1fae6f29b1871a4c955079078d3e75..2e544c7238e75ca7d5418c9f5c7a05c65e61081e 100644 (file)
--- a/source/game/handle.h
+++ b/source/game/handle.h
@@ -23,13 +23,14 @@ protected:
 
 public:
        Handle() = default;
-
-       static Handle from_object(T *o) { Handle h; h.ptr = o; return h; }
+       Handle(nullptr_t) { }
 
        template<typename U>
                requires std::is_base_of_v<T, U>
        Handle(const Handle<U> &other): ptr(other.ptr) { }
 
+       static Handle from_object(T *o) { Handle h; h.ptr = o; return h; }
+
        T *get() const { return ptr; }
        T &operator*() const { return *ptr; }
        T *operator->() const { return ptr; }

diff --git a/source/game/root.h b/source/game/root.h
index f4ed18edc1b509510441e36c4306de8de2d3ce0f..4f7ea76101c4b831d2be304b922a047e508b4f19 100644 (file)
--- a/source/game/root.h
+++ b/source/game/root.h
@@ -13,7 +13,7 @@ private:
        Stage &stage;
 
 public:
-       Root(Stage &s): Entity(Handle<Entity>()), stage(s) { }
+       Root(Stage &s): Entity(nullptr), stage(s) { }
 
        Stage &get_stage() const { return stage; }
 };