mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-21 21:40:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

clean up and format code

Browse Source
This commit is contained in:
SwareJonge
2025-06-17 23:46:35 +02:00
parent c5e5f47880
commit c545a42c15
93 changed files with 7033 additions and 7909 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/static/JSystem/JSupport/JSUFileStream.cpp
+35 -37
View File
@@ -1,55 +1,53 @@
#include "JSystem/JSupport/JSUStream.h"
JSUFileInputStream::JSUFileInputStream(JKRFile* file)
: mObject(file), mPosition(0) {}
JSUFileInputStream::JSUFileInputStream(JKRFile* file) : mObject(file), mPosition(0) {
}
int JSUFileInputStream::readData(void* buf, s32 len) {
int read = 0;
int read = 0;
if (((JKRFile*)this->mObject)->isAvailable()) {
/* Check if need to clamp length to EOF */
if ((u32)(this->mPosition + len) >
((JKRFile*)this->mObject)->getFileSize()) {
len = ((JKRFile*)this->mObject)->getFileSize() - this->mPosition;
if (((JKRFile*)this->mObject)->isAvailable()) {
/* Check if need to clamp length to EOF */
if ((u32)(this->mPosition + len) > ((JKRFile*)this->mObject)->getFileSize()) {
len = ((JKRFile*)this->mObject)->getFileSize() - this->mPosition;
}
if (len > 0) {
read = ((JKRFile*)this->mObject)->readData(buf, len, this->mPosition);
this->mPosition += read;
}
}
if (len > 0) {
read = ((JKRFile*)this->mObject)->readData(buf, len, this->mPosition);
this->mPosition += read;
}
}
return read;
return read;
}
int JSUFileInputStream::seekPos(s32 offset, JSUStreamSeekFrom from) {
int pos = this->mPosition;
int pos = this->mPosition;
switch (from) {
case SEEK_SET:
this->mPosition = offset;
break;
switch (from) {
case SEEK_SET:
this->mPosition = offset;
break;
case SEEK_END:
this->mPosition = ((JKRFile*)this->mObject)->getFileSize() - offset;
break;
case SEEK_END:
this->mPosition = ((JKRFile*)this->mObject)->getFileSize() - offset;
break;
case SEEK_CUR:
this->mPosition = pos + offset;
break;
}
case SEEK_CUR:
this->mPosition = pos + offset;
break;
}
if (this->mPosition < 0) {
this->mPosition = 0;
}
if (this->mPosition < 0) {
this->mPosition = 0;
}
if (this->mPosition > (s32)((JKRFile*)this->mObject)->getFileSize()) {
this->mPosition = ((JKRFile*)this->mObject)->getFileSize();
}
if (this->mPosition > (s32)((JKRFile*)this->mObject)->getFileSize()) {
this->mPosition = ((JKRFile*)this->mObject)->getFileSize();
}
return this->mPosition - pos;
return this->mPosition - pos;
}
JSUFileOutputStream::JSUFileOutputStream(JKRFile *file) {
}
JSUFileOutputStream::JSUFileOutputStream(JKRFile* file) {
}
src/static/JSystem/JSupport/JSUInputStream.cpp
+75 -75
View File
@@ -1,120 +1,120 @@
#include "JSystem/JSupport/JSUStream.h"
JSUInputStream::~JSUInputStream() { }
JSUInputStream::~JSUInputStream() {
}
int JSUInputStream::read(void* buf, s32 size) {
int len = this->readData(buf, size);
if (len != size) {
this->setState(EOF);
}
return len;
int len = this->readData(buf, size);
if (len != size) {
this->setState(EOF);
}
return len;
}
char* JSUInputStream::read(char* str) {
u16 size;
int len = this->readData(&size, sizeof(size));
if (len != sizeof(size)) {
str[0] = '\0';
this->setState(EOF);
str = nullptr;
}
else {
int strRead = this->readData(str, size);
str[strRead] = '\0';
if (strRead != size) {
this->setState(EOF);
u16 size;
int len = this->readData(&size, sizeof(size));
if (len != sizeof(size)) {
str[0] = '\0';
this->setState(EOF);
str = nullptr;
} else {
int strRead = this->readData(str, size);
str[strRead] = '\0';
if (strRead != size) {
this->setState(EOF);
}
}
}
return str;
return str;
}
/* @fabricated -- this method is confirmed to exist, but goes unused in AC */
char* JSUInputStream::readString() {
u16 len;
int r = this->readData(&len, sizeof(len));
if (r != sizeof(len)) {
this->setState(EOF);
return nullptr;
}
u16 len;
int r = this->readData(&len, sizeof(len));
if (r != sizeof(len)) {
this->setState(EOF);
return nullptr;
}
char* buf = new char[len+1];
r = this->readData(buf, len);
if (r != len) {
delete[] buf;
this->setState(EOF);
return nullptr;
}
char* buf = new char[len + 1];
r = this->readData(buf, len);
if (r != len) {
delete[] buf;
this->setState(EOF);
return nullptr;
}
buf[len] = '\0';
return buf;
buf[len] = '\0';
return buf;
}
/* @fabricated -- this method is confirmed to exist, but goes unused in AC */
char* JSUInputStream::readString(char* buf, u16 len) {
int r = this->readData(buf, len);
if (r != len) {
this->setState(EOF);
return nullptr;
}
int r = this->readData(buf, len);
if (r != len) {
this->setState(EOF);
return nullptr;
}
buf[len] = '\0';
return buf;
buf[len] = '\0';
return buf;
}
int JSUInputStream::skip(s32 amount) {
u8 _p;
int i;
u8 _p;
int i;
for (i = 0; i < amount; i++) {
if (this->readData(&_p, sizeof(_p)) != sizeof(_p)) {
this->setState(EOF);
break;
for (i = 0; i < amount; i++) {
if (this->readData(&_p, sizeof(_p)) != sizeof(_p)) {
this->setState(EOF);
break;
}
}
}
return i;
return i;
}
/* JSURandomInputStream */
int JSURandomInputStream::skip(s32 amount) {
int s = this->seekPos(amount, SEEK_CUR);
if (s != amount) {
this->setState(EOF);
}
return s;
int s = this->seekPos(amount, SEEK_CUR);
if (s != amount) {
this->setState(EOF);
}
return s;
}
/* This method is confirmed to exist, but goes unused in AC. Retrieved from TP debug. */
int JSURandomInputStream::align(s32 alignment) {
int pos = this->getPosition();
int aligned = ((alignment-1) + pos) & ~(alignment-1);
int change = aligned - pos;
int pos = this->getPosition();
int aligned = ((alignment - 1) + pos) & ~(alignment - 1);
int change = aligned - pos;
if (change != 0) {
int s = this->seekPos(aligned, SEEK_SET);
if (s != change) {
this->setState(EOF);
if (change != 0) {
int s = this->seekPos(aligned, SEEK_SET);
if (s != change) {
this->setState(EOF);
}
}
}
return change;
return change;
}
/* This method is confirmed to exist, but goes unused in AC. Retrieved from TP debug. */
int JSURandomInputStream::peek(void* buf, s32 len) {
int pos = this->getPosition();
int r = this->read(buf, len);
if (r != 0) {
this->seekPos(pos, SEEK_SET);
}
int pos = this->getPosition();
int r = this->read(buf, len);
if (r != 0) {
this->seekPos(pos, SEEK_SET);
}
return r;
}
return r;
}
int JSURandomInputStream::seek(s32 offset, JSUStreamSeekFrom from) {
int s = this->seekPos(offset, from);
this->clrState(EOF);
return s;
int s = this->seekPos(offset, from);
this->clrState(EOF);
return s;
}
src/static/JSystem/JSupport/JSUList.cpp
+16 -24
View File
@@ -1,6 +1,6 @@
#include "JSystem/JSupport/JSUList.h"
JSUPtrLink::JSUPtrLink(void *pData) {
JSUPtrLink::JSUPtrLink(void* pData) {
mPtrList = 0;
mData = pData;
mPrev = 0;
@@ -34,7 +34,7 @@ void JSUPtrList::initiate() {
mLinkCount = 0;
}
void JSUPtrList::setFirst(JSUPtrLink *pLink) {
void JSUPtrList::setFirst(JSUPtrLink* pLink) {
pLink->mPtrList = this;
pLink->mPrev = 0;
pLink->mNext = 0;
@@ -43,7 +43,7 @@ void JSUPtrList::setFirst(JSUPtrLink *pLink) {
mLinkCount = 1;
}
bool JSUPtrList::append(JSUPtrLink *pLink) {
bool JSUPtrList::append(JSUPtrLink* pLink) {
bool validity = (pLink->mPtrList == 0);
if (!validity) {
@@ -53,8 +53,7 @@ bool JSUPtrList::append(JSUPtrLink *pLink) {
if (validity) {
if (!mLinkCount) {
setFirst(pLink);
}
else {
} else {
pLink->mPtrList = this;
pLink->mPrev = mTail;
pLink->mNext = 0;
@@ -67,7 +66,7 @@ bool JSUPtrList::append(JSUPtrLink *pLink) {
return validity;
}
bool JSUPtrList::prepend(JSUPtrLink *pLink) {
bool JSUPtrList::prepend(JSUPtrLink* pLink) {
bool validity = (pLink->mPtrList == 0);
if (!validity) {
@@ -77,8 +76,7 @@ bool JSUPtrList::prepend(JSUPtrLink *pLink) {
if (validity) {
if (!mLinkCount) {
setFirst(pLink);
}
else {
} else {
pLink->mPtrList = this;
pLink->mPrev = 0;
pLink->mNext = mHead;
@@ -91,7 +89,7 @@ bool JSUPtrList::prepend(JSUPtrLink *pLink) {
return validity;
}
bool JSUPtrList::insert(JSUPtrLink *pLink_1, JSUPtrLink *pLink_2) {
bool JSUPtrList::insert(JSUPtrLink* pLink_1, JSUPtrLink* pLink_2) {
if (pLink_1 == mHead) {
return prepend(pLink_2);
}
@@ -123,23 +121,20 @@ bool JSUPtrList::insert(JSUPtrLink *pLink_1, JSUPtrLink *pLink_2) {
return validity;
}
bool JSUPtrList::remove(JSUPtrLink *pLink) {
bool JSUPtrList::remove(JSUPtrLink* pLink) {
bool isSameList = (pLink->mPtrList == this);
if (isSameList) {
if (mLinkCount == 1) {
mHead = 0;
mTail = 0;
}
else if (pLink == mHead) {
} else if (pLink == mHead) {
pLink->mNext->mPrev = 0;
mHead = pLink->mNext;
}
else if (pLink == mTail) {
} else if (pLink == mTail) {
pLink->mPrev->mNext = 0;
mTail = pLink->mPrev;
}
else {
} else {
pLink->mPrev->mNext = pLink->mNext;
pLink->mNext->mPrev = pLink->mPrev;
}
@@ -151,16 +146,13 @@ bool JSUPtrList::remove(JSUPtrLink *pLink) {
return isSameList;
}
JSUPtrLink *JSUPtrList::getNthLink(u32 n) const
{
if (n >= mLinkCount)
{
JSUPtrLink* JSUPtrList::getNthLink(u32 n) const {
if (n >= mLinkCount) {
return nullptr;
}
JSUPtrLink *curHead = mHead;
for (int i = 0; i < n; i++)
{
JSUPtrLink* curHead = mHead;
for (int i = 0; i < n; i++) {
curHead = curHead->mNext;
}
return curHead;
}
}