lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into gfz_boss_rework

Browse source
This commit is contained in:
toaster 2019-08-12 18:50:42 +01:00
parent e62fefad5d 37dd048f12
commit 640b39d9aa
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/f_finale.c
View file

@ -46,7 +46,7 @@
// Stage of animation: // Stage of animation:
// 0 = text, 1 = art screen // 0 = text, 1 = art screen
static INT32 finalecount; static INT32 finalecount;
INT32 titlescrollxspeed = 80; INT32 titlescrollxspeed = 20;
INT32 titlescrollyspeed = 0; INT32 titlescrollyspeed = 0;
UINT8 titlemapinaction = TITLEMAP_OFF; UINT8 titlemapinaction = TITLEMAP_OFF;

2
src/g_game.c
View file

@ -97,7 +97,7 @@ boolean runemeraldmanager = false;
UINT16 emeraldspawndelay = 60*TICRATE; UINT16 emeraldspawndelay = 60*TICRATE;
// menu demo things // menu demo things
UINT8 numDemos = 3; UINT8 numDemos = 0;
UINT32 demoDelayTime = 15*TICRATE; UINT32 demoDelayTime = 15*TICRATE;
UINT32 demoIdleTime = 3*TICRATE; UINT32 demoIdleTime = 3*TICRATE;

2
src/p_user.c
View file

@ -10391,7 +10391,7 @@ static void P_MinecartThink(player_t *player)
if (P_IsObjectOnGround(minecart)) if (P_IsObjectOnGround(minecart))
{ {
sector_t *sec; sector_t *sec;
INT32 lnum; INT32 lnum = -1;
fixed_t dummy; fixed_t dummy;
// Just hit floor. // Just hit floor.