thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dehacked.c

Browse source
This commit is contained in:
lachwright 2020-08-10 11:54:55 +08:00
parent efc676726a
commit bf884fc6c5
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dehacked.c
View file

@ -4338,18 +4338,15 @@ static void readmaincfg(MYFILE *f)
titlescrollyspeed = get_number(word2); titlescrollyspeed = get_number(word2);
titlechanged = true; titlechanged = true;
} }
<<<<<<< HEAD
else if (fastcmp(word, "CREDITSCUTSCENE")) else if (fastcmp(word, "CREDITSCUTSCENE"))
{ {
creditscutscene = (UINT8)get_number(word2); creditscutscene = (UINT8)get_number(word2);
// range check, you morons. // range check, you morons.
if (creditscutscene > 128) if (creditscutscene > 128)
creditscutscene = 128; creditscutscene = 128;
=======
else if (fastcmp(word, "DISABLESPEEDADJUST")) else if (fastcmp(word, "DISABLESPEEDADJUST"))
{ {
disableSpeedAdjust = (value || word2[0] == 'T' || word2[0] == 'Y'); disableSpeedAdjust = (value || word2[0] == 'T' || word2[0] == 'Y');
>>>>>>> srb2/next
} }
else if (fastcmp(word, "NUMDEMOS")) else if (fastcmp(word, "NUMDEMOS"))
{ {