From e6122f5ce4fc84ec00b93ea6902fcc13e0fe4037 Mon Sep 17 00:00:00 2001
From: cirdan <cirdansw@gmail.com>
Date: Thu, 26 Nov 2015 21:24:43 +0100
Subject: [PATCH] Remove ZeroedMemoryAllocator from ScriptText

Have ScriptText initialise all of its members on construction and
not derive from ZeroedMemoryAllocator.

(cherry picked from commit 3240126202d3437396004f2d5b0371783effb1ea)

Reorder ScriptText constructor initialisers.
---
 src/script/api/script_text.cpp | 2 +-
 src/script/api/script_text.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp
index e692be0ae2..bf4ff85ca8 100644
--- a/src/script/api/script_text.cpp
+++ b/src/script/api/script_text.cpp
@@ -30,7 +30,7 @@ RawText::~RawText()
 
 
 ScriptText::ScriptText(HSQUIRRELVM vm) :
-	ZeroedMemoryAllocator()
+	string(STR_NULL), params(), parami(), paramt(), paramc(0)
 {
 	int nparam = sq_gettop(vm) - 1;
 	if (nparam < 1) {
diff --git a/src/script/api/script_text.hpp b/src/script/api/script_text.hpp
index ed14e391d0..e591560247 100644
--- a/src/script/api/script_text.hpp
+++ b/src/script/api/script_text.hpp
@@ -73,7 +73,7 @@ private:
  *
  * @api game
  */
-class ScriptText : public Text , public ZeroedMemoryAllocator {
+class ScriptText : public Text {
 public:
 	static const int SCRIPT_TEXT_MAX_PARAMETERS = 20; ///< The maximum amount of parameters you can give to one object.