Fix handling of unknown entities

diff --git a/qcsrc/common/oo.qh b/qcsrc/common/oo.qh
index 1e167933512c5ed36aa0147014cdf49305a3de7a..01c9db915423f38d662c62d20721cdaf9676859e 100644 (file)
--- a/qcsrc/common/oo.qh
+++ b/qcsrc/common/oo.qh
@@ -118,9 +118,9 @@ STATIC_INIT(RegisterClasses) { RegisterClasses(); }
 #define _vtbl NULL
 CLASS(Object, );
     METHOD(Object, describe, string(entity this))
-    string Object_describe(entity) { return string_null; }
+    string Object_describe(entity this) { return _("No description"); }
     METHOD(Object, display, void(entity this, void(string name, string icon) returns))
-    void Object_display(entity, void(string, string)) { }
+    void Object_display(entity this, void(string name, string icon) returns) { returns(sprintf("entity %i", this), "nopreview_menuskin"); }
 ENDCLASS(Object)
 #undef spawn_static
 #undef spawn_1

diff --git a/qcsrc/menu/xonotic/dialog_media_guide.qc b/qcsrc/menu/xonotic/dialog_media_guide.qc
index fcc2719faa7c03607e75218182e30d575b59baa1..3c2fb8acd3fa908b0194d54d37497f25059bfdd2 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_media_guide.qc
+++ b/qcsrc/menu/xonotic/dialog_media_guide.qc
@@ -53,10 +53,7 @@ CLASS(DebugSource, DataSource)
             if (strstrofs(sprintf("entity %i", e), DebugSource_activeFilter, 0) < 0) continue;
             if (idx++ == i) break;
         }
-        if (returns) {
-            if (e.display) e.display(e, returns);
-            else returns(sprintf("entity %i", e), "");
-        }
+        if (returns) e.display(e, returns);
         return e;
     }
     METHOD(DebugSource, reload, int(string))
@@ -196,7 +193,7 @@ void XonoticGuideTab_entryChangeNotify(entity, entity this)
     entity desc = this.descriptionPane;
     entity entries = this.entryList;
     entity e = entries.source.getEntry(entries.selectedItem, func_null);
-    string s = e.describe ? e.describe(e) : _("No description");
+    string s = e.describe(e);
     if (cvar("developer")) { s = sprintf("entity %i\n%s", e, s); }
     desc.setDescription(desc, s);
 }