Merge branch 'TimePath/soundregistry' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / maplist.qc

diff --git a/qcsrc/menu/xonotic/maplist.qc b/qcsrc/menu/xonotic/maplist.qc
index a4cc0565c31d3999f83b6f87edbf44619dfeb955..91d8eaa3de36d6bf14896d31cea4895f8aaf3e20 100644 (file)
--- a/qcsrc/menu/xonotic/maplist.qc
+++ b/qcsrc/menu/xonotic/maplist.qc
@@ -2,16 +2,16 @@
 #define MAPLIST_H
 #include "listbox.qc"
 CLASS(XonoticMapList, XonoticListBox)
-       METHOD(XonoticMapList, configureXonoticMapList, void(entity))
+       METHOD(XonoticMapList, configureXonoticMapList, void(entity));
        ATTRIB(XonoticMapList, rowsPerItem, float, 4)
-       METHOD(XonoticMapList, draw, void(entity))
-       METHOD(XonoticMapList, drawListBoxItem, void(entity, int, vector, bool, bool))
-       METHOD(XonoticMapList, clickListBoxItem, void(entity, float, vector))
-       METHOD(XonoticMapList, doubleClickListBoxItem, void(entity, float, vector))
-       METHOD(XonoticMapList, resizeNotify, void(entity, vector, vector, vector, vector))
-       METHOD(XonoticMapList, refilter, void(entity))
-       METHOD(XonoticMapList, refilterCallback, void(entity, entity))
-       METHOD(XonoticMapList, keyDown, float(entity, float, float, float))
+       METHOD(XonoticMapList, draw, void(entity));
+       METHOD(XonoticMapList, drawListBoxItem, void(entity, int, vector, bool, bool));
+       METHOD(XonoticMapList, clickListBoxItem, void(entity, float, vector));
+       METHOD(XonoticMapList, doubleClickListBoxItem, void(entity, float, vector));
+       METHOD(XonoticMapList, resizeNotify, void(entity, vector, vector, vector, vector));
+       METHOD(XonoticMapList, refilter, void(entity));
+       METHOD(XonoticMapList, refilterCallback, void(entity, entity));
+       METHOD(XonoticMapList, keyDown, float(entity, float, float, float));
 
        ATTRIB(XonoticMapList, realFontSize, vector, '0 0 0')
        ATTRIB(XonoticMapList, columnPreviewOrigin, float, 0)
@@ -30,25 +30,24 @@ CLASS(XonoticMapList, XonoticListBox)
        ATTRIB(XonoticMapList, itemAbsSize, vector, '0 0 0')
 
        ATTRIB(XonoticMapList, g_maplistCache, string, string_null)
-       METHOD(XonoticMapList, g_maplistCacheToggle, void(entity, float))
-       METHOD(XonoticMapList, g_maplistCacheQuery, float(entity, float))
+       METHOD(XonoticMapList, g_maplistCacheToggle, void(entity, float));
+       METHOD(XonoticMapList, g_maplistCacheQuery, float(entity, float));
 
        ATTRIB(XonoticMapList, stringFilter, string, string_null)
        ATTRIB(XonoticMapList, stringFilterBox, entity, NULL)
 
        ATTRIB(XonoticMapList, startButton, entity, NULL)
 
-       METHOD(XonoticMapList, loadCvars, void(entity))
+       METHOD(XonoticMapList, loadCvars, void(entity));
 
        ATTRIB(XonoticMapList, typeToSearchString, string, string_null)
        ATTRIB(XonoticMapList, typeToSearchTime, float, 0)
 
-       METHOD(XonoticMapList, destroy, void(entity))
+       METHOD(XonoticMapList, destroy, void(entity));
 
        ATTRIB(XonoticMapList, alphaBG, float, 0)
 ENDCLASS(XonoticMapList)
 entity makeXonoticMapList();
-entity makeXonoticMapListStringFilterBox(entity me, float doEditColorCodes, string theCvar);
 void MapList_StringFilterBox_Change(entity box, entity me);
 float MapList_StringFilterBox_keyDown(entity me, float key, float ascii, float shift);
 void MapList_Add_Shown(entity btn, entity me);
@@ -64,10 +63,6 @@ void XonoticMapList_destroy(entity me)
        MapInfo_Shutdown();
 }
 
-entity makeXonoticMapListStringFilterBox(entity me, float doEditColorCodes, string theCvar)
-{
-       return makeXonoticInputBox(doEditColorCodes, theCvar);
-}
 entity makeXonoticMapList()
 {
        entity me;
@@ -280,7 +275,7 @@ void MapList_StringFilterBox_Change(entity box, entity me)
                me.stringFilter = strzone(box.text);
        else
                me.stringFilter = string_null;
-       
+
        me.refilter(me);
 }
 
@@ -345,7 +340,7 @@ void MapList_LoadMap(entity btn, entity me)
        m = MapInfo_BSPName_ByID(i);
        if (!m)
        {
-               print(_("Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n"));
+               LOG_INFO(_("Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n"));
                me.refilter(me);
                return;
        }
@@ -358,7 +353,7 @@ void MapList_LoadMap(entity btn, entity me)
        }
        else
        {
-               print(_("Huh? Can't play this (invalid game type). Refiltering so this won't happen again.\n"));
+               LOG_INFO(_("Huh? Can't play this (invalid game type). Refiltering so this won't happen again.\n"));
                me.refilter(me);
                return;
        }