mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-09 21:00:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't use shared pointers for the CS helpers (#6685)

Browse Source
This commit is contained in:
louist103
2026-06-06 20:51:47 -04:00
committed by GitHub
parent 8bc72638c3
commit dd2e952cf5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/resource/importer/CutsceneFactory.cpp
+6 -5
View File
@@ -2,14 +2,14 @@
#include "soh/resource/type/Cutscene.h"
#include "spdlog/spdlog.h"
static inline uint32_t read_CMD_BBBB(std::shared_ptr<Ship::BinaryReader> reader) {
static uint32_t read_CMD_BBBB(Ship::BinaryReader* reader) {
uint32_t v;
reader->Read((char*)&v, sizeof(uint32_t));
return v;
}
static inline uint32_t read_CMD_BBH(std::shared_ptr<Ship::BinaryReader> reader) {
static uint32_t read_CMD_BBH(Ship::BinaryReader* reader) {
uint32_t v;
reader->Read((char*)&v, sizeof(uint32_t));
@@ -24,7 +24,7 @@ static inline uint32_t read_CMD_BBH(std::shared_ptr<Ship::BinaryReader> reader)
return v;
}
static inline uint32_t read_CMD_HBB(std::shared_ptr<Ship::BinaryReader> reader) {
static uint32_t read_CMD_HBB(Ship::BinaryReader* reader) {
uint32_t v;
reader->Read((char*)&v, sizeof(uint32_t));
@@ -39,7 +39,7 @@ static inline uint32_t read_CMD_HBB(std::shared_ptr<Ship::BinaryReader> reader)
return v;
}
static inline uint32_t read_CMD_HH(std::shared_ptr<Ship::BinaryReader> reader) {
static uint32_t read_CMD_HH(Ship::BinaryReader* reader) {
uint32_t v;
reader->Read((char*)&v, sizeof(uint32_t));
@@ -66,7 +66,8 @@ ResourceFactoryBinaryCutsceneV0::ReadResource(std::shared_ptr<Ship::File> file,
}
auto cutscene = std::make_shared<Cutscene>(initData);
auto reader = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
const auto readerShared = std::get<std::shared_ptr<Ship::BinaryReader>>(file->Reader);
const auto reader = readerShared.get();
uint32_t numEntries = reader->ReadUInt32();
cutscene->commands.reserve(numEntries);
soh/soh/resource/type/Cutscene.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include <vector>
#include <string>
#include <ship/resource/Resource.h>
namespace SOH {