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

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

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

@ -76,7 +76,7 @@ static int netparamcount = 0;
static char **netparam = NULL;
int votes[MAXPLAYERS], gotvote[MAXPLAYERS], voting = -1;
int vote_map, vote_episode;
int vote_map = -1, vote_episode = -1;
int recfilep,totalreccnt;
char debug_on = 0,actor_tog = 0,*rtsptr,memorycheckoveride=0;
@ -718,7 +718,7 @@ if( !(ps[myconnectindex].gm&MODE_GAME) ) { OSD_DispatchQueued(); }
for(i=connectpoint2[connecthead];i>=0;i=connectpoint2[i])
if (i != other) sendpacket(i,packbuf,packbufleng);
if(voting != -1)
if(vote_map != -1 || vote_episode != -1 || voting != -1)
adduserquote("VOTE SUCCEEDED");
ud.m_level_number = ud.level_number = packbuf[1];
@ -2103,7 +2103,7 @@ void tics(void)
{
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;
if(ud.multimode > 4)
@ -7736,7 +7736,6 @@ int load_rancid_net(char *fn)
Bsprintf(tempbuf,"%s",strtok(NULL,":"));
if(atoi(tempbuf) > 1024)
Bsprintf(rancid_local_port_string,"-p %s",tempbuf);
Bfree(ip);
}
break;
case T_MODE:
@ -7744,7 +7743,6 @@ int load_rancid_net(char *fn)
char *mode;
if (scriptfile_getstring(script,&mode)) break;
Bfree(mode);
}
break;
case T_ALLOW:
@ -7753,7 +7751,6 @@ int load_rancid_net(char *fn)
if (scriptfile_getstring(script,&ip)) break;
Bstrcpy(rancid_ip_strings[rancid_players++],ip);
Bfree(ip);
}
break;
case T_EOF:

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

@ -1838,14 +1838,7 @@ cheat_for_port_credits:
case 100:
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");
// if(boardfilename[0])
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 (VOLUMEONE) {

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

@ -1488,7 +1488,7 @@ void resetmys(void)
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)
{
@ -1506,7 +1506,7 @@ int enterlevel(char g)
ud.ffire = ud.m_ffire;
ud.noexits = ud.m_noexits;
voting = -1;
vote_map = vote_episode = voting = -1;
Bmemset(votes,0,sizeof(votes));
Bmemset(gotvote,0,sizeof(gotvote));