mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 13:13:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc minor cleanup (indentation, offset comments, etc)

Browse Source
This commit is contained in:
LagoLunatic
2023-12-19 21:29:37 -05:00
parent 1f8f630e2f
commit ec3f7f0198
53 changed files with 285 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J2DGraph/J2DWindow.cpp
+3 -3
View File
@@ -128,11 +128,11 @@ void J2DWindow::draw_private(const JGeometry::TBox2<f32>& frameBox, const JGeome
f32 bottom = 1.0f + mpFrameTexture1->getHeight();
u16 s0, s1, t0, t1;
drawFrameTexture(mpFrameTexture1, 0.0f, 0.0f,
drawFrameTexture(mpFrameTexture1, 0.0f, 0.0f,
(field_0x110 >> 7) & 1,
(field_0x110 >> 6) & 1, true);
drawFrameTexture(mpFrameTexture2, right, 0.0f,
(field_0x110 >> 5) & 1,
drawFrameTexture(mpFrameTexture2, right, 0.0f,
(field_0x110 >> 5) & 1,
(field_0x110 >> 4) & 1, (field_0x111 >> 0) & 1);
s0 = ((field_0x110 >> 5) & 1) ? (u16)0x8000 : (u16)0;
src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+3 -3
View File
@@ -60,7 +60,7 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) {
return false;
}
} else if (mEnd <= cur_frame) {
while (next_frame >= mEnd) {
while (next_frame >= mEnd) {
if (mEnd - mLoop <= 0.0f) {
break;
}
@@ -73,7 +73,7 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) {
return false;
}
} else if (next_frame < mStart) {
while (next_frame < mStart) {
while (next_frame < mStart) {
if (mLoop - mStart <= 0.0f) {
break;
}
@@ -86,7 +86,7 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) {
return false;
}
} else if (mEnd <= next_frame) {
while (next_frame >= mEnd) {
while (next_frame >= mEnd) {
if (mEnd - mLoop <= 0.0f) {
break;
}
src/JSystem/J3DGraphBase/J3DGD.cpp
+1 -1
View File
@@ -227,7 +227,7 @@ void J3DGDSetTexCoordGen(GXTexGenType type, GXTexGenSrc src) {
switch (src) {
case GX_TG_POS: row = 0; form = 1; break;
case GX_TG_NRM: row = 1; form = 1; break;
case GX_TG_NRM: row = 1; form = 1; break;
case GX_TG_BINRM: row = 3; form = 1; break;
case GX_TG_TANGENT: row = 4; form = 1; break;
case GX_TG_COLOR0: row = 2; break;
src/JSystem/JAudio/JASDriverIF.cpp
+5 -5
View File
@@ -19,11 +19,11 @@ void JASystem::Driver::init() {
u16 JASystem::Driver::MAX_MIXERLEVEL = 0x2ee0;
static void dummy() {
OSReport("JASDriverIF.cpp");
OSReport("(0.0 <= channel_level) && (channel_level <= 2.0)");
OSReport("Halt");
OSReport("(0.0 <= auto_level) && (auto_level <= 2.0)");
OSReport("(0.0 <= dsp_level) && (dsp_level <= 8.0)");
OSReport("JASDriverIF.cpp");
OSReport("(0.0 <= channel_level) && (channel_level <= 2.0)");
OSReport("Halt");
OSReport("(0.0 <= auto_level) && (auto_level <= 2.0)");
OSReport("(0.0 <= dsp_level) && (dsp_level <= 8.0)");
}
/* 8028A9A0-8028AAC4 .text setMixerLevel__Q28JASystem6DriverFff */
src/JSystem/JGadget/linklist.cpp
+3 -3
View File
@@ -9,9 +9,9 @@ namespace std {
template <class InputIterator, class Predicate>
inline InputIterator find_if(InputIterator first, InputIterator last, Predicate pred) {
while (first != last && !pred(*first))
++first;
return first;
while (first != last && !pred(*first))
++first;
return first;
}
} // namespace std
src/JSystem/JKernel/JKRMemArchive.cpp
+17 -17
View File
@@ -44,13 +44,13 @@ JKRMemArchive::~JKRMemArchive() {
/* 802B9700-802B9740 .text fixedInit__13JKRMemArchiveFl */
void JKRMemArchive::fixedInit(s32 param_1) {
mIsMounted = false;
mMountMode = 1;
mMountCount = 1;
field_0x58 = 2;
mHeap = JKRHeap::sCurrentHeap;
mEntryNum = param_1;
if (sCurrentVolume) return;
sCurrentVolume = this;
mMountMode = 1;
mMountCount = 1;
field_0x58 = 2;
mHeap = JKRHeap::sCurrentHeap;
mEntryNum = param_1;
if (sCurrentVolume) return;
sCurrentVolume = this;
setCurrentDirID(0);
}
@@ -59,30 +59,30 @@ bool JKRMemArchive::mountFixed(void* param_1, JKRMemBreakFlag param_2) {
if (check_mount_already((s32)param_1)) {
return false;
}
fixedInit((s32)param_1);
if (!open(param_1, 0xffff, param_2)) {
fixedInit((s32)param_1);
if (!open(param_1, 0xffff, param_2)) {
return false;
}
mVolumeType = 'RARC';
mVolumeType = 'RARC';
mVolumeName = mStringTable + mNodes->name_offset;
sVolumeList.prepend(&mFileLoaderLink);
sVolumeList.prepend(&mFileLoaderLink);
mIsOpen = param_2 == 1;
mIsMounted = true;
mIsMounted = true;
return true;
}
/* 802B9810-802B98FC .text unmountFixed__13JKRMemArchiveFv */
void JKRMemArchive::unmountFixed() {
JUT_ASSERT(337, isMounted());
JUT_ASSERT(340, mMountCount == 1);
if (sCurrentVolume == this) {
JUT_ASSERT(340, mMountCount == 1);
if (sCurrentVolume == this) {
sCurrentVolume = NULL;
}
if (mIsOpen && mArcHeader) {
if (mIsOpen && mArcHeader) {
JKRHeap::free(mArcHeader, mHeap);
}
sVolumeList.remove(&mFileLoaderLink);
mIsMounted = false;
sVolumeList.remove(&mFileLoaderLink);
mIsMounted = false;
}
/* 802B98FC-802B9A90 .text open__13JKRMemArchiveFlQ210JKRArchive15EMountDirection */
src/JSystem/JUtility/JUTGamePad.cpp
+11 -11
View File
@@ -520,15 +520,15 @@ bool JUTGamePad::recalibrate(u32 mask) {
}
static void dummy() {
OSReport("JUTGamePad.cpp");
OSReport("getDataSizePerFrame() > 0");
OSReport("Halt");
OSReport("mBuffer");
OSReport("(u32)mBuffer <= (u32)dataEnd && (u32)dataEnd <= (u32)mBufferEnd");
OSReport("part != 0");
OSReport("getBuffer() == getDataEnd() || part == mPart");
OSReport("JUTGamePad.h");
OSReport("size > 0");
OSReport("mBuffer && isValidData( mCurrent )");
OSReport("mBuffer && isValidBuffer( mCurrent )");
OSReport("JUTGamePad.cpp");
OSReport("getDataSizePerFrame() > 0");
OSReport("Halt");
OSReport("mBuffer");
OSReport("(u32)mBuffer <= (u32)dataEnd && (u32)dataEnd <= (u32)mBufferEnd");
OSReport("part != 0");
OSReport("getBuffer() == getDataEnd() || part == mPart");
OSReport("JUTGamePad.h");
OSReport("size > 0");
OSReport("mBuffer && isValidData( mCurrent )");
OSReport("mBuffer && isValidBuffer( mCurrent )");
}
src/JSystem/JUtility/JUTXfb.cpp
+3 -3
View File
@@ -109,7 +109,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber
}
static void dummy() {
OSReport("JX:: disp = %d\n");
OSReport("JX:: drawing %d -> ");
OSReport("%d\n");
OSReport("JX:: disp = %d\n");
OSReport("JX:: drawing %d -> ");
OSReport("%d\n");
}