vote code restructured, wip

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2134 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-06-01 17:23:34 +00:00
parent a5c49a70e3
commit db32bc2211
5 changed files with 100 additions and 89 deletions
+2 -2
View File
@@ -717,7 +717,7 @@ void callvote(int type, char *arg1, char *arg2)
votedisplayinfo *v = newvotedisplayinfo(player1, type, arg1, arg2);
if(v)
{
if(multiplayer(false)) calledvote = v;
calledvote = v;
ENetPacket *packet = enet_packet_create(NULL, MAXTRANS, ENET_PACKET_FLAG_RELIABLE);
ucharbuf p(packet->data, packet->dataLength);
putint(p, SV_CALLVOTE);
@@ -790,7 +790,7 @@ void voteresult(int v)
curvote->result = v;
curvote->millis = lastmillis + 5000;
conoutf("vote %s", v == VOTE_YES ? "passed" : "failed");
playsound(v == VOTE_YES ? S_VOTEPASS : S_VOTEFAIL, SP_HIGH);
if(multiplayer(false)) playsound(v == VOTE_YES ? S_VOTEPASS : S_VOTEFAIL, SP_HIGH);
}
}