evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add base variables for warping cinematics

Browse Source 
I literally only did this because I have an ultra-wide monitor and the letterboxing bothered me
This commit is contained in:
Kae 2023-06-29 00:13:43 +10:00
parent e809aad072
commit 9486a56508
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/opensb/client.config.patch Normal file
View File

@ -0,0 +1,11 @@
{
// Disables scissoring and letterboxing on vanilla and modded warp cinematics
"warpCinematicBase" : {
"scissor" : false,
"letterbox" : false
},
"deployCinematicBase" : {
"scissor" : false,
"letterbox" : false
}
}

15
source/game/StarUniverseClient.cpp
View File

@ -183,13 +183,14 @@ void UniverseClient::update() {
m_warpDelay.reset(); m_warpDelay.reset();
if (m_warping) { if (m_warping) {
m_warpCinemaCancelTimer = GameTimer(assets->json("/client.config:playerWarpCinemaMinimumTime").toFloat()); m_warpCinemaCancelTimer = GameTimer(assets->json("/client.config:playerWarpCinemaMinimumTime").toFloat());
String cinematic;
if (m_mainPlayer->isDeploying()) bool isDeploying = m_mainPlayer->isDeploying();
cinematic = assets->json("/client.config:deployCinematic").toString(); String cinematicJsonPath = isDeploying ? "/client.config:deployCinematic" : "/client.config:warpCinematic";
else String cinematicAssetPath = assets->json(cinematicJsonPath).toString()
cinematic = assets->json("/client.config:warpCinematic").toString(); .replaceTags(StringMap<String>{{"species", m_mainPlayer->species()}});
cinematic = cinematic.replaceTags(StringMap<String>{{"species", m_mainPlayer->species()}});
m_mainPlayer->setPendingCinematic(Json(move(cinematic))); Json cinematic = jsonMerge(assets->json(cinematicJsonPath + "Base"), assets->json(cinematicAssetPath));
m_mainPlayer->setPendingCinematic(cinematic);
} }
} }
} }