zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

I guess I'll use palette 21 for the red team instead of palette 10, though palette 10 does look better with the original sprites.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@272 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-08-21 06:57:39 +00:00
parent 20b89b70b3
commit 511a6517cb
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -781,7 +781,7 @@ if( !(ps[myconnectindex].gm&MODE_GAME) ) { OSD_DispatchQueued(); }
switch(ps[other].team) switch(ps[other].team)
{ {
case 0: j = 3; break; case 0: j = 3; break;
case 1: j = 10; break; case 1: j = 21; break;
} }
ps[other].palookup = ud.pcolor[other] = j; ps[other].palookup = ud.pcolor[other] = j;
} }
@ -8775,7 +8775,7 @@ void syncnames(void)
switch(ps[myconnectindex].team) switch(ps[myconnectindex].team)
{ {
case 0: i = 3; break; case 0: i = 3; break;
case 1: i = 10; break; case 1: i = 21; break;
} }
ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = i; ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = i;
} }
@ -9269,7 +9269,7 @@ MAIN_LOOP_RESTART:
switch(ps[myconnectindex].team) switch(ps[myconnectindex].team)
{ {
case 0: k = 3; break; case 0: k = 3; break;
case 1: k = 10; break; case 1: k = 21; break;
} }
ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = k; ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = k;
} else ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = ud.color; } else ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = ud.color;

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

@ -6653,7 +6653,7 @@ good:
} }
default: default:
Bsprintf(tempbuf,"fatal error: Default processing in parse(): %ld, %ld\ncurrent actor: %ld %ld",*insptr,*(insptr-1),g_i,g_sp->picnum); Bsprintf(tempbuf,"fatal error: Default processing in parse(): %ld, %ld\ncurrent actor: %d %d",*insptr,*(insptr-1),g_i,g_sp->picnum);
AddLog(tempbuf); AddLog(tempbuf);
gameexit("An error has occurred in the EDuke32 CON parser.\n\nPlease mail all of your CON files along with the file eduke32.log\nto terminx@gmail.com.\n\nThank you."); gameexit("An error has occurred in the EDuke32 CON parser.\n\nPlease mail all of your CON files along with the file eduke32.log\nto terminx@gmail.com.\n\nThank you.");
break; break;

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

@ -661,7 +661,7 @@ void menus(void)
{ {
switch(ud.team) { switch(ud.team) {
case 0: x = 3; break; case 0: x = 3; break;
case 1: x = 10; break; case 1: x = 21; break;
} }
} else x = ud.color; } else x = ud.color;
rotatesprite((280)<<16,(37+(tilesizy[APLAYER]>>1))<<16,49152L,0,1441-((((4-(totalclock>>4)))&3)*5),0,x,10,0,0,xdim-1,ydim-1); rotatesprite((280)<<16,(37+(tilesizy[APLAYER]>>1))<<16,49152L,0,1441-((((4-(totalclock>>4)))&3)*5),0,x,10,0,0,xdim-1,ydim-1);

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

@ -1252,7 +1252,7 @@ void resetpspritevars(char g)
switch(ud.pteam[j]) switch(ud.pteam[j])
{ {
case 0: k = 3; break; case 0: k = 3; break;
case 1: k = 10; break; case 1: k = 21; break;
} }
ps[j].team = ud.pteam[j]; ps[j].team = ud.pteam[j];
} }