X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Flib%2Farraylist.qh;h=18305177bf8a266261e1be9ad143dfde695fcace;hp=a560474174c3ef742ebe2b711d7fe2142643e2ef;hb=d492869ab1f18e05121529b7bcffcb637d13994c;hpb=f1a87492d9fed27a64d0e99c068705aba5509f26

diff --git a/qcsrc/lib/arraylist.qh b/qcsrc/lib/arraylist.qh
index a56047417..18305177b 100644
--- a/qcsrc/lib/arraylist.qh
+++ b/qcsrc/lib/arraylist.qh
@@ -1,15 +1,13 @@
-#ifndef ARRAYLIST_H
-#define ARRAYLIST_H
+#pragma once
 
-typedef entity ArrayList;
+USING(ArrayList, entity);
 .int al_buf;
 .int al_len;
 
 #define AL_NEW(this, n, default, T) \
 	MACRO_BEGIN \
 	{ \
-		ArrayList _al = this = new(ArrayList); \
-		make_pure(_al); \
+		ArrayList _al = this = new_pure(ArrayList); \
 		_al.al_buf = buf_create(); \
 		for (int i = 0, _n = _al.al_len = n; i < _n; ++i) \
 		{ \
@@ -22,7 +20,7 @@ typedef entity ArrayList;
 	MACRO_BEGIN \
 	{ \
 		buf_del(this.al_buf); \
-		remove(this); \
+		delete(this); \
 		this = NULL; \
 	} MACRO_END
 
@@ -30,13 +28,35 @@ typedef entity ArrayList;
 #define AL_gets(this, idx) bufstr_get(this.al_buf, idx)
 #define AL_sets(this, idx, val) bufstr_set(this.al_buf, idx, val)
 
+#if defined(CSQC)
+string al_ftos(float f) = #26;
+float al_stof(string s) = #81;
+#elif defined(SVQC)
+string al_ftos(float f) = #26;
+float al_stof(string s) = #81;
+#elif defined(MENUQC)
+string al_ftos(float f) = #17;
+float al_stof(string s) = #21;
+#endif
+
 #define _AL_type__f() float
-#define AL_getf(this, idx) stof(AL_gets(this, idx))
-#define AL_setf(this, idx, val) AL_sets(this, idx, ftos(val))
+#define AL_getf(this, idx) al_stof(AL_gets(this, idx))
+#define AL_setf(this, idx, val) AL_sets(this, idx, al_ftos(val))
+
+#if defined(CSQC)
+int al_etof(entity e) = #512;
+entity al_ftoe(int i) = #459;
+#elif defined(SVQC)
+int al_etof(entity e) = #512;
+entity al_ftoe(int i) = #459;
+#elif defined(MENUQC)
+int al_etof(entity e) = #79;
+entity al_ftoe(int i) = #80;
+#endif
 
 #define _AL_type__e() entity
-#define AL_gete(this, idx) ftoe(AL_getf(this, idx))
-#define AL_sete(this, idx, val) AL_setf(this, idx, etof(val))
+#define AL_gete(this, idx) al_ftoe(AL_getf(this, idx))
+#define AL_sete(this, idx, val) AL_setf(this, idx, al_etof(val))
 
 #define AL_EACH(this, T, cond, body) \
 	MACRO_BEGIN \
@@ -48,5 +68,3 @@ typedef entity ArrayList;
 			if (cond) { body } \
 		} \
 	} MACRO_END
-
-#endif