X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_media_screenshot_viewer.qc;h=d6d545eeeaf00b939ce5b8ad35b6243bd8e66868;hb=37cf62041a76248472ef6a78feaaed33e35a2260;hp=bcf168a93a3036da416233dd427d6027d2df0eca;hpb=4e85c153239969d8dccea38031e18ddb24b6c935;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc
index bcf168a93..d6d545eee 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc
@@ -1,23 +1,9 @@
-#ifdef INTERFACE
-CLASS(XonoticScreenshotViewerDialog) EXTENDS(XonoticDialog)
-	METHOD(XonoticScreenshotViewerDialog, fill, void(entity))
-	METHOD(XonoticScreenshotViewerDialog, keyDown, float(entity, float, float, float))
-	METHOD(XonoticScreenshotViewerDialog, loadScreenshot, void(entity, string))
-	METHOD(XonoticScreenshotViewerDialog, close, void(entity))
-	ATTRIB(XonoticScreenshotViewerDialog, title, string, "Screenshot Viewer")
-	ATTRIB(XonoticScreenshotViewerDialog, name, string, "ScreenshotViewer")
-	ATTRIB(XonoticScreenshotViewerDialog, intendedWidth, float, 1)
-	ATTRIB(XonoticScreenshotViewerDialog, rows, float, 25)
-	ATTRIB(XonoticScreenshotViewerDialog, columns, float, 4)
-	ATTRIB(XonoticScreenshotViewerDialog, color, vector, SKINCOLOR_DIALOG_SCREENSHOTVIEWER)
-	ATTRIB(XonoticScreenshotViewerDialog, scrList, entity, NULL)
-	ATTRIB(XonoticScreenshotViewerDialog, screenshotImage, entity, NULL)
-	ATTRIB(XonoticScreenshotViewerDialog, slideShowButton, entity, NULL)
-	ATTRIB(XonoticScreenshotViewerDialog, currentScrPath, string, string_null)
-ENDCLASS(XonoticScreenshotViewerDialog)
-#endif
+#include "dialog_multiplayer_media_screenshot_viewer.qh"
+
+#include "screenshotlist.qh"
+#include "inputbox.qh"
+#include "button.qh"
 
-#ifdef IMPLEMENTATION
 float music_playlist_index_backup;
 void XonoticScreenshotViewerDialog_loadScreenshot(entity me, string scrImage)
 {
@@ -96,7 +82,7 @@ float XonoticScreenshotViewerDialog_keyDown(entity me, float key, float ascii, f
 			// to press buttons while browsing with only the keyboard
 			if (shift & S_CTRL)
 			{
-				toggleSlideShow_Click(world, me);
+				toggleSlideShow_Click(NULL, me);
 				return 1;
 			}
 			return SUPER(XonoticScreenshotViewerDialog).keyDown(me, key, ascii, shift);
@@ -168,4 +154,3 @@ void XonoticScreenshotViewerDialog_fill(entity me)
 			e.onClickEntity = me;
 			me.slideShowButton = e;
 }
-#endif