duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2019-10-14 22:17:20 +00:00
commit 13e5f446af
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/TextScr.cpp
View file

@ -41,7 +41,7 @@
TEXT_SCRIPT gTS; TEXT_SCRIPT gTS;
int gNumberTextScript[4]; // Seems to be for debugging int gNumberTextScript[4];
char text[0x100]; char text[0x100];
RECT gRect_line = {0, 0, 216, 16}; RECT gRect_line = {0, 0, 216, 16};
@ -643,10 +643,9 @@ int TextScriptProc()
w = GetTextScriptNo(gTS.p_read + 4); w = GetTextScriptNo(gTS.p_read + 4);
x = GetTextScriptNo(gTS.p_read + 9); x = GetTextScriptNo(gTS.p_read + 9);
// Looks like Pixel left some debug code in. Oops.
gNumberTextScript[0] = x; gNumberTextScript[0] = x;
#ifndef FIX_BUGS #ifndef FIX_BUGS
// z is uninitialised. Probably a leftover from copypasting. // z is uninitialised. Probably a leftover from copypasting this from elsewhere.
gNumberTextScript[1] = z; gNumberTextScript[1] = z;
#endif #endif
@ -1214,11 +1213,7 @@ int TextScriptProc()
} }
else if (IS_COMMAND('N','U','M')) else if (IS_COMMAND('N','U','M'))
{ {
// This seems to be a command used for debugging TSC scripts: // This supports up to four different values, but only one is actually used (a second is used erroneously)
// It prints a selected char in the gNumberTextScript array.
// gNumberTextScript is only used by the '<AM+' command, and
// even then, part of it's assigned to an uninitialised
// variable, while the other half of it is completely unused.
z = GetTextScriptNo(gTS.p_read + 4); z = GetTextScriptNo(gTS.p_read + 4);
SetNumberTextScript(z); SetNumberTextScript(z);
gTS.p_read += 8; gTS.p_read += 8;