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

First pass at CPlayerState::PutTo

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-04 21:50:29 +03:00
parent 62c7e2688d
commit 4fcad1ada2
No known key found for this signature in database
GPG Key ID: E224F951761145F8
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/Kyoto/Streams/COutputStream.hpp Normal file
View File

@ -0,0 +1,11 @@
#ifndef _COUTPUTSTREAM_HPP
#define _COUTPUTSTREAM_HPP
#include "types.h"
class COutputStream {
public:
void WriteBits(int val, int bitCount);
};
#endif // _COUTPUTSTREAM_HPP

26
src/MetroidPrime/Player/CPlayerState.cpp
View File

@ -9,6 +9,7 @@
#include "Kyoto/Math/CMath.hpp" #include "Kyoto/Math/CMath.hpp"
#include "Kyoto/Streams/CInputStream.hpp" #include "Kyoto/Streams/CInputStream.hpp"
#include "Kyoto/Streams/COutputStream.hpp"
#include "rstl/math.hpp" #include "rstl/math.hpp"
@ -114,32 +115,29 @@ CPlayerState::CPlayerState(CInputStream& stream)
} }
void CPlayerState::PutTo(COutputStream& stream) { void CPlayerState::PutTo(COutputStream& stream) {
/*
stream.WriteBits(x4_enabledItems, 32); stream.WriteBits(x4_enabledItems, 32);
const float realHP = xc_health.GetHP(); const float realHP = xc_health.GetHP();
u32 integralHP; stream.WriteBits(*(int*)(&realHP), 32);
std::memcpy(&integralHP, &realHP, sizeof(u32)); stream.WriteBits(int(x8_currentBeam), GetBitCount(5));
stream.WriteBits(int(x20_currentSuit), GetBitCount(4));
stream.WriteBits(integralHP, 32);
stream.WriteBits(u32(x8_currentBeam), COutputStream::GetBitCount(5));
stream.WriteBits(u32(x20_currentSuit), COutputStream::GetBitCount(4));
for (size_t i = 0; i < x24_powerups.size(); ++i) { for (size_t i = 0; i < x24_powerups.size(); ++i) {
const CPowerUp& pup = x24_powerups[i]; const CPowerUp& pup = x24_powerups[i];
stream.WriteBits(pup.x0_amount, COutputStream::GetBitCount(PowerUpMaxValues[i])); stream.WriteBits(pup.x0_amount, GetBitCount(kPowerUpMax[i]));
stream.WriteBits(pup.x4_capacity, COutputStream::GetBitCount(PowerUpMaxValues[i])); stream.WriteBits(pup.x4_capacity, GetBitCount(kPowerUpMax[i]));
} }
for (const auto& scanTime : x170_scanTimes) { for (rstl::vector< rstl::pair< CAssetId, float > >::iterator it = x170_scanTimes.begin();
if (scanTime.second >= 1.f) it != x170_scanTimes.end(); ++it) {
if (it->second >= 1.f)
stream.WriteBits(true, 1); stream.WriteBits(true, 1);
else else
stream.WriteBits(false, 1); stream.WriteBits(false, 1);
} }
stream.WriteBits(x180_scanCompletionRate.first, COutputStream::GetBitCount(0x100)); stream.WriteBits(x180_scanCompletionRateFirst, GetBitCount(0x100));
stream.WriteBits(x180_scanCompletionRate.second, COutputStream::GetBitCount(0x100)); stream.WriteBits(x184_scanCompletionRateSecond, GetBitCount(0x100));
*/
} }
void CPlayerState::ReInitializePowerUp(CPlayerState::EItemType type, int capacity) { void CPlayerState::ReInitializePowerUp(CPlayerState::EItemType type, int capacity) {