mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 05:19:36 +00:00
Code Issues Projects Releases Wiki Activity

use a better variable name

Browse source
This commit is contained in:
dark-samus 2020-03-23 20:01:52 -04:00
parent 94e4c2b91f
commit 4bbbdc39fd
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/code/fault_drawer.c
View file

@ -97,15 +97,14 @@ void FaultDrawer_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 col
void FaultDrawer_DrawChar(char c) { void FaultDrawer_DrawChar(char c) {
u16* fb; u16* fb;
s32 x, y; s32 x, y;
s32 test;
u32* dataPtr; u32* dataPtr;
u32 data; u32 data;
s32 cursorX = sFaultDrawerStruct.cursorX; s32 cursorX = sFaultDrawerStruct.cursorX;
s32 cursorY = sFaultDrawerStruct.cursorY; s32 cursorY = sFaultDrawerStruct.cursorY;
u32** temp = &sFaultDrawerStruct.fontData; u32** fontData = &sFaultDrawerStruct.fontData;
s32 shift = c % 4;
test = c % 4; dataPtr = &fontData[0][(((c / 8) * 16) + ((c & 4) >> 2))];
dataPtr = &temp[0][(((c / 8) * 16) + ((c & 4) >> 2))];
fb = sFaultDrawerStruct.fb + (sFaultDrawerStruct.w * cursorY) + cursorX; fb = sFaultDrawerStruct.fb + (sFaultDrawerStruct.w * cursorY) + cursorX;
if ((sFaultDrawerStruct.xStart <= cursorX) && if ((sFaultDrawerStruct.xStart <= cursorX) &&
@ -113,7 +112,7 @@ void FaultDrawer_DrawChar(char c) {
(sFaultDrawerStruct.yStart <= cursorY) && (sFaultDrawerStruct.yStart <= cursorY) &&
((sFaultDrawerStruct.charH + cursorY - 1) <= sFaultDrawerStruct.yEnd)) { ((sFaultDrawerStruct.charH + cursorY - 1) <= sFaultDrawerStruct.yEnd)) {
for (y = 0; y < sFaultDrawerStruct.charH; y++) { for (y = 0; y < sFaultDrawerStruct.charH; y++) {
u32 mask = 0x10000000 << test; u32 mask = 0x10000000 << shift;
data = *dataPtr; data = *dataPtr;
for (x = 0; x < sFaultDrawerStruct.charW; x++) { for (x = 0; x < sFaultDrawerStruct.charW; x++) {
if (mask & data) { if (mask & data) {