PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match CGameOptions::SetScreenBrightness

This commit is contained in:
Luke Street 2022-10-31 14:59:13 -04:00
parent fb422bead3
commit 4fc17cf0f5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/MetroidPrime/Player/CGameOptions.hpp
View File

@ -7,11 +7,10 @@
#include "rstl/reserved_vector.hpp" #include "rstl/reserved_vector.hpp"
#include "rstl/vector.hpp" #include "rstl/vector.hpp"
#include "Kyoto/SObjectTag.hpp"
#include "Kyoto/Audio/CAudioSys.hpp" #include "Kyoto/Audio/CAudioSys.hpp"
#include "Kyoto/SObjectTag.hpp"
#include "MetroidPrime/TGameTypes.hpp" #include "MetroidPrime/TGameTypes.hpp"
class CInputStream; class CInputStream;
class CMemoryStreamOut; class CMemoryStreamOut;
@ -62,7 +61,7 @@ private:
bool x68_24_hudLag : 1; bool x68_24_hudLag : 1;
bool x68_25_invertY : 1; bool x68_25_invertY : 1;
bool x68_26_rumble : 1; bool x68_26_rumble : 1;
uchar x68_27_swapBeamsControls : 1; bool x68_27_swapBeamsControls : 1;
bool x68_28_hintSystem : 1; bool x68_28_hintSystem : 1;
rstl::vector< rstl::pair< CAssetId, CAssetId > > x6c_controlTxtrMap; rstl::vector< rstl::pair< CAssetId, CAssetId > > x6c_controlTxtrMap;
}; };

3
src/MetroidPrime/Player/CGameOptions.cpp
View File

@ -125,7 +125,6 @@ void CGameOptions::PutTo(CMemoryStreamOut& out) {
WriteValue(out, x5c_musicVol, 0x7f); WriteValue(out, x5c_musicVol, 0x7f);
WriteValue(out, x60_hudAlpha, 0xff); WriteValue(out, x60_hudAlpha, 0xff);
WriteValue(out, x64_helmetAlpha, 0xff); WriteValue(out, x64_helmetAlpha, 0xff);
out.WriteBits(x68_24_hudLag != false, 1); out.WriteBits(x68_24_hudLag != false, 1);
out.WriteBits(x68_28_hintSystem != false, 1); out.WriteBits(x68_28_hintSystem != false, 1);
@ -178,7 +177,7 @@ void CGameOptions::SetScreenBrightness(int value, bool apply) {
float CGameOptions::TuneScreenBrightness() { float CGameOptions::TuneScreenBrightness() {
float f = x48_screenBrightness - 4; float f = x48_screenBrightness - 4;
return f * 0.25f * 0.375f + 1.f; return f / 4.f * 0.375f + 1.f;
} }
void CGameOptions::SetScreenPositionX(int position, bool apply) { void CGameOptions::SetScreenPositionX(int position, bool apply) {