From 3f9bb33177f93853b9b96c1c51f4097a795b1706 Mon Sep 17 00:00:00 2001 From: h4570 Date: Sun, 28 Aug 2022 17:11:12 +0200 Subject: [PATCH] rename game setting --- demo/inc/game_settings.hpp | 2 +- demo/src/main.cpp | 2 +- demo/src/states/game/enemy/enemy_manager.cpp | 2 +- demo/src/states/game/game_state.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/inc/game_settings.hpp b/demo/inc/game_settings.hpp index 48f8ac0..8ba0da2 100644 --- a/demo/inc/game_settings.hpp +++ b/demo/inc/game_settings.hpp @@ -12,6 +12,6 @@ namespace Demo { -const bool IS_REAL_PS2 = false; +const bool IS_REAL_PS2_VIA_USB = false; } // namespace Demo diff --git a/demo/src/main.cpp b/demo/src/main.cpp index 08cc626..7ba6521 100644 --- a/demo/src/main.cpp +++ b/demo/src/main.cpp @@ -15,7 +15,7 @@ int main() { Tyra::EngineOptions options; - if (Demo::IS_REAL_PS2) { + if (Demo::IS_REAL_PS2_VIA_USB) { options.writeLogsToFile = true; options.loadUsbDriver = true; } diff --git a/demo/src/states/game/enemy/enemy_manager.cpp b/demo/src/states/game/enemy/enemy_manager.cpp index 62f30a7..7701bea 100644 --- a/demo/src/states/game/enemy/enemy_manager.cpp +++ b/demo/src/states/game/enemy/enemy_manager.cpp @@ -45,7 +45,7 @@ EnemyManager::EnemyManager(Engine* engine, const Heightmap& heightmap) { auto* death = engine->audio.adpcm.load( FileUtils::fromCwd("game/models/zombie/death.adpcm")); - const int enemyCount = IS_REAL_PS2 ? 8 : 12; + const int enemyCount = IS_REAL_PS2_VIA_USB ? 8 : 12; for (int i = 0; i < enemyCount; i++) { EnemyInfo info; info.adpcmChannel = 9 + i; diff --git a/demo/src/states/game/game_state.cpp b/demo/src/states/game/game_state.cpp index 75121e5..96ad214 100644 --- a/demo/src/states/game/game_state.cpp +++ b/demo/src/states/game/game_state.cpp @@ -45,7 +45,7 @@ void GameState::onStart() { engine->audio.song.setVolume(85); - if (IS_REAL_PS2) engine->renderer.setFrameLimit(false); + if (IS_REAL_PS2_VIA_USB) engine->renderer.setFrameLimit(false); initialized = true; }