This commit is contained in:
offtkp 2024-04-01 00:17:21 +03:00
parent d614fe93e2
commit 77ccc3b9bd
3 changed files with 11 additions and 5 deletions

View file

@ -179,7 +179,7 @@ void Emulator::pollScheduler() {
// Get path for saving files (AppData on Windows, /home/user/.local/share/ApplicationName on Linux, etc) // Get path for saving files (AppData on Windows, /home/user/.local/share/ApplicationName on Linux, etc)
// Inside that path, we be use a game-specific folder as well. Eg if we were loading a ROM called PenguinDemo.3ds, the savedata would be in // Inside that path, we be use a game-specific folder as well. Eg if we were loading a ROM called PenguinDemo.3ds, the savedata would be in
// %APPDATA%/Alber/PenguinDemo/SaveData on Windows, and so on. We do this because games save data in their own filesystem on the cart. // %APPDATA%/MAIDS/PenguinDemo/SaveData on Windows, and so on. We do this because games save data in their own filesystem on the cart.
// If the portable build setting is enabled, then those saves go in the executable directory instead // If the portable build setting is enabled, then those saves go in the executable directory instead
std::filesystem::path Emulator::getAppDataRoot() { std::filesystem::path Emulator::getAppDataRoot() {
std::filesystem::path appDataPath; std::filesystem::path appDataPath;
@ -189,7 +189,7 @@ std::filesystem::path Emulator::getAppDataRoot() {
#else #else
char* appData; char* appData;
if (!config.usePortableBuild) { if (!config.usePortableBuild) {
appData = SDL_GetPrefPath(nullptr, "Alber"); appData = SDL_GetPrefPath(nullptr, "MAIDS");
appDataPath = std::filesystem::path(appData); appDataPath = std::filesystem::path(appData);
} else { } else {
appData = SDL_GetBasePath(); appData = SDL_GetBasePath();
@ -232,6 +232,7 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
path.filename() == "browser.gb" || path.filename() == "browser.gb" ||
path.filename() == "browser.gba" || path.filename() == "browser.gba" ||
path.filename() == "browser.gbc" || path.filename() == "browser.gbc" ||
path.filename() == "browser.nds" ||
path.filename() == "browser.n64" || path.filename() == "browser.n64" ||
path.filename() == "browser.z64" || path.filename() == "browser.z64" ||
path.filename() == "browser.v64" || path.filename() == "browser.v64" ||
@ -291,7 +292,7 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
#endif #endif
} else { } else {
// Inform users of our new web browser support! // Inform users of our new web browser support!
system("echo 'Welcome to the Alber 3DS emulator! You can now browse the web with our new browser!'"); system("echo 'Welcome to the NOT ALBER, DRAGON MAID ! 3DS emulator! You can now browse the web with our new browser!'");
// Play a video that explains our new feature in great detail // Play a video that explains our new feature in great detail
system("start https://www.youtube.com/watch?v=ArCJ-9HJg0o"); system("start https://www.youtube.com/watch?v=ArCJ-9HJg0o");
@ -300,6 +301,10 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
Helpers::panic("You must try the browser at least once before you can play games!"); Helpers::panic("You must try the browser at least once before you can play games!");
} }
// PEACHY SAID ADD APPROPRIATE ICON AND TITLE
// idk how to add icon, let's display an image instead when loading hte mulator
system("start https://imgur.com/E9jsNBc");
// Reset the emulator if we've already loaded a ROM // Reset the emulator if we've already loaded a ROM
if (romType != ROMType::None) { if (romType != ROMType::None) {

View file

@ -11,7 +11,7 @@
#include "input_mappings.hpp" #include "input_mappings.hpp"
MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent), keyboardMappings(InputMappings::defaultKeyboardMappings()), screen(this) { MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent), keyboardMappings(InputMappings::defaultKeyboardMappings()), screen(this) {
setWindowTitle("Alber"); setWindowTitle("MAID");
// Enable drop events for loading ROMs // Enable drop events for loading ROMs
setAcceptDrops(true); setAcceptDrops(true);
resize(800, 240 * 4); resize(800, 240 * 4);

View file

@ -35,7 +35,8 @@ FrontendSDL::FrontendSDL() : keyboardMappings(InputMappings::defaultKeyboardMapp
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, config.rendererType == RendererType::Software ? 3 : 4); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, config.rendererType == RendererType::Software ? 3 : 4);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, config.rendererType == RendererType::Software ? 3 : 1); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, config.rendererType == RendererType::Software ? 3 : 1);
window = SDL_CreateWindow("Alber", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 400, 480, SDL_WINDOW_OPENGL); // hmmmm lkowwww resolutionnn lets implement 4k mode for maid3ds
window = SDL_CreateWindow("maids", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 3840, 2160, SDL_WINDOW_OPENGL);
if (window == nullptr) { if (window == nullptr) {
Helpers::panic("Window creation failed: %s", SDL_GetError()); Helpers::panic("Window creation failed: %s", SDL_GetError());