Merge branch 'master' into TimePath/guide

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / item.qh

diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh
index a976da5caab83193f82f358c23069acff8e67e5c..16db39728561035115b66942a4620ae25b51458a 100644 (file)
--- a/qcsrc/common/items/item.qh
+++ b/qcsrc/common/items/item.qh
@@ -7,12 +7,10 @@ CLASS(GameItem, Object)
     ATTRIB(GameItem, m_id, int, 0)
     ATTRIB(GameItem, m_name, string, string_null)
     ATTRIB(GameItem, m_icon, string, string_null)
-    METHOD(GameItem, display, void(entity this, void(string name, string icon) returns))
-    void GameItem_display(entity this, void(string name, string icon) returns) {
+    METHOD(GameItem, display, void(entity this, void(string name, string icon) returns)) {
         returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon) : string_null);
     }
-    METHOD(GameItem, show, void(entity this))
-    void GameItem_show(entity this) { print("A game item\n"); }
+    METHOD(GameItem, show, void(entity this)) { print("A game item\n"); }
     void ITEM_HANDLE(Show, entity this) { this.show(this); }
 ENDCLASS(GameItem)