Skip to content

Commit 57648c5

Browse files
CLIENT-GAME: Fix redsource on windows (#144)
* CLIENT-GAME: Fix redsource on windows * FORMAT-AUTO: automatic format on pull request #144 * CLIENT: Remove logger fatal wtf * FORMAT-AUTO: automatic format on pull request #144 --------- Co-authored-by: Github Actions <github-actions[bot]@users.noreply.github.com>
1 parent 42ba99f commit 57648c5

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

src/Client/Systems/Menus/Menu/MenuSystems.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,13 @@ namespace Systems {
236236
}
237237
Registry::getInstance().getClock().restart(clockId);
238238
switch (Scene::SceneManager::getInstance().getCurrentScene()) {
239-
case MENU: Logger::fatal("in menu"); Scene::SceneManager::getInstance().stop(); break;
239+
case MENU: Scene::SceneManager::getInstance().stop(); break;
240240
case CREATE_LOBBY_SCENE:
241-
Logger::fatal("in select create lobby");
242241
Scene::SceneManager::getInstance().changeScene(SELECT_LOBBY);
243242
break;
244-
case SELECT_LOBBY: Logger::fatal("in select lobby"); Scene::SceneManager::getInstance().changeScene(MENU); break;
245-
case CREATE_SERVER_SCENE: Logger::fatal("in create server"); Scene::SceneManager::getInstance().changeScene(MENU); break;
243+
case SELECT_LOBBY: Scene::SceneManager::getInstance().changeScene(MENU); break;
244+
case CREATE_SERVER_SCENE: Scene::SceneManager::getInstance().changeScene(MENU); break;
246245
case GAME:
247-
Logger::fatal("in game");
248246
Nitwork::NitworkClient::getInstance().disconnectLobby();
249247
Types::WaveInfos::getInstance().reset();
250248
Scene::SceneManager::getInstance().changeScene(SELECT_LOBBY);

src/Game/ResourcesManager.hpp

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,13 @@ class ResourcesManager {
185185

186186
if (!ResourcesManager::isExists(path_tmp.string(), "share")
187187
|| !ResourcesManager::isExists(path_tmp.string(), "bin")) {
188-
Logger::fatal("RESOURCE_MANAGER: Path don't contain OK: " + path_tmp.string());
189-
return ResourcesManager::getRessourcePathNormal(pathFolderInit);
188+
Logger::warn("RESOURCE_MANAGER: Path don't contain OK: " + path_tmp.string());
189+
path_tmp = path_tmp.parent_path();
190+
if (!ResourcesManager::isExists(path_tmp.string(), "share")
191+
|| !ResourcesManager::isExists(path_tmp.string(), "bin")) {
192+
Logger::warn("RESOURCE_MANAGER: Path don't contain OK: " + path_tmp.string());
193+
return ResourcesManager::getRessourcePathNormal(pathFolderInit);
194+
}
190195
}
191196
return path_tmp.string();
192197
}
@@ -196,7 +201,12 @@ class ResourcesManager {
196201
boost::filesystem::path path_tmp = pathFolderInit;
197202

198203
if (!ResourcesManager::isExists(path_tmp.string(), "assets")) {
199-
Logger::fatal("RESOURCE_MANAGER: Path don't contain OK: " + path_tmp.string());
204+
Logger::warn("RESOURCE_MANAGER: Path don't contain OK: " + path_tmp.string());
205+
path_tmp = path_tmp.parent_path();
206+
if (!ResourcesManager::isExists(path_tmp.string(), "assets")) {
207+
Logger::warn("RESOURCE_MANAGER: Path don't contain OK: " + path_tmp.string());
208+
return "";
209+
}
200210
return "";
201211
}
202212
return path_tmp.string();

0 commit comments

Comments
 (0)