github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 13:23:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes magic numbers

Browse source
This commit is contained in:
Ada 2022-04-15 13:56:24 +01:00
commit ba13de9d83
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
soh/src/code/z_message_PAL.c
View file

@ -37,7 +37,9 @@ MessageTableEntry* sStaffMessageEntryTablePtr;
char* _message_0xFFFC_nes; char* _message_0xFFFC_nes;
const int fastText = 5;
const int slowText = 1;
bool textSpeed = 1;
//MessageTableEntry sNesMessageEntryTable[] = { //MessageTableEntry sNesMessageEntryTable[] = {
//#define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) \ //#define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) \
@ -956,9 +958,10 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
} }
i = j - 1; i = j - 1;
if (CVar_GetS32("gFastText", 0) !=0) if (CVar_GetS32("gFastText", 0) !=0)
msgCtx->textDrawPos = i + 5; textSpeed = fastText;
else else
msgCtx->textDrawPos = i + 1; textSpeed = slowText;
msgCtx->textDrawPos = i + textSpeed;
if (character) {} if (character) {}
} }
@ -1152,9 +1155,10 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
} }
if (msgCtx->textDelayTimer == 0) { if (msgCtx->textDelayTimer == 0) {
if (CVar_GetS32("gFastText", 0) !=0) if (CVar_GetS32("gFastText", 0) !=0)
msgCtx->textDrawPos = i + 5; textSpeed = fastText;
else else
msgCtx->textDrawPos = i + 1; textSpeed = slowText;
msgCtx->textDrawPos = i + textSpeed;
msgCtx->textDelayTimer = msgCtx->textDelay; msgCtx->textDelayTimer = msgCtx->textDelay;
} else { } else {
msgCtx->textDelayTimer--; msgCtx->textDelayTimer--;