zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for a crash when using rancidmeat network config files, fix for the "vote succeeded" message that's supposed to display when a multiplayer map vote passes, and a fix for an issue with the new game menu that I noticed when I accidentally used 1.4/1.5 CON files with the shareware GRP.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@274 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-08-21 21:00:54 +00:00
parent 827eb34b95
commit daa3b7b7a7
3 changed files with 23 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,7 +76,7 @@ static int netparamcount = 0;
static char **netparam = NULL; static char **netparam = NULL;
int votes[MAXPLAYERS], gotvote[MAXPLAYERS], voting = -1; int votes[MAXPLAYERS], gotvote[MAXPLAYERS], voting = -1;
int vote_map, vote_episode; int vote_map = -1, vote_episode = -1;
int recfilep,totalreccnt; int recfilep,totalreccnt;
char debug_on = 0,actor_tog = 0,*rtsptr,memorycheckoveride=0; char debug_on = 0,actor_tog = 0,*rtsptr,memorycheckoveride=0;
@ -534,8 +534,8 @@ if( !(ps[myconnectindex].gm&MODE_GAME) ) { OSD_DispatchQueued(); }
case 1: // call map vote case 1: // call map vote
voting = packbuf[2]; voting = packbuf[2];
vote_episode = packbuf[3]; vote_episode = packbuf[3];
vote_map = packbuf[4]; vote_map = packbuf[4];
Bsprintf(tempbuf,"%s HAS CALLED A VOTE TO CHANGE MAP TO %s (E%dL%d)",ud.user_name[packbuf[2]],level_names[packbuf[3]*11 + packbuf[4]],packbuf[3]+1,packbuf[4]+1); Bsprintf(tempbuf,"%s HAS CALLED A VOTE TO CHANGE MAP TO %s (E%dL%d)",ud.user_name[packbuf[2]],level_names[packbuf[3]*11 + packbuf[4]],packbuf[3]+1,packbuf[4]+1);
adduserquote(tempbuf); adduserquote(tempbuf);
Bsprintf(tempbuf,"PRESS F1 TO VOTE YES, F2 TO VOTE NO"); Bsprintf(tempbuf,"PRESS F1 TO VOTE YES, F2 TO VOTE NO");
@ -718,7 +718,7 @@ if( !(ps[myconnectindex].gm&MODE_GAME) ) { OSD_DispatchQueued(); }
for(i=connectpoint2[connecthead];i>=0;i=connectpoint2[i]) for(i=connectpoint2[connecthead];i>=0;i=connectpoint2[i])
if (i != other) sendpacket(i,packbuf,packbufleng); if (i != other) sendpacket(i,packbuf,packbufleng);
if(voting != -1) if(vote_map != -1 || vote_episode != -1 || voting != -1)
adduserquote("VOTE SUCCEEDED"); adduserquote("VOTE SUCCEEDED");
ud.m_level_number = ud.level_number = packbuf[1]; ud.m_level_number = ud.level_number = packbuf[1];
@ -2101,14 +2101,14 @@ void tics(void)
j=(TICRATE*AVERAGEFRAMES)/(i-frameval[framecnt]); j=(TICRATE*AVERAGEFRAMES)/(i-frameval[framecnt]);
if (ud.tickrate && !(ps[myconnectindex].gm&MODE_MENU)) if (ud.tickrate && !(ps[myconnectindex].gm&MODE_MENU))
{ {
int k = 1; int k = 1;
if(ud.screen_size != 0 && GTFLAGS(GAMETYPE_FLAG_FRAGBAR)) if(ud.screen_size != 0 && GTFLAGS(GAMETYPE_FLAG_FRAGBAR) && ud.multimode > 1)
{ {
k += 8; k += 8;
if(ud.multimode > 4) if(ud.multimode > 4)
k += 8; k += 8;
} }
Bsprintf(b,"%ld",j>0?j:0); Bsprintf(b,"%ld",j>0?j:0);
minitext(320-strlen(b)*4,k,b,(TICRATE*AVERAGEFRAMES)/(i-frameval[framecnt]) < 40?2:0,26); minitext(320-strlen(b)*4,k,b,(TICRATE*AVERAGEFRAMES)/(i-frameval[framecnt]) < 40?2:0,26);
} }
@ -7736,7 +7736,6 @@ int load_rancid_net(char *fn)
Bsprintf(tempbuf,"%s",strtok(NULL,":")); Bsprintf(tempbuf,"%s",strtok(NULL,":"));
if(atoi(tempbuf) > 1024) if(atoi(tempbuf) > 1024)
Bsprintf(rancid_local_port_string,"-p %s",tempbuf); Bsprintf(rancid_local_port_string,"-p %s",tempbuf);
Bfree(ip);
} }
break; break;
case T_MODE: case T_MODE:
@ -7744,7 +7743,6 @@ int load_rancid_net(char *fn)
char *mode; char *mode;
if (scriptfile_getstring(script,&mode)) break; if (scriptfile_getstring(script,&mode)) break;
Bfree(mode);
} }
break; break;
case T_ALLOW: case T_ALLOW:
@ -7753,7 +7751,6 @@ int load_rancid_net(char *fn)
if (scriptfile_getstring(script,&ip)) break; if (scriptfile_getstring(script,&ip)) break;
Bstrcpy(rancid_ip_strings[rancid_players++],ip); Bstrcpy(rancid_ip_strings[rancid_players++],ip);
Bfree(ip);
} }
break; break;
case T_EOF: case T_EOF:
@ -8768,7 +8765,7 @@ void syncnames(void)
buf[l++] = ps[myconnectindex].aim_mode = ud.mouseaiming; buf[l++] = ps[myconnectindex].aim_mode = ud.mouseaiming;
buf[l++] = ps[myconnectindex].auto_aim = AutoAim; buf[l++] = ps[myconnectindex].auto_aim = AutoAim;
buf[l++] = ps[myconnectindex].weaponswitch = ud.weaponswitch; buf[l++] = ps[myconnectindex].weaponswitch = ud.weaponswitch;
buf[l++] = ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = ud.color; buf[l++] = ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = ud.color;
i = ps[myconnectindex].team; i = ps[myconnectindex].team;
buf[l++] = ps[myconnectindex].team = ud.pteam[myconnectindex] = ud.team; buf[l++] = ps[myconnectindex].team = ud.pteam[myconnectindex] = ud.team;
@ -8862,7 +8859,7 @@ void updatenames(void)
ps[myconnectindex].aim_mode = ud.mouseaiming; ps[myconnectindex].aim_mode = ud.mouseaiming;
ps[myconnectindex].auto_aim = AutoAim; ps[myconnectindex].auto_aim = AutoAim;
ps[myconnectindex].weaponswitch = ud.weaponswitch; ps[myconnectindex].weaponswitch = ud.weaponswitch;
ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = ud.color; ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = ud.color;
j = ps[myconnectindex].team; j = ps[myconnectindex].team;
ps[myconnectindex].team = ud.pteam[myconnectindex] = ud.team; ps[myconnectindex].team = ud.pteam[myconnectindex] = ud.team;
@ -9282,9 +9279,9 @@ MAIN_LOOP_RESTART:
} }
ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = k; ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = k;
} else { } else {
if(ud.color) ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = ud.color; if(ud.color) ps[myconnectindex].palookup = ud.pcolor[myconnectindex] = ud.color;
else ps[myconnectindex].palookup = ud.pcolor[myconnectindex]; else ps[myconnectindex].palookup = ud.pcolor[myconnectindex];
} }
ud.warp_on = 0; ud.warp_on = 0;
KB_KeyDown[sc_Pause] = 0; // JBF: I hate the pause key KB_KeyDown[sc_Pause] = 0; // JBF: I hate the pause key
@ -9364,13 +9361,13 @@ MAIN_LOOP_RESTART:
displayrest(i); displayrest(i);
if(gotvote[myconnectindex] == 0 && voting != -1 && voting != myconnectindex) if(gotvote[myconnectindex] == 0 && voting != -1 && voting != myconnectindex)
{ {
Bsprintf(tempbuf,"%s HAS CALLED A VOTE FOR MAP",ud.user_name[voting]); Bsprintf(tempbuf,"%s HAS CALLED A VOTE FOR MAP",ud.user_name[voting]);
gametext(160,40,tempbuf,0,2+8+16); gametext(160,40,tempbuf,0,2+8+16);
Bsprintf(tempbuf,"%s (E%dL%d)",level_names[vote_episode*11 + vote_map],vote_episode+1,vote_map+1); Bsprintf(tempbuf,"%s (E%dL%d)",level_names[vote_episode*11 + vote_map],vote_episode+1,vote_map+1);
gametext(160,48,tempbuf,0,2+8+16); gametext(160,48,tempbuf,0,2+8+16);
gametext(160,70,"PRESS F1 TO VOTE YES, F2 TO VOTE NO",0,2+8+16); gametext(160,70,"PRESS F1 TO VOTE YES, F2 TO VOTE NO",0,2+8+16);
} }
// if( KB_KeyPressed(sc_F) ) // if( KB_KeyPressed(sc_F) )
// { // {

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

@ -1838,14 +1838,7 @@ cheat_for_port_credits:
case 100: case 100:
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
menutext(160,24,0,0,"SELECT AN EPISODE"); menutext(160,24,0,0,"SELECT AN EPISODE");
// if(boardfilename[0]) x = probe(160,VOLUMEONE?60:60-(num_volumes*2),20,VOLUMEONE?3:num_volumes+1);
if (PLUTOPAK)
x = probe(160,60-(num_volumes*2),20,num_volumes+1);
// else x = probe(160,60,20,4);
// if(boardfilename[0])
else
x = probe(160,VOLUMEONE?60:60-(num_volumes*2),20,VOLUMEONE?3:num_volumes+1);
// else x = probe(160,60,20,3);
if(x >= 0) if(x >= 0)
{ {
if (VOLUMEONE) { if (VOLUMEONE) {

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

@ -1488,7 +1488,7 @@ void resetmys(void)
extern void adduserquote(char *daquote); extern void adduserquote(char *daquote);
extern int gotvote[MAXPLAYERS], votes[MAXPLAYERS], voting; extern int gotvote[MAXPLAYERS], votes[MAXPLAYERS], voting, vote_map, vote_episode;
int enterlevel(char g) int enterlevel(char g)
{ {
@ -1506,7 +1506,7 @@ int enterlevel(char g)
ud.ffire = ud.m_ffire; ud.ffire = ud.m_ffire;
ud.noexits = ud.m_noexits; ud.noexits = ud.m_noexits;
voting = -1; vote_map = vote_episode = voting = -1;
Bmemset(votes,0,sizeof(votes)); Bmemset(votes,0,sizeof(votes));
Bmemset(gotvote,0,sizeof(gotvote)); Bmemset(gotvote,0,sizeof(gotvote));