X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_media_demo.qc;h=b7f3884a80bd4284e69da513b03ae72f7ae51452;hb=92749b51e06f4fd2a89d7593a9db7500818ad2fd;hp=ab2886a28542f66987de95c3ba02ea108ee38cb1;hpb=253cc10990569fd90917dba809ce03c90fc89336;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc index ab2886a28..b7f3884a8 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc @@ -1,7 +1,8 @@ -#ifdef INTERFACE -CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab) - METHOD(XonoticDemoBrowserTab, fill, void(entity)) - ATTRIB(XonoticDemoBrowserTab, title, string, _("Demo")) +#ifndef DIALOG_MULTIPLAYER_MEDIA_DEMO_H +#define DIALOG_MULTIPLAYER_MEDIA_DEMO_H +#include "tab.qc" +CLASS(XonoticDemoBrowserTab, XonoticTab) + METHOD(XonoticDemoBrowserTab, fill, void(entity)); ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9) ATTRIB(XonoticDemoBrowserTab, rows, float, 21) ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5) @@ -9,14 +10,11 @@ CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab) ATTRIB(XonoticDemoBrowserTab, democlicktype, float, 0) ENDCLASS(XonoticDemoBrowserTab) entity makeXonoticDemoBrowserTab(); -#ifdef IMPLEMENTATION -// private: -const float DMO_PLAY = 1; -const float DMO_TIME = 2; -#endif #endif #ifdef IMPLEMENTATION +const float DMO_PLAY = 1; +const float DMO_TIME = 2; void DemoConfirm_Check_Gamestatus(entity btn, entity me) { if(!(gamestatus & (GAME_CONNECTED | GAME_ISSERVER))) // we're not in a match, lets watch the demo @@ -38,7 +36,7 @@ void DemoConfirm_Check_Gamestatus(entity btn, entity me) entity makeXonoticDemoBrowserTab() { entity me; - me = spawnXonoticDemoBrowserTab(); + me = NEW(XonoticDemoBrowserTab); me.configureDialog(me); return me; } @@ -52,7 +50,6 @@ void XonoticDemoBrowserTab_fill(entity me) me.TD(me, 1, 2.9, e = makeXonoticInputBox(0, string_null)); e.onChange = DemoList_Filter_Change; e.onChangeEntity = demolist; - demolist.controlledTextbox = e; me.gotoRC(me, 0, 3.7); me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_autodemo", _("Auto record demos"))); @@ -64,7 +61,8 @@ void XonoticDemoBrowserTab_fill(entity me) me.TD(me, me.rows - 2.5, me.columns, demolist); me.gotoRC(me, me.rows - 1, 0); - me.TD(me, 1, me.columns / 2, e = makeXonoticButton(_("Timedemo"), '0 0 0')); + me.TD(me, 1, me.columns / 2, e = makeXonoticButton_T(_("Timedemo"), '0 0 0', + _("Benchmark how fast your computer can run the highlighted demo"))); e.democlicktype = DMO_TIME; e.onClick = DemoConfirm_Check_Gamestatus; e.onClickEntity = me; // demolist is global anyway