Merge pull request #66 from Databean/moreSoftConfig

More soft config

Author: PickledMonkey

Makefile

@@ -20,6 +20,7 @@ $(EXECUTABLE): $(ALLFILES)
 .PHONY: tests
 tests: $(EXECUTABLE)
 	cd tests && $(MAKE)
+	tests/main.test
 
 .PHONY: clean
 clean:

resources/graphics.conf

@@ -1,25 +1,25 @@
 # Font settings
-font.path=resources/ComicNeue-Bold.ttf
-font.size=50
+font.path = resources/ComicNeue-Bold.ttf
+font.size = 50
 
 # General window settings
-screen.width=1280
-screen.height=720
+screen.width = 1280
+screen.height = 720
 
 # Trading view screen coordinates
-screen.tradingView.bottomLeft=(0.1,0.1)
-screen.tradingView.topRight=(0.9,0.9)
+screen.tradingView.bottomLeft = (0.1,0.1)
+screen.tradingView.topRight = (0.9,0.9)
 
-screen.tradingView.tradeButton.bottomLeft=(0.7,0.1)
-screen.tradingView.tradeButton.topRight=(0.9,0.2)
+screen.tradingView.tradeButton.bottomLeft = (0.7,0.1)
+screen.tradingView.tradeButton.topRight = (0.9,0.2)
 
-screen.tradingView.cancelButton.bottomLeft=(0.1,0.1)
-screen.tradingView.cancelButton.topRight=(0.3,0.2)
+screen.tradingView.cancelButton.bottomLeft = (0.1,0.1)
+screen.tradingView.cancelButton.topRight = (0.3,0.2)
 
-screen.tradingView.resources.height=0.13
-screen.tradingView.resources.leftX=0.3
-screen.tradingView.resources.rightX=0.6
-screen.tradingView.resources.bottomY=0.2
+screen.tradingView.resources.height = 0.13
+screen.tradingView.resources.leftX = 0.3
+screen.tradingView.resources.rightX = 0.6
+screen.tradingView.resources.bottomY = 0.2
 
-screen.tradingView.players.bottomLeft=(0.1,0.8)
-screen.tradingView.players.topRight=(0.9,0.9)
+screen.tradingView.players.bottomLeft = (0.1,0.8)
+screen.tradingView.players.topRight = (0.9,0.9)

src/Config.cpp

@@ -114,7 +114,13 @@ void Config::init(istream& source) {
 			continue;
 		}
 		string name = line.substr(0, line.find('='));
+		while(name[name.size()-1] == ' ' || name[name.size()-1] == '\t') {
+			name = name.substr(0, name.size()-1);
+		}
 		string value = line.substr(line.find('=') + 1);
+		while(value[0] == ' ' || value[0] == '\t') {
+			value = value.substr(1);
+		}
 		values.insert(std::make_pair(name, ConfigValue(value)));
 	}
 }

tests/Makefile

@@ -5,7 +5,7 @@ OBJECTS_NO_MAIN := $(subst $(OBJ_HOME)/main.o,,$(OBJECTS))
 
 .PHONY: run
 run: $(TEST_FILE)
-	./$(TEST_FILE)
+	
 
 $(TEST_FILE): ../$(EXECUTABLE) $(TEST_LINK_FILES) $(wildcard *.cpp)
 	$(CXX) $(CXXFLAGS) $(TEST_INCLUDE) $(wildcard *.cpp) -o $@ $(TEST_LINK_FILES) $(OBJECTS_NO_MAIN) $(LDFLAGS)