thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Last bits of dehacked.c

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 12:08:51 -04:00
parent 4cd47a92dc
commit 9e99b3e9d2
1 changed files with 7 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/dehacked.c
View file

@ -4344,9 +4344,6 @@ static void readmaincfg(MYFILE *f)
// range check, you morons. // range check, you morons.
if (creditscutscene > 128) if (creditscutscene > 128)
creditscutscene = 128; creditscutscene = 128;
else if (fastcmp(word, "DISABLESPEEDADJUST"))
{
disableSpeedAdjust = (value || word2[0] == 'T' || word2[0] == 'Y');
} }
else if (fastcmp(word, "NUMDEMOS")) else if (fastcmp(word, "NUMDEMOS"))
{ {
@ -4402,13 +4399,10 @@ static void readmaincfg(MYFILE *f)
// can't use sprintf since there is %u in savegamename // can't use sprintf since there is %u in savegamename
strcatbf(savegamename, srb2home, PATHSEP); strcatbf(savegamename, srb2home, PATHSEP);
<<<<<<< HEAD
refreshdirmenu |= REFRESHDIR_GAMEDATA;
=======
strcpy(liveeventbackup, va("live%s.bkp", timeattackfolder)); strcpy(liveeventbackup, va("live%s.bkp", timeattackfolder));
strcatbf(liveeventbackup, srb2home, PATHSEP); strcatbf(liveeventbackup, srb2home, PATHSEP);
>>>>>>> srb2/next refreshdirmenu |= REFRESHDIR_GAMEDATA;
gamedataadded = true; gamedataadded = true;
titlechanged = true; titlechanged = true;
} }
@ -11246,24 +11240,7 @@ struct {
// Character flags (skinflags_t) // Character flags (skinflags_t)
{"SF_HIRES",SF_HIRES}, {"SF_HIRES",SF_HIRES},
<<<<<<< HEAD
=======
{"SF_NOSKID",SF_NOSKID},
{"SF_NOSPEEDADJUST",SF_NOSPEEDADJUST},
{"SF_RUNONWATER",SF_RUNONWATER},
{"SF_NOJUMPSPIN",SF_NOJUMPSPIN},
{"SF_NOJUMPDAMAGE",SF_NOJUMPDAMAGE},
{"SF_STOMPDAMAGE",SF_STOMPDAMAGE},
{"SF_MARIODAMAGE",SF_MARIODAMAGE},
{"SF_MACHINE",SF_MACHINE}, {"SF_MACHINE",SF_MACHINE},
{"SF_DASHMODE",SF_DASHMODE},
{"SF_FASTEDGE",SF_FASTEDGE},
{"SF_MULTIABILITY",SF_MULTIABILITY},
{"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
{"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
{"SF_NOSUPERSPRITES",SF_NOSUPERSPRITES},
{"SF_NOSUPERJUMPBOOST",SF_NOSUPERJUMPBOOST},
>>>>>>> srb2/next
// Dashmode constants // Dashmode constants
{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD}, {"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
@ -11632,7 +11609,12 @@ struct {
{"TC_BLINK",TC_BLINK}, {"TC_BLINK",TC_BLINK},
{"TC_DASHMODE",TC_DASHMODE}, {"TC_DASHMODE",TC_DASHMODE},
<<<<<<< HEAD // marathonmode flags
{"MA_INIT",MA_INIT},
{"MA_RUNNING",MA_RUNNING},
{"MA_NOCUTSCENES",MA_NOCUTSCENES},
{"MA_INGAME",MA_INGAME},
// SRB2Kart // SRB2Kart
// kartitems_t // kartitems_t
#define FOREACH( name, n ) { #name, KITEM_ ## name } #define FOREACH( name, n ) { #name, KITEM_ ## name }
@ -11655,14 +11637,6 @@ struct {
{"NUMKARTSHIELDS",NUMKARTSHIELDS}, {"NUMKARTSHIELDS",NUMKARTSHIELDS},
#endif #endif
=======
// marathonmode flags
{"MA_INIT",MA_INIT},
{"MA_RUNNING",MA_RUNNING},
{"MA_NOCUTSCENES",MA_NOCUTSCENES},
{"MA_INGAME",MA_INGAME},
>>>>>>> srb2/next
{NULL,0} {NULL,0}
}; };
@ -12244,12 +12218,8 @@ static inline int lib_freeslot(lua_State *L)
CONS_Printf("State S_%s allocated.\n",word); CONS_Printf("State S_%s allocated.\n",word);
FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL); FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
strcpy(FREE_STATES[i],word); strcpy(FREE_STATES[i],word);
<<<<<<< HEAD
freeslotusage[0][0]++; freeslotusage[0][0]++;
lua_pushinteger(L, i);
=======
lua_pushinteger(L, S_FIRSTFREESLOT + i); lua_pushinteger(L, S_FIRSTFREESLOT + i);
>>>>>>> srb2/next
r++; r++;
break; break;
} }
@ -12264,12 +12234,8 @@ static inline int lib_freeslot(lua_State *L)
CONS_Printf("MobjType MT_%s allocated.\n",word); CONS_Printf("MobjType MT_%s allocated.\n",word);
FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL); FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
strcpy(FREE_MOBJS[i],word); strcpy(FREE_MOBJS[i],word);
<<<<<<< HEAD
freeslotusage[1][0]++; freeslotusage[1][0]++;
lua_pushinteger(L, i);
=======
lua_pushinteger(L, MT_FIRSTFREESLOT + i); lua_pushinteger(L, MT_FIRSTFREESLOT + i);
>>>>>>> srb2/next
r++; r++;
break; break;
} }