diff --git a/ReflexToQ3/Makefile b/ReflexToQ3/Makefile index 097d470..701b505 100644 --- a/ReflexToQ3/Makefile +++ b/ReflexToQ3/Makefile @@ -4,7 +4,7 @@ CFLAGS=-std=c++11 -I"./includes" -I"./includes/Catch/single_include" -I"./includ TESTEX=test/test-parser UNITEX=test/catch -all: main +all: main unittest main: planes.o brushdef.o oopless-parser.o EntityConverter.o $(CC) $^ main.cpp $(CFLAGS) -o $(EX) 2>error8.log diff --git a/ReflexToQ3/includes/EntityConverter.cpp b/ReflexToQ3/includes/EntityConverter.cpp index 30c9033..e046e0b 100644 --- a/ReflexToQ3/includes/EntityConverter.cpp +++ b/ReflexToQ3/includes/EntityConverter.cpp @@ -142,23 +142,18 @@ EntityConverter::convert(std::vector lines) for ( int i = 1; i < lines.size(); ++i ) { // only works for maps that support race AND other modes if ( lines[i].find("modeRace 0") != std::string::npos) { - std::cout << "disabled race because worldspawn" << std::endl; mapinfo_.cts = false; } else if ( lines[i].find("modeCTF 0") != std::string::npos) { - std::cout << "disabled ctf because worldspawn" << std::endl; mapinfo_.ctf = false; } else if ( lines[i].find("modeFFA 0") != std::string::npos) { - std::cout << "disabled ffa because worldspawn" << std::endl; mapinfo_.ffa = false; } else if ( lines[i].find("modeTDM 0") != std::string::npos) { - std::cout << "disabled tdm because worldspawn" << std::endl; mapinfo_.tdm = false; } else if ( lines[i].find("mode1v1 0") != std::string::npos) { - std::cout << "disabled duel because worldspawn" << std::endl; mapinfo_.duel = false; } }