From: Samual Lenks Date: Sat, 12 Oct 2013 23:17:20 +0000 (-0400) Subject: Some cleanup X-Git-Tag: xonotic-v0.8.0~256^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=88242c8252052ecab6efe8b20e128b2b4f649161;p=xonotic%2Fxonotic-data.pk3dir.git Some cleanup --- diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c index 417806c3f..69f5d4737 100644 --- a/qcsrc/menu/xonotic/serverlist.c +++ b/qcsrc/menu/xonotic/serverlist.c @@ -49,7 +49,6 @@ CLASS(XonoticServerList) EXTENDS(XonoticListBox) ATTRIB(XonoticServerList, infoButton, entity, NULL) ATTRIB(XonoticServerList, currentSortOrder, float, 0) ATTRIB(XonoticServerList, currentSortField, float, -1) - ATTRIB(XonoticServerList, lastBumpSelectTime, float, 0) ATTRIB(XonoticServerList, lastClickedServer, float, -1) ATTRIB(XonoticServerList, lastClickedTime, float, 0) @@ -1241,14 +1240,11 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift) { - float i = me.selectedItem; vector org, sz; org = boxToGlobal(eY * (me.selectedItem * me.itemHeight - me.scrollPos), me.origin, me.size); sz = boxToGlobalSize(eY * me.itemHeight + eX * (1 - me.controlWidth), me.size); - me.lastBumpSelectTime = 0; - if(scan == K_ENTER || scan == K_KP_ENTER) { ServerList_Connect_Click(NULL, me); @@ -1258,7 +1254,7 @@ float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift) { if(me.nItems != 0) { - main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, i); + main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem); DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz); return 1; }