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

Indented some comments

Browse source 
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-09-15 16:05:24 +02:00
parent 002e0f7760
commit 9e5e2a0e26
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/BossFrog.cpp
View file

@ -139,15 +139,15 @@ void ActBossChar_Frog(void)
// Rects 1-4 are for when Balfrog is a frog, 5-8 for when he reverts into Balrog and goes into the ceiling
RECT rcLeft[9] = {
{0, 0, 0, 0}, // Nothing
{0, 48, 80, 112}, // Balfrog standing still
{0, 112, 80, 176}, // Balfrog with his mouth barely open, crouching
{0, 176, 80, 240}, // Balfrog with his mouth open, crouching
{160, 48, 240, 112}, // Balfrog with his mouth open, crouching, flashing
{160, 112, 240, 200}, // Balfrog jumping
{200, 0, 240, 24}, // Balrog completely white
{80, 0, 120, 24}, // Balrog crouching
{120, 0, 160, 24}, // Balrog jumping
{0, 0, 0, 0}, // Nothing
{0, 48, 80, 112}, // Balfrog standing still
{0, 112, 80, 176}, // Balfrog with his mouth barely open, crouching
{0, 176, 80, 240}, // Balfrog with his mouth open, crouching
{160, 48, 240, 112}, // Balfrog with his mouth open, crouching, flashing
{160, 112, 240, 200}, // Balfrog jumping
{200, 0, 240, 24}, // Balrog completely white
{80, 0, 120, 24}, // Balrog crouching
{120, 0, 160, 24}, // Balrog jumping
};
// See above

8
src/CommonDefines.h
View file

@ -15,10 +15,10 @@
enum Collisions
{
COLL_LEFT_WALL = 1, // Touching a left wall
COLL_CEILING = 2, // Touching a ceiling
COLL_RIGHT_WALL = 4, // Touching a right wall
COLL_GROUND = 8, // Touching the ground
COLL_LEFT_WALL = 1, // Touching a left wall
COLL_CEILING = 2, // Touching a ceiling
COLL_RIGHT_WALL = 4, // Touching a right wall
COLL_GROUND = 8, // Touching the ground
// To be continued
};

12
src/NpChar.h
View file

@ -25,6 +25,12 @@
else \
npc->rect = rcRight[npc->ani_no]
enum NPCCond
{
NPCCOND_DAMAGE_BOSS = 0x10, // (gBoss npc exclusive) When set, damage the main boss
NPCCOND_ALIVE = 0x80 // Whether the NPC is alive or not
};
// Be careful when changing these: they're baked into the 'npc.tbl' file
enum NPCFlags
{
@ -45,12 +51,6 @@ enum NPCFlags
NPC_SHOW_DAMAGE = 1<<15 // Show the number of damage taken when harmed
};
enum NPCCond
{
NPCCOND_DAMAGE_BOSS = 0x10, // (gBoss npc exclusive) When set, damage the main boss
NPCCOND_ALIVE = 0x80 // Whether the NPC is alive or not
};
enum NPCNames
{
NPC_NULL = 0,