zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Swap the qstrcpy parameters and fix the issue with frozen players

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@302 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-09-28 00:32:22 +00:00
parent 2f4725e0f2
commit ec89d845aa
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/source/game.c
View file

@ -8838,7 +8838,7 @@ void updatenames(void)
if(ud.multimode > 1) if(ud.multimode > 1)
{ {
syncnames(); syncnames();
if(sprite[ps[myconnectindex].i].picnum == APLAYER) if(sprite[ps[myconnectindex].i].picnum == APLAYER && sprite[ps[myconnectindex].i].pal != 1)
sprite[ps[myconnectindex].i].pal = ud.pcolor[myconnectindex]; sprite[ps[myconnectindex].i].pal = ud.pcolor[myconnectindex];
} }
else else
@ -8852,7 +8852,7 @@ void updatenames(void)
j = ps[myconnectindex].team; j = ps[myconnectindex].team;
ud.pteam[myconnectindex] = ud.team; ud.pteam[myconnectindex] = ud.team;
if(sprite[ps[myconnectindex].i].picnum == APLAYER) if(sprite[ps[myconnectindex].i].picnum == APLAYER && sprite[ps[myconnectindex].i].pal != 1)
sprite[ps[myconnectindex].i].pal = ud.pcolor[myconnectindex]; sprite[ps[myconnectindex].i].pal = ud.pcolor[myconnectindex];
} }
} }
@ -10510,6 +10510,8 @@ char domovethings(void)
ps[i].palookup = ud.pcolor[i] = j; ps[i].palookup = ud.pcolor[i] = j;
} }
if(sprite[ps[i].i].pal != 1)
sprite[ps[i].i].pal = ud.pcolor[i]; sprite[ps[i].i].pal = ud.pcolor[i];
cheatkeys(i); cheatkeys(i);

2
polymer/eduke32/source/gameexec.c
View file

@ -4326,7 +4326,7 @@ SKIPJIBS:
break; break;
case CON_QSTRCPY: case CON_QSTRCPY:
if(fta_quotes[i] != NULL && fta_quotes[j] != NULL) if(fta_quotes[i] != NULL && fta_quotes[j] != NULL)
Bstrcpy(fta_quotes[j],fta_quotes[i]); Bstrcpy(fta_quotes[i],fta_quotes[j]);
else OSD_Printf("%s %d null quote %d %d\n",__FILE__,__LINE__,i,j); else OSD_Printf("%s %d null quote %d %d\n",__FILE__,__LINE__,i,j);
break; break;
case CON_CHANGESPRITESTAT: case CON_CHANGESPRITESTAT: