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

Merge branch 'master' into accurate

Browse source
This commit is contained in:
Clownacy 2019-08-29 00:01:36 +01:00
commit bbf2f197b5
2 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Ending.cpp
View file

@ -242,13 +242,23 @@ BOOL StartCreditScript()
return TRUE; return TRUE;
} }
// Get number from text (4 digit) // Update credits
int GetScriptNumber(const char *text) void ActionCredit()
{ {
return (text[0] - '0') * 1000 + if (Credit.offset >= Credit.size)
(text[1] - '0') * 100 + return;
(text[2] - '0') * 10 +
text[3] - '0'; // Update script, or if waiting, decrement the wait value
switch (Credit.mode)
{
case 1:
ActionCredit_Read();
break;
case 2:
if (--Credit.wait <= 0)
Credit.mode = 1;
}
} }
// Parse credits // Parse credits
@ -401,25 +411,16 @@ void ActionCredit_Read()
} }
} }
// Update credits // Get number from text (4 digit)
void ActionCredit() int GetScriptNumber(const char *text)
{ {
if (Credit.offset >= Credit.size) return (text[0] - '0') * 1000 +
return; (text[1] - '0') * 100 +
(text[2] - '0') * 10 +
// Update script, or if waiting, decrement the wait value text[3] - '0';
switch (Credit.mode)
{
case 1:
ActionCredit_Read();
break;
case 2:
if (--Credit.wait <= 0)
Credit.mode = 1;
}
} }
// Change illustration // Change illustration
void SetCreditIllust(int a) void SetCreditIllust(int a)
{ {

2
src/Ending.h
View file

@ -48,6 +48,8 @@ void InitCreditScript();
void ReleaseCreditScript(); void ReleaseCreditScript();
BOOL StartCreditScript(); BOOL StartCreditScript();
void ActionCredit(); void ActionCredit();
void ActionCredit_Read();
int GetScriptNumber(const char *text);
void SetCreditIllust(int a); void SetCreditIllust(int a);
void CutCreditIllust(); void CutCreditIllust();
int Scene_DownIsland(HWND hWnd, int mode); int Scene_DownIsland(HWND hWnd, int mode);