X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgame%2Fowned.h;h=a30f040d58269019cd3634159100e7d2f8a976c3;hb=f4ca190e869b9d03bf4f8b7b002c65af9f56c0ad;hp=d6f9f17a9ce170d7456dbafe08b3e53fe1a29418;hpb=f377d216dfc44e36da3697557f38dfedcbec45d1;p=libs%2Fgame.git

diff --git a/source/game/owned.h b/source/game/owned.h
index d6f9f17..a30f040 100644
--- a/source/game/owned.h
+++ b/source/game/owned.h
@@ -22,17 +22,26 @@ public:
 	Owned(Handle<P>, Args &&...);
 
 	template<typename P, typename... Args>
-	Owned(Owned<P> &p, Args &&... a): Owned(static_cast<Handle<P> &>(p), std::forward<Args>(a)...) { }
-
-	template<typename P, typename... Args>
-		requires(!std::is_const_v<P>)
-	Owned(P &parent, Args &&... args): Owned(Handle<P>::from_object(&parent), std::forward<Args>(args)...) { }
+	Owned(P *parent, Args &&... args): Owned(Handle<P>::from_object(parent), std::forward<Args>(args)...) { }
 
 	Owned(Owned &&other): Handle<T>(other) { other.ptr = nullptr; }
-	Owned &operator=(Owned &&other);
+
+	template<typename U>
+		requires std::is_base_of_v<T, U>
+	Owned(Owned<U> &&other): Handle<T>(other) { other.ptr = nullptr; }
+
+	Owned &operator=(Owned &&other) { assign(std::move(other)); return *this; }
+
+	template<typename U>
+		requires std::is_base_of_v<T, U>
+	Owned &operator=(Owned<U> &&other) { assign(std::move(other)); return *this; }
+
 	~Owned() { destroy(); }
 
 private:
+	template<typename U>
+	void assign(Owned<U> &&);
+
 	template<typename O>
 	static Stage &get_stage(O &);
 
@@ -72,14 +81,13 @@ Owned<T>::Owned(Handle<P> parent, Args &&... args)
 }
 
 template<typename T>
-Owned<T> &Owned<T>::operator=(Owned &&other)
+template<typename U>
+void Owned<T>::assign(Owned<U> &&other)
 {
 	destroy();
 
 	this->ptr = other.ptr;
 	other.ptr = nullptr;
-
-	return *this;
 }
 
 template<typename T>