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

Merge pull request #23 from GabrielRavier/improveCToE

Browse source 
Improve files starting with C, D and E
This commit is contained in:
Clownacy 2019-05-07 17:18:19 +00:00 • committed by GitHub
commit c06b30c680
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 115 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Caret.cpp
View file

@ -469,8 +469,7 @@ void ActCaret17(CARET *crt)
}
// Tables
CARET_TABLE gCaretTable[18] =
{
CARET_TABLE gCaretTable[18] = {
{0, 0},
{0x800, 0x800},
{0x1000, 0x1000},

8
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
@ -568,10 +567,13 @@ void InitTextObject(const char *font_name)
fontHeight = 12;
}
else
{*/
{
fontWidth = 5 * magnification;
fontHeight = 10 * magnification;
}*/
fontWidth = 5 * magnification;
fontHeight = 10 * magnification;
// }
size_t data_size;
#ifdef WINDOWS

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();