Skip to content

Commit 17fb613

Browse files
authored
Merge pull request #153 from TingleDinkle/master
style: Fix coding guideline violations
2 parents c3c4290 + 046ec81 commit 17fb613

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

src/KingSystem/Map/mapPlacementMap.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ PlacementMap::PlacementMap() {
2525
mCol = 0;
2626
mRow = 0;
2727
mNumRoutes = 0;
28-
mP18 = 0;
29-
mMgr = 0;
30-
mPa = 0;
28+
mP18 = nullptr;
29+
mMgr = nullptr;
30+
mPa = nullptr;
3131
mDynamicGroupIdx = 0xFFFFFFFF;
3232
mRes[0].mStatus = HkscRes::Status::_0;
3333
mRes[1].mStatus = HkscRes::Status::_0;

src/KingSystem/Quest/qstActorData.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ namespace ksys::qst {
55

66
CameraTarget::~CameraTarget() = default;
77

8-
ActorData::ActorData(sead::Heap* heap) {
9-
this->heap = heap;
10-
}
8+
ActorData::ActorData(sead::Heap* heap) : heap(heap) {}
119

1210
ActorData::~ActorData() {
1311
for (int i = 0; i < targets.size(); ++i) {

src/KingSystem/Quest/qstIndicator.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33

44
namespace ksys::qst {
55

6-
Indicator::Indicator(Step* step, sead::Heap* heap) {
7-
this->heap = heap;
8-
this->step = step;
9-
}
6+
Indicator::Indicator(Step* step, sead::Heap* heap) : heap(heap), step(step) {}
107

118
Indicator::~Indicator() {
129
finalize();

src/KingSystem/Utils/Byaml/Byaml.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ bool ByamlIter::getByamlDataByKey(ByamlData* data, const char* key) const {
145145

146146
auto* header = reinterpret_cast<const al::ByamlHeader*>(mData);
147147
const s32 offset = header->getHashKeyTableOffset();
148-
if (!offset) {
148+
if (offset == 0) {
149149
return false;
150150
}
151151
const ByamlStringTableIter table = ByamlStringTableIter(&mData[offset]);

src/KingSystem/Utils/Thread/Event.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ void Event::initialize(bool manual_reset) {
2323
}
2424

2525
void Event::wait() {
26-
if (!mSignalSet || !mManualReset)
26+
if (mSignalSet == 0 || !mManualReset)
2727
mEvent.wait();
2828
}
2929

3030
bool Event::wait(sead::TickSpan duration) {
31-
return (mSignalSet && mManualReset) || mEvent.wait(duration);
31+
return (mSignalSet != 0 && mManualReset) || mEvent.wait(duration);
3232
}
3333

3434
void Event::setSignal() {
@@ -40,7 +40,7 @@ void Event::setSignal() {
4040
}
4141

4242
void Event::resetSignal() {
43-
if (!mSignalSet && mManualReset)
43+
if (mSignalSet == 0 && mManualReset)
4444
return;
4545

4646
mEvent.resetSignal();

0 commit comments

Comments
 (0)