about summary refs log tree commit diff
path: root/src/base/tl/array.h
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2010-07-17 14:10:43 +0200
committeroy <Tom_Adams@web.de>2010-07-17 14:10:43 +0200
commit6193f354232b3cc9a7272c3b17cfc52b6415c9b8 (patch)
tree1b1b8bd1698240391ad89923edf33899a1046237 /src/base/tl/array.h
parent052820dc888a0912fd2ff413389bc24b1cfbf08d (diff)
parenta8acf8c6ff3af78369a0194b7f3ee34b5ab9df5c (diff)
downloadzcatch-6193f354232b3cc9a7272c3b17cfc52b6415c9b8.tar.gz
zcatch-6193f354232b3cc9a7272c3b17cfc52b6415c9b8.zip
Merge branch 'master' of http://github.com/matricks/teeworlds
Diffstat (limited to 'src/base/tl/array.h')
-rw-r--r--src/base/tl/array.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/base/tl/array.h b/src/base/tl/array.h
index 580f4682..14c83295 100644
--- a/src/base/tl/array.h
+++ b/src/base/tl/array.h
@@ -283,7 +283,7 @@ public:
 	*/
 	int memusage()
 	{
-		return sizeof(array) + sizeof(T)*size;
+		return sizeof(array) + sizeof(T)*list_size;
 	}
 
 	/*