From af01956c31c02ec705037ed20f46f0252c307b6a Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 16 Dec 2018 15:49:48 +1100 Subject: [PATCH] Increase FOV limit to 179 --- .../2D/Screens/Menu/HacksSettingsScreen.cs | 2 +- ClassicalSharp/Game/Game.Init.cs | 2 +- ClassicalSharp/Game/Game.cs | 2 +- src/Game.c | 4 ++-- src/Menus.c | 2 +- src/Resources.c | 13 +++++++++++++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ClassicalSharp/2D/Screens/Menu/HacksSettingsScreen.cs b/ClassicalSharp/2D/Screens/Menu/HacksSettingsScreen.cs index 6731d6727..c5f379946 100644 --- a/ClassicalSharp/2D/Screens/Menu/HacksSettingsScreen.cs +++ b/ClassicalSharp/2D/Screens/Menu/HacksSettingsScreen.cs @@ -19,7 +19,7 @@ namespace ClassicalSharp.Gui.Screens { defaultValues[1] = "10"; validators[3] = new RealValidator(0.1f, 2048f); defaultValues[3] = (1.233f).ToString(); - validators[9] = new IntegerValidator(1, 150); + validators[9] = new IntegerValidator(1, 179); defaultValues[9] = "70"; MakeDescriptions(); diff --git a/ClassicalSharp/Game/Game.Init.cs b/ClassicalSharp/Game/Game.Init.cs index 5030abe18..711338e13 100644 --- a/ClassicalSharp/Game/Game.Init.cs +++ b/ClassicalSharp/Game/Game.Init.cs @@ -186,7 +186,7 @@ namespace ClassicalSharp { UserViewDistance = ViewDistance; SmoothLighting = Options.GetBool(OptionsKey.SmoothLighting, false); - DefaultFov = Options.GetInt(OptionsKey.FieldOfView, 1, 150, 70); + DefaultFov = Options.GetInt(OptionsKey.FieldOfView, 1, 179, 70); Fov = DefaultFov; ZoomFov = DefaultFov; BreakableLiquids = !ClassicMode && Options.GetBool(OptionsKey.ModifiableLiquids, false); diff --git a/ClassicalSharp/Game/Game.cs b/ClassicalSharp/Game/Game.cs index 8fb2c9313..11bb2b355 100644 --- a/ClassicalSharp/Game/Game.cs +++ b/ClassicalSharp/Game/Game.cs @@ -113,7 +113,7 @@ namespace ClassicalSharp { } public void UpdateProjection() { - DefaultFov = Options.GetInt(OptionsKey.FieldOfView, 1, 150, 70); + DefaultFov = Options.GetInt(OptionsKey.FieldOfView, 1, 179, 70); Camera.GetProjection(out Graphics.Projection); Graphics.SetMatrixMode(MatrixType.Projection); diff --git a/src/Game.c b/src/Game.c index 94137ad08..40499b1f2 100644 --- a/src/Game.c +++ b/src/Game.c @@ -168,7 +168,7 @@ void Game_UserSetViewDistance(int distance) { } void Game_UpdateProjection(void) { - Game_DefaultFov = Options_GetInt(OPT_FIELD_OF_VIEW, 1, 150, 70); + Game_DefaultFov = Options_GetInt(OPT_FIELD_OF_VIEW, 1, 179, 70); Camera_Active->GetProjection(&Gfx_Projection); Gfx_LoadMatrix(MATRIX_PROJECTION, &Gfx_Projection); @@ -355,7 +355,7 @@ static void Game_LoadOptions(void) { Game_ViewDistance = Options_GetInt(OPT_VIEW_DISTANCE, 16, 4096, 512); Game_UserViewDistance = Game_ViewDistance; - Game_DefaultFov = Options_GetInt(OPT_FIELD_OF_VIEW, 1, 150, 70); + Game_DefaultFov = Options_GetInt(OPT_FIELD_OF_VIEW, 1, 179, 70); Game_Fov = Game_DefaultFov; Game_ZoomFov = Game_DefaultFov; Game_BreakableLiquids = !Game_ClassicMode && Options_GetBool(OPT_MODIFIABLE_LIQUIDS, false); diff --git a/src/Menus.c b/src/Menus.c index d461eb093..2a8527cae 100644 --- a/src/Menus.c +++ b/src/Menus.c @@ -2721,7 +2721,7 @@ struct Screen* HacksSettingsScreen_MakeInstance(void) { validators[3] = MenuInputValidator_Float(0.10f, 2048.00f); /* TODO: User may not always use . for decimal point, need to account for that */ defaultValues[3] = "1.233"; - validators[9] = MenuInputValidator_Int(1, 150); + validators[9] = MenuInputValidator_Int(1, 179); defaultValues[9] = "70"; struct Screen* s = MenuOptionsScreen_MakeInstance(widgets, Array_Elems(widgets), buttons, diff --git a/src/Resources.c b/src/Resources.c index 501257155..e044b9cc9 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -186,6 +186,19 @@ struct ResourceMusic Resources_Music[7] = { *-----------------------------------------------------------Fetcher-------------------------------------------------------* *#########################################################################################################################*/ struct FetchResourcesData FetchResourcesTask; +static void Fetcher_DownloadAll(void) { + String id; char idBuffer[STRING_SIZE]; + String url; char urlBuffer[STRING_SIZE]; + int i; + + String_InitArray(id, idBuffer); + String_InitArray(url, urlBuffer); +} + +static void Fetcher_Next(void) { + +} + /* TODO: Implement this.. */ void FetchResourcesTask_Run(FetchResourcesStatus setStatus) { }