Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2c833d086e | |||
| 91fe0625d3 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,4 +1,5 @@
|
|||||||
aee
|
aee
|
||||||
|
aee.exe
|
||||||
.DS_Store
|
.DS_Store
|
||||||
trick.ini
|
trick.ini
|
||||||
.vscode/
|
.vscode/
|
||||||
|
|||||||
2
Makefile
2
Makefile
@@ -112,7 +112,7 @@ _windows_release:
|
|||||||
@powershell -Command "Copy-Item 'README.md' -Destination '$(RELEASE_FOLDER)'"
|
@powershell -Command "Copy-Item 'README.md' -Destination '$(RELEASE_FOLDER)'"
|
||||||
@powershell -Command "Copy-Item 'gamecontrollerdb.txt' -Destination '$(RELEASE_FOLDER)'"
|
@powershell -Command "Copy-Item 'gamecontrollerdb.txt' -Destination '$(RELEASE_FOLDER)'"
|
||||||
@powershell -Command "Copy-Item 'release\windows\dll\*.dll' -Destination '$(RELEASE_FOLDER)'"
|
@powershell -Command "Copy-Item 'release\windows\dll\*.dll' -Destination '$(RELEASE_FOLDER)'"
|
||||||
@powershell -Command "Copy-Item -Path '$(TARGET_FILE)' -Destination '\"$(WIN_RELEASE_FILE).exe\"'"
|
@powershell -Command "Copy-Item -Path '$(TARGET_FILE).exe' -Destination '$(WIN_RELEASE_FILE).exe'"
|
||||||
strip -s -R .comment -R .gnu.version "$(WIN_RELEASE_FILE).exe" --strip-unneeded
|
strip -s -R .comment -R .gnu.version "$(WIN_RELEASE_FILE).exe" --strip-unneeded
|
||||||
|
|
||||||
# Crea el fichero .zip
|
# Crea el fichero .zip
|
||||||
|
|||||||
@@ -8,11 +8,15 @@ menu:
|
|||||||
video: "VIDEO"
|
video: "VIDEO"
|
||||||
audio: "AUDIO"
|
audio: "AUDIO"
|
||||||
controls: "CONTROLS"
|
controls: "CONTROLS"
|
||||||
|
game: "JOC"
|
||||||
|
|
||||||
items:
|
items:
|
||||||
video: "VIDEO"
|
video: "VIDEO"
|
||||||
audio: "AUDIO"
|
audio: "AUDIO"
|
||||||
controls: "CONTROLS"
|
controls: "CONTROLS"
|
||||||
|
game: "JOC"
|
||||||
|
use_new_logo: "LOGO NOU"
|
||||||
|
show_title_credits: "CREDITS DEL PORT"
|
||||||
zoom: "ZOOM"
|
zoom: "ZOOM"
|
||||||
screen: "PANTALLA"
|
screen: "PANTALLA"
|
||||||
shader: "SHADER"
|
shader: "SHADER"
|
||||||
|
|||||||
@@ -101,12 +101,14 @@ namespace Menu {
|
|||||||
static Page buildVideo();
|
static Page buildVideo();
|
||||||
static Page buildAudio();
|
static Page buildAudio();
|
||||||
static Page buildControls();
|
static Page buildControls();
|
||||||
|
static Page buildGame();
|
||||||
|
|
||||||
static Page buildRoot() {
|
static Page buildRoot() {
|
||||||
Page p{Locale::get("menu.titles.root"), {}, 0};
|
Page p{Locale::get("menu.titles.root"), {}, 0};
|
||||||
p.items.push_back({Locale::get("menu.items.video"), ItemKind::Submenu, nullptr, nullptr, [] { pushPage(buildVideo()); }, nullptr});
|
p.items.push_back({Locale::get("menu.items.video"), ItemKind::Submenu, nullptr, nullptr, [] { pushPage(buildVideo()); }, nullptr});
|
||||||
p.items.push_back({Locale::get("menu.items.audio"), ItemKind::Submenu, nullptr, nullptr, [] { pushPage(buildAudio()); }, nullptr});
|
p.items.push_back({Locale::get("menu.items.audio"), ItemKind::Submenu, nullptr, nullptr, [] { pushPage(buildAudio()); }, nullptr});
|
||||||
p.items.push_back({Locale::get("menu.items.controls"), ItemKind::Submenu, nullptr, nullptr, [] { pushPage(buildControls()); }, nullptr});
|
p.items.push_back({Locale::get("menu.items.controls"), ItemKind::Submenu, nullptr, nullptr, [] { pushPage(buildControls()); }, nullptr});
|
||||||
|
p.items.push_back({Locale::get("menu.items.game"), ItemKind::Submenu, nullptr, nullptr, [] { pushPage(buildGame()); }, nullptr});
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -207,6 +209,16 @@ namespace Menu {
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Page buildGame() {
|
||||||
|
Page p{Locale::get("menu.titles.game"), {}, 0};
|
||||||
|
|
||||||
|
p.items.push_back({Locale::get("menu.items.use_new_logo"), ItemKind::Toggle, [] { return yesNo(Options::game.use_new_logo); }, [](int) { Options::game.use_new_logo = !Options::game.use_new_logo; }, nullptr});
|
||||||
|
|
||||||
|
p.items.push_back({Locale::get("menu.items.show_title_credits"), ItemKind::Toggle, [] { return yesNo(Options::game.show_title_credits); }, [](int) { Options::game.show_title_credits = !Options::game.show_title_credits; }, nullptr});
|
||||||
|
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
// --- Dibuix ---
|
// --- Dibuix ---
|
||||||
|
|
||||||
// Alpha blending per pixel sobre el buffer ARGB (ABGR en memòria)
|
// Alpha blending per pixel sobre el buffer ARGB (ABGR en memòria)
|
||||||
|
|||||||
@@ -76,7 +76,9 @@ void Director::run() {
|
|||||||
// atòmica d'un int global: race benigna, tard d'1 frame en el pitjor cas.
|
// atòmica d'un int global: race benigna, tard d'1 frame en el pitjor cas.
|
||||||
static bool credits_triggered = false;
|
static bool credits_triggered = false;
|
||||||
if (!credits_triggered && info::num_piramide == 0) {
|
if (!credits_triggered && info::num_piramide == 0) {
|
||||||
|
if (Options::game.show_title_credits) {
|
||||||
Overlay::startCredits();
|
Overlay::startCredits();
|
||||||
|
}
|
||||||
credits_triggered = true;
|
credits_triggered = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -58,4 +58,5 @@ namespace Defaults::Game {
|
|||||||
constexpr int PIRAMIDE_INICIAL = 255;
|
constexpr int PIRAMIDE_INICIAL = 255;
|
||||||
constexpr int VIDES = 5;
|
constexpr int VIDES = 5;
|
||||||
constexpr bool USE_NEW_LOGO = true;
|
constexpr bool USE_NEW_LOGO = true;
|
||||||
|
constexpr bool SHOW_TITLE_CREDITS = true;
|
||||||
} // namespace Defaults::Game
|
} // namespace Defaults::Game
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// Textos
|
// Textos
|
||||||
namespace Texts {
|
namespace Texts {
|
||||||
constexpr const char* WINDOW_TITLE = "© 2000 Aventures en Egipte — JailDesigner";
|
constexpr const char* WINDOW_TITLE = "© 2000 Aventures en Egipte — JailDesigner";
|
||||||
constexpr const char* VERSION = "1.1";
|
constexpr const char* VERSION = "1.11";
|
||||||
} // namespace Texts
|
} // namespace Texts
|
||||||
|
|
||||||
// Resolución del juego
|
// Resolución del juego
|
||||||
|
|||||||
@@ -146,6 +146,8 @@ namespace Options {
|
|||||||
game.vides = node["vides"].get_value<int>();
|
game.vides = node["vides"].get_value<int>();
|
||||||
if (node.contains("use_new_logo"))
|
if (node.contains("use_new_logo"))
|
||||||
game.use_new_logo = node["use_new_logo"].get_value<bool>();
|
game.use_new_logo = node["use_new_logo"].get_value<bool>();
|
||||||
|
if (node.contains("show_title_credits"))
|
||||||
|
game.show_title_credits = node["show_title_credits"].get_value<bool>();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Carrega les opcions des del fitxer configurat
|
// Carrega les opcions des del fitxer configurat
|
||||||
@@ -277,6 +279,7 @@ namespace Options {
|
|||||||
file << " piramide_inicial: " << game.piramide_inicial << "\n";
|
file << " piramide_inicial: " << game.piramide_inicial << "\n";
|
||||||
file << " vides: " << game.vides << "\n";
|
file << " vides: " << game.vides << "\n";
|
||||||
file << " use_new_logo: " << (game.use_new_logo ? "true" : "false") << "\n";
|
file << " use_new_logo: " << (game.use_new_logo ? "true" : "false") << "\n";
|
||||||
|
file << " show_title_credits: " << (game.show_title_credits ? "true" : "false") << "\n";
|
||||||
file << "\n";
|
file << "\n";
|
||||||
|
|
||||||
// CONTROLS
|
// CONTROLS
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ namespace Options {
|
|||||||
int piramide_inicial{Defaults::Game::PIRAMIDE_INICIAL};
|
int piramide_inicial{Defaults::Game::PIRAMIDE_INICIAL};
|
||||||
int vides{Defaults::Game::VIDES};
|
int vides{Defaults::Game::VIDES};
|
||||||
bool use_new_logo{Defaults::Game::USE_NEW_LOGO};
|
bool use_new_logo{Defaults::Game::USE_NEW_LOGO};
|
||||||
|
bool show_title_credits{Defaults::Game::SHOW_TITLE_CREDITS};
|
||||||
};
|
};
|
||||||
|
|
||||||
// Preset PostFX
|
// Preset PostFX
|
||||||
|
|||||||
Reference in New Issue
Block a user