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

Redid formatting for files starting with [C-E]

Browse source 
Also fixed potentially erroneous macro MAX_STRIP (would have problems with operation order in operations)

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-05-07 15:38:21 +02:00
parent 44edb7d26e
commit 7102e02fe2
6 changed files with 149 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/Caret.cpp
View file

@ -23,14 +23,16 @@ void ActCaret00(CARET *crt)
void ActCaret01(CARET *crt)
{
RECT rcLeft[4] = {
RECT rcLeft[4] =
{
{0, 64, 8, 72},
{8, 64, 16, 72},
{16, 64, 24, 72},
{24, 64, 32, 72},
};
RECT rcRight[4] = {
RECT rcRight[4] =
{
{64, 24, 72, 32},
{72, 24, 80, 32},
{80, 24, 88, 32},
@ -63,21 +65,24 @@ void ActCaret01(CARET *crt)
void ActCaret02(CARET *crt)
{
RECT rect_left[4] = {
RECT rect_left[4] =
{
{0, 32, 16, 48},
{16, 32, 32, 48},
{32, 32, 48, 48},
{48, 32, 64, 48},
};
RECT rect_right[4] = {
RECT rect_right[4] =
{
{176, 0, 192, 16},
{192, 0, 208, 16},
{208, 0, 224, 16},
{224, 0, 240, 16},
};
RECT rect_up[3] = {
RECT rect_up[3] =
{
{0, 32, 16, 48},
{32, 32, 48, 48},
{16, 32, 32, 48},
@ -126,7 +131,8 @@ void ActCaret02(CARET *crt)
void ActCaret03(CARET *crt)
{
RECT rect[4] = {
RECT rect[4] =
{
{0, 48, 16, 64},
{16, 48, 32, 64},
{32, 48, 48, 64},
@ -145,7 +151,8 @@ void ActCaret03(CARET *crt)
void ActCaret04(CARET *crt)
{
RECT rect[9] = {
RECT rect[9] =
{
{64, 32, 80, 48},
{80, 32, 96, 48},
{96, 32, 112, 48},
@ -170,7 +177,8 @@ void ActCaret04(CARET *crt)
void ActCaret05(CARET *crt)
{
RECT rect[7] = {
RECT rect[7] =
{
{32, 64, 40, 72},
{32, 72, 40, 80},
{40, 64, 48, 72},
@ -197,7 +205,8 @@ void ActCaret05(CARET *crt)
void ActCaret07(CARET *crt)
{
RECT rcLeft[7] = {
RECT rcLeft[7] =
{
{56, 0, 64, 8},
{64, 0, 72, 8},
{72, 0, 80, 8},
@ -264,12 +273,14 @@ void ActCaret09(CARET *crt)
void ActCaret10(CARET *crt)
{
RECT rcLeft[2] = {
RECT rcLeft[2] =
{
{0, 0, 56, 16},
{0, 16, 56, 32},
};
RECT rcRight[2] = {
RECT rcRight[2] =
{
{0, 96, 56, 112},
{0, 112, 56, 128},
};
@ -314,7 +325,8 @@ void ActCaret11(CARET *crt)
crt->x += crt->xm;
crt->y += crt->ym;
RECT rcRight[7] = {
RECT rcRight[7] =
{
{56, 8, 64, 16},
{64, 8, 72, 16},
{72, 8, 80, 16},
@ -336,7 +348,8 @@ void ActCaret11(CARET *crt)
void ActCaret12(CARET *crt)
{
RECT rcLeft[2] = {
RECT rcLeft[2] =
{
{112, 0, 144, 32},
{144, 0, 176, 32},
};
@ -353,7 +366,8 @@ void ActCaret12(CARET *crt)
void ActCaret13(CARET *crt)
{
RECT rcLeft[2] = {
RECT rcLeft[2] =
{
{56, 24, 64, 32},
{0, 0, 0, 0},
};
@ -397,7 +411,8 @@ void ActCaret13(CARET *crt)
void ActCaret14(CARET *crt)
{
RECT rect[5] = {
RECT rect[5] =
{
{0, 96, 40, 136},
{40, 96, 80, 136},
{80, 96, 120, 136},
@ -418,7 +433,8 @@ void ActCaret14(CARET *crt)
void ActCaret15(CARET *crt)
{
RECT rcLeft[4] = {
RECT rcLeft[4] =
{
{0, 72, 8, 80},
{8, 72, 16, 80},
{16, 72, 24, 80},
@ -438,7 +454,8 @@ void ActCaret15(CARET *crt)
void ActCaret16(CARET *crt)
{
RECT rcLeft[2] = {
RECT rcLeft[2] =
{
{104, 96, 144, 104},
{104, 104, 144, 112},
};
@ -454,7 +471,8 @@ void ActCaret16(CARET *crt)
void ActCaret17(CARET *crt)
{
RECT rcLeft[2] = {
RECT rcLeft[2] =
{
{0, 144, 144, 152},
{0, 0, 0, 0},
};

3
src/Draw.cpp
View file

@ -441,7 +441,6 @@ static void DrawBitmap(RECT *rcView, int x, int y, RECT *rect, Surface_Ids surf_
// Get SDL_Rects
SDL_Rect clipRect = RectToSDLRectScaled(rcView);
SDL_Rect frameRect = RectToSDLRectScaled(rect);
// Get dest rect
@ -569,8 +568,10 @@ void InitTextObject(const char *font_name)
}
else
{*/
fontWidth = 5 * magnification;
fontHeight = 10 * magnification;
// }
size_t data_size;

4
src/Ending.cpp
View file

@ -170,7 +170,7 @@ bool StartCreditScript()
if (Credit.size == -1)
return false;
//Allcoate buffer data
// Allocate buffer data
Credit.pData = (char*)malloc(Credit.size);
if (Credit.pData == NULL)
return false;
@ -276,7 +276,7 @@ void ActionCredit_Read()
{
if (Credit.pData[Credit.offset] == 'l')
{
//what is this
// What is this
a = GetScriptNumber(&Credit.pData[++Credit.offset]);
Credit.offset += 4;
if (b == a)

2
src/Ending.h
View file

@ -33,7 +33,7 @@ struct ISLAND_SPRITE
int y;
};
#define MAX_STRIP (WINDOW_HEIGHT / 16) + 1
#define MAX_STRIP ((WINDOW_HEIGHT / 16) + 1)
void ActionStripper();
void PutStripper();