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

Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes

This commit is contained in:
James R 2019-03-31 12:29:55 -07:00
parent 69d7e98f34 2966c99fd8
commit 42d25f67ca
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -3,7 +3,7 @@ jobs:
build: build:
working_directory: /root/SRB2 working_directory: /root/SRB2
docker: docker:
- image: debian:jessie - image: debian:stretch
environment: environment:
CC: ccache gcc -m32 CC: ccache gcc -m32
PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig
@ -36,7 +36,7 @@ jobs:
- v1-SRB2-APT - v1-SRB2-APT
- run: - run:
name: Install SDK name: Install SDK
command: apt-get -qq -y --no-install-recommends install git build-essential nasm libpng12-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 gettext ccache wget gcc-multilib upx openssh-client command: apt-get -qq -y --no-install-recommends install git build-essential nasm libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
- save_cache: - save_cache:
key: v1-SRB2-APT key: v1-SRB2-APT
paths: paths:

4
src/d_main.c
View File

@ -726,7 +726,6 @@ void D_StartTitle(void)
paused = false; paused = false;
advancedemo = false; advancedemo = false;
F_StartTitleScreen(); F_StartTitleScreen();
CON_ToggleOff();
// Reset the palette // Reset the palette
if (rendermode != render_none) if (rendermode != render_none)
@ -1396,12 +1395,13 @@ void D_SRB2Main(void)
} }
else if (M_CheckParm("-skipintro")) else if (M_CheckParm("-skipintro"))
{ {
CON_ToggleOff();
F_StartTitleScreen(); F_StartTitleScreen();
} }
else else
F_StartIntro(); // Tails 03-03-2002 F_StartIntro(); // Tails 03-03-2002
CON_ToggleOff();
if (dedicated && server) if (dedicated && server)
{ {
pagename = "TITLESKY"; pagename = "TITLESKY";

2
src/d_netcmd.c
View File

@ -1831,8 +1831,6 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
CONS_Printf(M_GetText("Speeding off to level...\n")); CONS_Printf(M_GetText("Speeding off to level...\n"));
} }
CON_ToggleOff();
if (demoplayback && !timingdemo) if (demoplayback && !timingdemo)
precache = false; precache = false;