diff --git a/README.md b/README.md index 6f67771..a059e86 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # ![ICON](pictures/icon.png) chisel8 Compact Hexadecimal Interpretive Programming – 8-bit (Chip-8 Interpreter), written in C with use of the [Raylib](https://github.com/raysan5/raylib) and [Raygui](https://github.com/raysan5/raygui) libraries. -Special thanks to everyone in the [EmuDev Discord Server](https://discord.com/invite/7nuaqZ2) that helped out with fixing some issues and handling undefined behaviour. +Special thanks to everyone in the [EmuDev Discord Server](https://discord.com/invite/7nuaqZ2) that helped out with fixing some issues and handling undefined behaviour, as well as +the test ROMS from [Timendus's Chip8 test suite](https://github.com/Timendus/chip8-test-suite). ### Pictures
diff --git a/include/gui/version.h.in b/include/gui/version.h.in index 7b1a156..2b1ad85 100644 --- a/include/gui/version.h.in +++ b/include/gui/version.h.in @@ -1,25 +1,27 @@ //============================================================================== -// Copyright (c) 2023, Tim -// All rights served. +// - MIT License | emu_main.h // -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: +// Copyright (c) 2023-2024, Tim +// All rights served. // -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: // -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. //============================================================================== #ifndef VERSION_H diff --git a/src/gui/options_window.c b/src/gui/options_window.c index c93962a..a194805 100644 --- a/src/gui/options_window.c +++ b/src/gui/options_window.c @@ -178,7 +178,9 @@ int32_t options_window(options_config *config, ui_scale *scale) { scale->font_size, RAYWHITE); // AUDIO VOLUME SLIDER - GuiSliderBar((Rectangle) {(scale->window_width / 2) - 250, scale->window_height / 4, 500, 25}, + GuiSliderBar((Rectangle) {scale->button_x - scale->button_width / 1.45, + GetScreenHeight() - (GetScreenHeight() / 1.3), scale->button_width * 2.5, + scale->button_height / 1.5}, GuiIconText(ICON_AUDIO, "Volume "), TextFormat("%d %%", (int32_t) (config->volume * 100)), &config->volume, 0, 1); @@ -210,10 +212,10 @@ int32_t options_window(options_config *config, ui_scale *scale) { DrawText("Color Theme", GetScreenWidth() / 2 - (scale->font_size * 2) - 50, (GetScreenHeight() / 12), scale->font_size, RAYWHITE); - DrawText("Background Color:", 115, 175 - 40, 20, WHITE); + DrawText("Background Color:", 115, 175 - 40, scale->font_size / 1.5, WHITE); GuiColorPicker((Rectangle) {100, 175, 200, 200}, "BG Color", &config->background_color); - DrawText("Pixel Color:", 645, 175 - 40, 20, WHITE); + DrawText("Pixel Color:", 645, 175 - 40, scale->font_size / 1.5, WHITE); GuiColorPicker((Rectangle) {600, 175, 200, 200}, "FG Color", &config->pixel_color); if (GuiButton((Rectangle) {scale->button_x, GetScreenHeight() - (GetScreenHeight() / 8),