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

msg inline fixes, remove some fake jsystem inlines

Browse Source
This commit is contained in:
LagoLunatic
2026-08-07 16:40:56 -04:00
parent 5e00819c5b
commit 07b55421f9
15 changed files with 95 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JUtility/JUTResFont.cpp
+12 -10
View File
@@ -110,9 +110,9 @@ void JUTResFont::countBlock() {
mGlyphBlockNum = 0;
mMapBlockNum = 0;
const JUTDataBlockHeader* header = (JUTDataBlockHeader*)mResFont->data;
for (u32 i = 0; i < mResFont->numBlocks; i++, header = header->getNext()) {
switch (header->mType) {
const JUTDataBlockHeader* block = (JUTDataBlockHeader*)mResFont->data;
for (u32 i = 0; i < mResFont->numBlocks; i++) {
switch (block->mType) {
case 'WID1':
mWidthBlockNum++;
break;
@@ -127,6 +127,7 @@ void JUTResFont::countBlock() {
default:
JUTReportConsole("JUTResFont: Unknown data block\n");
}
block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
}
}
@@ -137,26 +138,26 @@ void JUTResFont::setBlock() {
int mapNum = 0;
mMaxCode = -1;
const JUTDataBlockHeader* header = (JUTDataBlockHeader*)mResFont->data;
for (u32 i = 0; i < mResFont->numBlocks; i++, header = header->getNext()) {
switch (header->mType) {
const JUTDataBlockHeader* block = (JUTDataBlockHeader*)mResFont->data;
for (u32 i = 0; i < mResFont->numBlocks; i++) {
switch (block->mType) {
case 'INF1': {
mInfoBlock = (ResFONT::INF1*)header;
mInfoBlock = (ResFONT::INF1*)block;
u32 u = mInfoBlock->fontType;
JUT_ASSERT(0xF3, u < suAboutEncoding_)
mIsLeadByte = (IsLeadByte_func*)&saoAboutEncoding_[u];
break;
}
case 'WID1':
mpWidthBlocks[widthNum] = (ResFONT::WID1*)header;
mpWidthBlocks[widthNum] = (ResFONT::WID1*)block;
widthNum++;
break;
case 'GLY1':
mpGlyphBlocks[glyphNum] = (ResFONT::GLY1*)header;
mpGlyphBlocks[glyphNum] = (ResFONT::GLY1*)block;
glyphNum++;
break;
case 'MAP1':
mpMapBlocks[mapNum] = (ResFONT::MAP1*)header;
mpMapBlocks[mapNum] = (ResFONT::MAP1*)block;
if (mMaxCode > mpMapBlocks[mapNum]->startCode) {
mMaxCode = mpMapBlocks[mapNum]->startCode;
}
@@ -166,6 +167,7 @@ void JUTResFont::setBlock() {
JUTReportConsole("Unknown data block\n");
break;
}
block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
}
}