Merge pull request #259 from AnonymusRaccoon/fix_parser

Fix parser
zoriya · Jun 20, 2021 · d8cf9a9 · d8cf9a9
2 parents 05f6eef + cc1ddc7
commit d8cf9a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/sources/Parser/ParserYaml.cpp b/sources/Parser/ParserYaml.cpp
@@ -62,7 +62,8 @@ namespace BBM {
 		static std::map<std::string, Bonus::BonusType> map {
 			{"Bonus Bomb Up", Bonus::BonusType::BOMBSTOCK},
 			{"Bonus Speed Up", Bonus::BonusType::SPEEDUP},
-			{"Bonus Fire Up", Bonus::BonusType::EXPLOSIONINC}
+			{"Bonus Fire Up", Bonus::BonusType::EXPLOSIONINC},
+			{"Bonus Wallpass", Bonus::BonusType::NOCLIP}
 		};
 
 		return (std::to_string(map.at(bonusName)));
@@ -361,6 +362,8 @@ namespace BBM {
 		int block = 0;
 		if (!Utils::tryParse(blockType, block))
 			throw (ParserError("Couldn't parse block type."));
+		if (block < 0 || block > 7)
+			throw (ParserError("Couldn't parse block type."));
 		return (static_cast<MapGenerator::BlockType>(block));
 	}
 
@@ -371,6 +374,8 @@ namespace BBM {
 		int bonus = 0;
 		if (!Utils::tryParse(bonusType, bonus))
 			throw (ParserError("Couldn't parse bonus type."));
+		if (bonus < 0 || bonus > 4)
+			throw (ParserError("Couldn't parse bonus type."));
 		return (static_cast<Bonus::BonusType>(bonus));
 	}
 

diff --git a/sources/Runner/PauseMenuScene.cpp b/sources/Runner/PauseMenuScene.cpp
@@ -147,8 +147,6 @@ namespace BBM
 				wal.getSystem<CameraSystem>().hasEnded = false;
 				gameState.nextScene = BBM::GameState::SceneID::MainMenuScene;
 			});
-		//needed material
-		//music
 		save.getComponent<OnClickComponent>().setButtonLinks(&settings);
 		play.getComponent<OnClickComponent>().setButtonLinks(nullptr, &save, nullptr, &settings);
 		settings.getComponent<OnClickComponent>().setButtonLinks(nullptr, &save, &play, &exit);

diff --git a/sources/System/Lobby/ResumeLobbySystem.cpp b/sources/System/Lobby/ResumeLobbySystem.cpp
@@ -106,6 +106,7 @@ namespace BBM
 		}
 		Runner::gameState.nextScene = BBM::GameState::SceneID::GameScene;
 		wal.getSystem<ResumeLobbySystem>().unloadLobbyFromResume();
+		ParserYAML::playersInfos.clear();
 	}
 
 	void ResumeLobbySystem::unloadLobbyFromResume()