commit e2c3b704
Removed one array
Changed files
| M | source/code/TextManager.hpp before |
| M | source/code/main.cpp before |
diff --git a/source/code/TextManager.hpp b/source/code/TextManager.hpp
index 7e34fa8..18d3ed3 100644
--- a/source/code/TextManager.hpp
+++ b/source/code/TextManager.hpp
@@ -34,7 +34,8 @@ private:
unsigned long int time = 0;
unsigned long int placeTime = 0; //Then the text was placed
public:
-
+ bool inUse = false;
+
TextMessage() {
}
@@ -69,33 +70,29 @@ class TextManager {
public:
static const int maxNumberOfTexts = 6*12*2*2;
TextMessage textArray[maxNumberOfTexts];
- bool textUsed[maxNumberOfTexts];
TextManager() {
- for (int i=0; i<maxNumberOfTexts; i++) {
- textUsed[i] = false;
- }
}
int addText(int x, int y, const std::string& Text,unsigned int Time) {
int textNumber = 0;
- while (textNumber<maxNumberOfTexts && textUsed[textNumber]) {
+ while (textNumber<maxNumberOfTexts && textArray[textNumber].inUse) {
textNumber++;
}
if (textNumber==maxNumberOfTexts) {
return -1;
}
textArray[textNumber] = TextMessage(x,y,Text.c_str(),Time);
- textUsed[textNumber] = true;
+ textArray[textNumber].inUse = true;
return 1;
} //addText
void update() {
for (int i = 0; i<maxNumberOfTexts; i++) {
- if (textUsed[i]) {
+ if (textArray[i].inUse) {
if (textArray[i].removeMe()) {
- textUsed[i] = false;
+ textArray[i].inUse = false;
}
}
}
diff --git a/source/code/main.cpp b/source/code/main.cpp
index a957dbc..d299993 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -592,7 +592,7 @@ static void DrawBalls() {
}
} //for
for (int i = 0; i < globalData.theTextManager.maxNumberOfTexts; ++i) {
- if (globalData.theTextManager.textUsed[i]) {
+ if (globalData.theTextManager.textArray[i].inUse) {
int x = globalData.theTextManager.textArray[i].getX()-12;
int y = globalData.theTextManager.textArray[i].getY()-12;
DrawIMG(iChainFrame,globalData.screen,x,y);