Bug fixezzz\!\!\!\!\?\?\!\?\!\?\!\?\!\!

src/checkCondition.cpp

@@ -116,6 +116,7 @@ std::string parseConditionBoolean(std::string condition)
                 condition.insert(place-1, "0");
         }
     }
+    
     return condition;
 }
 
@@ -148,17 +149,17 @@ bool GameController::checkVariable(std::string variableString)
             variableName += variableString[place];
     }
     
-    for(int place = 0; place < variables.size(); place++)
-    {
-        if(variables.at(place) == variableName && variablesValue.at(place) == variableValue)
-            return !isNegate;
-    }
+    if(getVariableValue(variableName) == variableValue)
+        return !isNegate;
+    
     return isNegate;
 }
 
 bool GameController::checkCondition(std::string condition)
 {
     condition = removeWhiteSpace(condition, '\n');
+    condition = doMacros(condition);
+    
     std::string checkFor[] = {"item", "life", "gameclock", "var"};
     
     bool reply;
@@ -198,7 +199,7 @@ bool GameController::checkCondition(std::string condition)
                     else
                         condition.insert(place, "0");
                 }
-                
+        
         return parseConditionBoolean(condition)[0]-48;
     }
 }

src/gameController.cpp

@@ -194,16 +194,19 @@ std::string GameController::doHealth(std::string command)
     {
         health += stoi(amount);
         std::cout << "+" << stoi(amount) << " health. (" << health << " now) " << sessionKey << std::endl;
+        std::cout << " " << sessionKey << std::endl;
     }
     else if(type == '-')
     {
         health -= stoi(amount);
         std::cout << "-" << stoi(amount) << " health. (" << health << " now) " << sessionKey << std::endl;
+        std::cout << " " << sessionKey << std::endl;
     }
     else if(type == '=')
     {
-        std::cout << "Health set to " << health << " " << sessionKey << std::endl;
         health = stoi(amount);
+        std::cout << "Health set to " << health << " " << sessionKey << std::endl;
+        std::cout << " " << sessionKey << std::endl;
     }
     
     if(health <= 0)
@@ -387,13 +390,16 @@ bool GameController::addItem(std::string itemString)
             {
                 case '+':
                 {
-                    std::cout << itemName << " + " << amount << " " << sessionKey << std::endl;
+                    itemsAmount.at(place) += intAmount;
+                    std::cout << itemName << " + " << amount << " (" << itemsAmount.at(place) << " now) " << sessionKey << std::endl;
+                    std::cout << " " << sessionKey << std::endl;
                 }
                 break;
                 case '-':
                 {
                     itemsAmount.at(place) -= intAmount;
-                    std::cout << itemName << " - " << amount << " " << sessionKey << std::endl;
+                    std::cout << itemName << " - " << amount << " (" << itemsAmount.at(place) << " now) " << sessionKey << std::endl;
+                    std::cout << " " << sessionKey << std::endl;
                 }
                 break;
                 case '/':
@@ -414,7 +420,8 @@ bool GameController::addItem(std::string itemString)
     
     if(not foundPlace)
     {
-        std::cout << itemName << " + " << amount << " " << sessionKey << std::endl;
+        std::cout << itemName << " + " << amount << " (" << amount << " now) " << sessionKey << std::endl;
+        std::cout << " " << sessionKey << std::endl;
         
         items.push_back(itemName);
         itemsAmount.push_back(intAmount);

src/main.cpp

@@ -152,8 +152,8 @@ int main()
     mainGameVector.push_back(new GameContainer);
     mainGameVector.at(mainGameVector.size()-1)->game = new GameController("moo"); //moo
     mainGameVector.at(mainGameVector.size()-1)->sessionKey = "moo"; //moo
-    mainGameVector.at(mainGameVector.size()-1)->game->parseFile("game.txt"); //game.txt
-    mainGameVector.at(mainGameVector.size()-1)->game->storyline = ";setup;"; //;setup;
+    mainGameVector.at(mainGameVector.size()-1)->game->parseFile("rpg.txt"); //game.txt
+    mainGameVector.at(mainGameVector.size()-1)->game->storyline = ";1;"; //;setup;
     printOptions(mainGameVector.size()-1, &mainGameVector);
     */
     

webserver/public/stylesheets/game.css

@@ -2,6 +2,12 @@
     max-height: none !important;
     height: 70vh;
     margin-top: 30px;
+    
+    white-space: pre-wrap;       /* Since CSS 2.1 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 
 #game {