X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fplayermodel.qc;h=5d58a1b03ebaf927ca1c74a1ce3bddbc3dfcd030;hb=e828ac5538b10c023c3189e70b59d2353fd916cf;hp=f498f8d2133cf01628bb8b4518bacc51e2588641;hpb=128cea32714586feb51b4a0d78a6bd4e35fef9f2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/playermodel.qc b/qcsrc/menu/xonotic/playermodel.qc
index f498f8d21..5d58a1b03 100644
--- a/qcsrc/menu/xonotic/playermodel.qc
+++ b/qcsrc/menu/xonotic/playermodel.qc
@@ -1,18 +1,20 @@
-#ifdef INTERFACE
-CLASS(XonoticPlayerModelSelector) EXTENDS(XonoticImage)
-	METHOD(XonoticPlayerModelSelector, configureXonoticPlayerModelSelector, void(entity))
-	METHOD(XonoticPlayerModelSelector, loadCvars, void(entity))
-	METHOD(XonoticPlayerModelSelector, saveCvars, void(entity))
-	METHOD(XonoticPlayerModelSelector, draw, void(entity))
-	METHOD(XonoticPlayerModelSelector, resizeNotify, void(entity, vector, vector, vector, vector))
-	METHOD(XonoticPlayerModelSelector, showNotify, void(entity))
+#ifndef PLAYERMODEL_H
+#define PLAYERMODEL_H
+#include "image.qc"
+CLASS(XonoticPlayerModelSelector, XonoticImage)
+	METHOD(XonoticPlayerModelSelector, configureXonoticPlayerModelSelector, void(entity));
+	METHOD(XonoticPlayerModelSelector, loadCvars, void(entity));
+	METHOD(XonoticPlayerModelSelector, saveCvars, void(entity));
+	METHOD(XonoticPlayerModelSelector, draw, void(entity));
+	METHOD(XonoticPlayerModelSelector, resizeNotify, void(entity, vector, vector, vector, vector));
+	METHOD(XonoticPlayerModelSelector, showNotify, void(entity));
 	ATTRIB(XonoticPlayerModelSelector, currentModel, string, string_null)
 	ATTRIB(XonoticPlayerModelSelector, currentSkin, float, 0)
 	ATTRIB(XonoticPlayerModelSelector, currentModelImage, string, string_null)
 	ATTRIB(XonoticPlayerModelSelector, currentModelTitle, string, string_null)
 	ATTRIB(XonoticPlayerModelSelector, currentModelDescription, string, string_null)
-	METHOD(XonoticPlayerModelSelector, go, void(entity, float))
-	METHOD(XonoticPlayerModelSelector, destroy, void(entity))
+	METHOD(XonoticPlayerModelSelector, go, void(entity, float));
+	METHOD(XonoticPlayerModelSelector, destroy, void(entity));
 	ATTRIB(XonoticPlayerModelSelector, origin, vector, '0 0 0')
 	ATTRIB(XonoticPlayerModelSelector, size, vector, '0 0 0')
 	ATTRIB(XonoticPlayerModelSelector, realFontSize, vector, '0 0 0')
@@ -31,7 +33,7 @@ void PlayerModelSelector_Prev_Click(entity btn, entity me);
 entity makeXonoticPlayerModelSelector()
 {
 	entity me;
-	me = spawnXonoticPlayerModelSelector();
+	me = NEW(XonoticPlayerModelSelector);
 	me.configureXonoticPlayerModelSelector(me);
 	return me;
 }
@@ -218,6 +220,8 @@ void XonoticPlayerModelSelector_resizeNotify(entity me, vector relOrigin, vector
 
 void XonoticPlayerModelSelector_showNotify(entity me)
 {
+	// Reinitialize self.
+	me.destroy(me);
 	me.configureXonoticPlayerModelSelector(me);
 }
 #endif