diff --git a/source/code/TextManager.hpp b/source/code/TextManager.hpp
index 18d3ed3..5e8a4a4 100644
--- a/source/code/TextManager.hpp
+++ b/source/code/TextManager.hpp
@@ -25,6 +25,7 @@ http://www.blockattack.net
 #define TEXTMANAGER_HPP
 
 #include <string>
+#include <array>
 
 class TextMessage {
 private:
@@ -67,19 +68,19 @@ public:
 };  //text popup
 
 class TextManager {
-public:
 	static const int maxNumberOfTexts = 6*12*2*2;
-	TextMessage textArray[maxNumberOfTexts];
+public:
+	std::array<TextMessage, maxNumberOfTexts> textArray;
 
 	TextManager() {
 	}
 
 	int addText(int x, int y, const std::string& Text,unsigned int Time) {
-		int textNumber = 0;
-		while (textNumber<maxNumberOfTexts && textArray[textNumber].inUse) {
+		size_t textNumber = 0;
+		while (textNumber<textArray.size() && textArray[textNumber].inUse) {
 			textNumber++;
 		}
-		if (textNumber==maxNumberOfTexts) {
+		if (textNumber==textArray.size()) {
 			return -1;
 		}
 		textArray[textNumber] = TextMessage(x,y,Text.c_str(),Time);
@@ -88,7 +89,7 @@ public:
 	}  //addText
 
 	void update() {
-		for (int i = 0; i<maxNumberOfTexts; i++) {
+		for (size_t i = 0; i<textArray.size(); i++) {
 
 			if (textArray[i].inUse) {
 				if (textArray[i].removeMe()) {
diff --git a/source/code/main.cpp b/source/code/main.cpp
index d299993..e17a5c4 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -591,7 +591,7 @@ static void DrawBalls() {
 			DrawIMG(explosion[theExplosionManager.explosionArray[i].getFrame()],globalData.screen,theExplosionManager.explosionArray[i].getX(),theExplosionManager.explosionArray[i].getY());
 		}
 	} //for
-	for (int i = 0; i < globalData.theTextManager.maxNumberOfTexts; ++i) {
+	for (size_t i = 0; i < globalData.theTextManager.textArray.size(); ++i) {
 		if (globalData.theTextManager.textArray[i].inUse) {
 			int x = globalData.theTextManager.textArray[i].getX()-12;
 			int y = globalData.theTextManager.textArray[i].getY()-12;