stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-1166' into 'next'

Browse source 
Fix #1166

Closes #1166

See merge request STJr/SRB2!2256
This commit is contained in:
Logan Aerl Arias 2024-01-03 03:44:55 +00:00
commit 6ad24c4368
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_demo.c
View file

@ -929,7 +929,7 @@ void G_GhostTicker(void)
follow->colorized = true;
if (followtic & FZT_SKIN)
follow->skin = &skins[READUINT8(g->p)];
follow->skin = skins[READUINT8(g->p)];
}
}
if (follow)
@ -1199,7 +1199,7 @@ void G_ReadMetalTic(mobj_t *metal)
follow->colorized = true;
if (followtic & FZT_SKIN)
follow->skin = &skins[READUINT8(metal_p)];
follow->skin = skins[READUINT8(metal_p)];
}
}
if (follow)

2
src/lua_script.c
View file

@ -1646,7 +1646,7 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
LUA_PushUserdata(gL, READUINT16(save_p) == 1 ? &mouse : &mouse2, META_MOUSE);
break;
case ARCH_SKIN:
LUA_PushUserdata(gL, &skins[READUINT8(save_p)], META_SKIN);
LUA_PushUserdata(gL, skins[READUINT8(save_p)], META_SKIN);
break;
case ARCH_TEND:
return 1;

4
src/p_enemy.c
View file

@ -3786,7 +3786,7 @@ void A_MonitorPop(mobj_t *actor)
P_SetTarget(&newmobj->tracer, livesico);
livesico->color = newmobj->target->player->mo->color;
livesico->skin = &skins[newmobj->target->player->skin];
livesico->skin = skins[newmobj->target->player->skin];
P_SetMobjState(livesico, newmobj->info->seestate);
}
@ -3877,7 +3877,7 @@ void A_GoldMonitorPop(mobj_t *actor)
P_SetTarget(&newmobj->tracer, livesico);
livesico->color = newmobj->target->player->mo->color;
livesico->skin = &skins[newmobj->target->player->skin];
livesico->skin = skins[newmobj->target->player->skin];
P_SetMobjState(livesico, newmobj->info->seestate);
}