Minor fixes

This commit is contained in:
TehRealSalt 2018-02-07 22:45:40 -05:00
parent e6c040b844
commit 2c09dd1df1

View file

@ -2192,7 +2192,7 @@ void Y_VoteDrawer(void)
{ {
patch_t *pic; patch_t *pic;
if ((votes[i] == 3 && i != pickedvote) || voteendtic-votetic > 3*TICRATE) if (votes[i] == 3 && (i != pickedvote || voteendtic-votetic > 3*TICRATE))
pic = randomlvl; pic = randomlvl;
else else
pic = levelinfo[votes[i]].pic; pic = levelinfo[votes[i]].pic;
@ -2311,14 +2311,14 @@ void Y_VoteTicker(void)
numvotes++; numvotes++;
} }
randomanim = tempvotes[((pickedvote - ((voteendtic-votetic) / (TICRATE/7))) % numvotes)]; randomanim = tempvotes[((pickedvote + ((voteendtic-votetic) / (TICRATE/7))) % numvotes)];
S_StartSound(NULL, sfx_menu1); S_StartSound(NULL, sfx_menu1);
} }
else else
{ {
randomanim = pickedvote; randomanim = pickedvote;
if (voteendtic-votetic == 3*TICRATE-1) if (voteendtic-votetic == 3*TICRATE-1)
S_StartSound(NULL, sfx_ncitem); S_StartSound(NULL, sfx_s3k63);
} }
} }
else else
@ -2353,7 +2353,7 @@ void Y_VoteTicker(void)
if (pressed) if (pressed)
{ {
S_StartSound(NULL, sfx_menu1); S_StartSound(NULL, sfx_s3k5b);
voteclient.delay = NEWTICRATE/7; voteclient.delay = NEWTICRATE/7;
} }