Make it so you can at least go into third person when map fails to load

This commit is contained in:
UnknownShadow200 2020-03-31 18:10:59 +11:00
parent c7c26502df
commit 0654dc0f41
3 changed files with 4 additions and 4 deletions

View File

@ -67,7 +67,7 @@ void Map_LoadFrom(const String* path) {
importer = Map_FindImporter(path); importer = Map_FindImporter(path);
if ((res = importer(&stream))) { if ((res = importer(&stream))) {
World_Reset(); World_Reset();
Logger_Warn2(res, "decoding", path); stream.Close(&stream); return; Logger_Warn2(res, "decoding", path);
} }
res = stream.Close(&stream); res = stream.Close(&stream);

View File

@ -636,7 +636,7 @@ static void Game_RenderFrame(double delta) {
Camera.CurrentPos = Camera.Active->GetPosition(t); Camera.CurrentPos = Camera.Active->GetPosition(t);
UpdateViewMatrix(); UpdateViewMatrix();
if (!Gui_GetBlocksWorld() && World.Blocks) { if (!Gui_GetBlocksWorld()) {
Game_Render3D(delta, t); Game_Render3D(delta, t);
} else { } else {
RayTracer_SetInvalid(&Game_SelectedPos); RayTracer_SetInvalid(&Game_SelectedPos);

View File

@ -108,8 +108,8 @@ static int Program_Run(int argc, char** argv) {
#ifdef _MSC_VER #ifdef _MSC_VER
/* NOTE: Make sure to comment this out before pushing a commit */ /* NOTE: Make sure to comment this out before pushing a commit */
//String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565"); //String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565");
//String rawArgs = String_FromConst("UnknownShadow200"); String rawArgs = String_FromConst("UnknownShadow200");
//argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4); argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4);
#endif #endif
if (argsCount == 0) { if (argsCount == 0) {