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

Fully remove OLD22DEMOCOMPAT

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 12:17:25 -04:00
parent e14f4a5842
commit 4c99af8010
1 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/g_demo.c
View file

@ -2646,9 +2646,6 @@ void G_DoPlayDemo(char *defdemoname)
#if defined(SKIPERRORS) && !defined(DEVELOP) #if defined(SKIPERRORS) && !defined(DEVELOP)
boolean skiperrors = false; boolean skiperrors = false;
#endif #endif
#ifdef OLD22DEMOCOMPAT
boolean use_old_demo_vars = false;
#endif
G_InitDemoRewind(); G_InitDemoRewind();
@ -2728,16 +2725,6 @@ void G_DoPlayDemo(char *defdemoname)
switch(demo.version) switch(demo.version)
{ {
case DEMOVERSION: // latest always supported case DEMOVERSION: // latest always supported
<<<<<<< HEAD
=======
cnamelen = MAXCOLORNAME;
break;
#ifdef OLD22DEMOCOMPAT
// all that changed between then and now was longer color name
case 0x000c:
cnamelen = 16;
use_old_demo_vars = true;
>>>>>>> srb2/next
break; break;
#endif #endif
// too old, cannot support. // too old, cannot support.
@ -2874,13 +2861,7 @@ void G_DoPlayDemo(char *defdemoname)
} }
// net var data // net var data
#ifdef OLD22DEMOCOMPAT CV_LoadDemoVars(&demo_p);
if (use_old_demo_vars)
CV_LoadOldDemoVars(&demo_p);
else
#else
CV_LoadDemoVars(&demo_p);
#endif
// Sigh ... it's an empty demo. // Sigh ... it's an empty demo.
if (*demo_p == DEMOMARKER) if (*demo_p == DEMOMARKER)