From d1d8cf3bb612b095ce5cad40f9f5b85a78f51cb6 Mon Sep 17 00:00:00 2001 From: DepressedTWM Date: Tue, 4 Aug 2026 23:18:32 +0400 Subject: [PATCH] some changes --- assets/oneshot.desktop | 6 +++--- changelogs/0.1.2.txt | 7 ++++++- oneshot.conf | 4 ++++ src/config.cpp | 3 ++- src/config.h | 1 + src/main.cpp | 4 +++- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/assets/oneshot.desktop b/assets/oneshot.desktop index 5ff2485..307e640 100755 --- a/assets/oneshot.desktop +++ b/assets/oneshot.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Type=Application -Name=OneShot +Name=OneShot: Sunshine Exec=oneshot %F -Comment=A surreal puzzle adventure game with unique mechanics / capabilities. -Comment[ru]=Сюрреалистическая головоломка-приключение с уникальными механиками / возможностями. +Comment=Fan-made remake of Oneshot(2016) +Comment[ru]=Фанатский ремейк Oneshot(2016) Icon=oneshot Categories=Game; Terminal=false diff --git a/changelogs/0.1.2.txt b/changelogs/0.1.2.txt index bc5c907..8c20d26 100644 --- a/changelogs/0.1.2.txt +++ b/changelogs/0.1.2.txt @@ -28,4 +28,9 @@ fix crash on game exit Error handling updated added gamepad button icons in settings Removed MSVC support -Fixed issue #47 +Fixed bug #47 +Game now support FreeBSD +Fixed bug #46 +Added way to disable SecurityManager via oneshot.conf +Vsync code updated + diff --git a/oneshot.conf b/oneshot.conf index 38bbb04..ec60cfc 100644 --- a/oneshot.conf +++ b/oneshot.conf @@ -139,3 +139,7 @@ Modloader.use_default_save_path=false # Pancake episode specific tweaks pancakes=false + +# SecurityManager - component that uses OS security mechanisms to sandbox, +# recommended use when you play with mods. +SecurityEngine=true diff --git a/src/config.cpp b/src/config.cpp index 63897fb..1e4b2a8 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -93,7 +93,8 @@ void Config::read(int argc, char *argv[]){ PO_DESC(pathCache, bool, true) \ PO_DESC(Windows_AllocConsole, bool, false) \ PO_DESC(Modloader.use_default_save_path, bool, false) \ - PO_DESC(pancakes, bool, false) + PO_DESC(pancakes, bool, false) \ + PO_DESC(SecurityEngine, bool, true) // Not gonna take your shit boost #define GUARD_ALL( SDL_exp ) try { SDL_exp } catch(...) {} diff --git a/src/config.h b/src/config.h index e495791..9eb7935 100644 --- a/src/config.h +++ b/src/config.h @@ -55,6 +55,7 @@ struct Config{ //std::string AspectPresetRubyConst; bool allowSymlinks; bool pathCache; + bool SecurityEngine; std::string iconPath; diff --git a/src/main.cpp b/src/main.cpp index b7f7036..725a869 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -217,7 +217,6 @@ int main(int argc, char *argv[]){ #if dos __djgpp_nearptr_enable(); #endif - SecurityManagerInit(); startTime = boost::chrono::high_resolution_clock::now(); loadLanguageMetadata(); //there will be a segfault on fclose if I don't move it here SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0"); @@ -274,6 +273,9 @@ int main(int argc, char *argv[]){ /* now we load the config */ Config conf; conf.read(argc, argv); + if(conf.SecurityEngine){ + SecurityManagerInit(); + } #if windows if(conf.Windows_AllocConsole == true){ AllocConsole();