Merge branch 'master' into Mario/cursor

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / arraylist.qh

diff --git a/qcsrc/lib/arraylist.qh b/qcsrc/lib/arraylist.qh
index f9df9e6bfc5c60a97ff5a55d911f3f015914de8b..18305177bf8a266261e1be9ad143dfde695fcace 100644 (file)
--- a/qcsrc/lib/arraylist.qh
+++ b/qcsrc/lib/arraylist.qh
@@ -1,7 +1,6 @@
-#ifndef ARRAYLIST_H
-#define ARRAYLIST_H
+#pragma once
 
-typedef entity ArrayList;
+USING(ArrayList, entity);
 .int al_buf;
 .int al_len;
 
@@ -21,7 +20,7 @@ typedef entity ArrayList;
        MACRO_BEGIN \
        { \
                buf_del(this.al_buf); \
-               remove(this); \
+               delete(this); \
                this = NULL; \
        } MACRO_END
 
@@ -69,5 +68,3 @@ entity al_ftoe(int i) = #80;
                        if (cond) { body } \
                } \
        } MACRO_END
-
-#endif