Merge branch 'master' into martin-t/globals

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / models / all.qh

diff --git a/qcsrc/common/models/all.qh b/qcsrc/common/models/all.qh
index a7ab9088079f8914e35f12d8bddb7be67a9b6d0b..ce98629411fd0cd6c3ce798a813acf5dd0fd602f 100644 (file)
--- a/qcsrc/common/models/all.qh
+++ b/qcsrc/common/models/all.qh
@@ -1,22 +1,23 @@
-#ifndef MODELS_ALL_H
-#define MODELS_ALL_H
+#pragma once
 
 #include "model.qh"
 
-REGISTRY(Models, BIT(9))
-REGISTER_REGISTRY(RegisterModels)
+REGISTRY(Models, BITS(9))
+#define Models_from(i) _Models_from(i, MDL_Null)
+REGISTER_REGISTRY(Models)
 
 #define MODEL(name, path) \
     string MDL_##name##_get() { return path; } \
-    REGISTER(RegisterModels, MDL, Models, name, m_id, NEW(Model, MDL_##name##_get))
+    REGISTER(Models, MDL, name, m_id, NEW(Model, MDL_##name##_get))
 
-STATIC_INIT(RegisterModels_precache) {
-    FOREACH(Models, true, LAMBDA({
-        it.model_precache(it);
-    }));
+STATIC_INIT(NULLMDL)
+{
+    precache_model("null");
+}
+
+PRECACHE(Models) {
+    FOREACH(Models, true, it.model_precache(it));
 }
 
 MODEL(Null, "null");
 #include "all.inc"
-
-#endif