vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Woops, didn't commit the most up-to-date g_game.c originally (old one didn't compile)

This commit is contained in:
toaster 2019-01-16 15:27:23 +00:00
parent 081872aa85
commit a7445a7b71
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/g_game.c
View File

@ -5922,7 +5922,7 @@ void G_DoPlayDemo(char *defdemoname)
// Skin not loaded? // Skin not loaded?
if (!SetPlayerSkin(0, skin)) if (!SetPlayerSkin(0, skin))
{ {
snprintf(msg, 1024, M_GetText("%s features a character that is not loaded.\n"), pdemoname); snprintf(msg, 1024, M_GetText("%s features a character that is not currently loaded.\n"), pdemoname);
CONS_Alert(CONS_ERROR, "%s", msg); CONS_Alert(CONS_ERROR, "%s", msg);
M_StartMessage(msg, NULL, MM_NOTHING); M_StartMessage(msg, NULL, MM_NOTHING);
Z_Free(pdemoname); Z_Free(pdemoname);
@ -6157,11 +6157,11 @@ void G_AddGhost(char *defdemoname)
return; return;
} }
gh->oldmo->skin = &skins[0]; gh->oldmo.skin = &skins[0];
for (i = 0; i < numskins; i++) for (i = 0; i < numskins; i++)
if (!stricmp(skins[i].name,skin)) if (!stricmp(skins[i].name,skin))
{ {
gh->oldmo->skin = &skins[i]; gh->oldmo.skin = &skins[i];
break; break;
} }
@ -6218,7 +6218,7 @@ void G_AddGhost(char *defdemoname)
gh->oldmo.z = gh->mo->z; gh->oldmo.z = gh->mo->z;
// Set skin // Set skin
gh->mo.skin = gh->oldmo->skin; gh->mo->skin = gh->oldmo.skin;
// Set color // Set color
gh->mo->color = ((skin_t*)gh->mo->skin)->prefcolor; gh->mo->color = ((skin_t*)gh->mo->skin)->prefcolor;