stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 20:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Alam Ed Arias 2017-09-28 16:55:04 -04:00
commit 6c18d15b4a
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/m_menu.c
View file

@ -4625,7 +4625,7 @@ static void M_ReadSavegameInfo(UINT32 slot)
savegameinfo[slot].botskin = 0; savegameinfo[slot].botskin = 0;
if (savegameinfo[slot].botskin) if (savegameinfo[slot].botskin)
snprintf(savegameinfo[slot].playername, 32, "%s & %s", snprintf(savegameinfo[slot].playername, 36, "%s & %s",
skins[savegameinfo[slot].skinnum].realname, skins[savegameinfo[slot].skinnum].realname,
skins[savegameinfo[slot].botskin-1].realname); skins[savegameinfo[slot].botskin-1].realname);
else else

2
src/m_menu.h
View file

@ -190,7 +190,7 @@ typedef struct
// savegame struct for save game menu // savegame struct for save game menu
typedef struct typedef struct
{ {
char playername[32]; char playername[37];
char levelname[32]; char levelname[32];
UINT8 actnum; UINT8 actnum;
UINT8 skincolor; UINT8 skincolor;

2
src/p_enemy.c
View file

@ -4812,9 +4812,11 @@ void A_UnidusBall(mobj_t *actor)
case 0: // at least one frame where not dashing case 0: // at least one frame where not dashing
if (!skull) ++actor->extravalue2; if (!skull) ++actor->extravalue2;
else break; else break;
/* FALLTHRU */
case 1: // at least one frame where ARE dashing case 1: // at least one frame where ARE dashing
if (skull) ++actor->extravalue2; if (skull) ++actor->extravalue2;
else break; else break;
/* FALLTHRU */
case 2: // not dashing again? case 2: // not dashing again?
if (skull) break; if (skull) break;
// launch. // launch.

4
src/y_inter.c
View file

@ -57,7 +57,7 @@ typedef union
{ {
struct struct
{ {
char passed1[14]; // KNUCKLES GOT / CRAWLA HONCHO char passed1[21]; // KNUCKLES GOT / CRAWLA HONCHO
char passed2[16]; // THROUGH THE ACT / PASSED THE ACT char passed2[16]; // THROUGH THE ACT / PASSED THE ACT
INT32 passedx1; INT32 passedx1;
INT32 passedx2; INT32 passedx2;
@ -77,7 +77,7 @@ typedef union
struct struct
{ {
char passed1[SKINNAMESIZE+1]; // KNUCKLES GOT / CRAWLA HONCHO char passed1[29]; // KNUCKLES GOT / CRAWLA HONCHO
char passed2[17]; // A CHAOS EMERALD / GOT THEM ALL! char passed2[17]; // A CHAOS EMERALD / GOT THEM ALL!
char passed3[15]; // CAN NOW BECOME char passed3[15]; // CAN NOW BECOME
char passed4[SKINNAMESIZE+7]; // SUPER CRAWLA HONCHO char passed4[SKINNAMESIZE+7]; // SUPER CRAWLA HONCHO