From a0ab94270d3a6446de5b739e92cfd8cd6f8f4d65 Mon Sep 17 00:00:00 2001
From: mcmlxxix <>
Date: Mon, 8 Dec 2008 23:53:46 +0000
Subject: [PATCH] game now uses this.getVote() in maps.js to retrieve a user's
vote
---
xtrn/dicewarz/dice.js | 4 +---
xtrn/dicewarz/maps.js | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/xtrn/dicewarz/dice.js b/xtrn/dicewarz/dice.js
index 3713e44457..f9e2c1652a 100644
--- a/xtrn/dicewarz/dice.js
+++ b/xtrn/dicewarz/dice.js
@@ -502,10 +502,8 @@ function ViewGameInfo(gameNumber)
console.putmsg("\1g\1h " + GetUserName(player,playerNumber));
if(player.vote>=0) {
- if(player.vote==0) vote="wait";
- else vote="start";
if(g.maxPlayers>g.minPlayers)
- console.putmsg(" \1n\1gvotes to \1h" + vote);
+ console.putmsg(" \1n\1gvotes to \1h" + g.getVote(playerNumber));
}
console.crlf();
}
diff --git a/xtrn/dicewarz/maps.js b/xtrn/dicewarz/maps.js
index 6701a7cf3a..f026c85c8c 100644
--- a/xtrn/dicewarz/maps.js
+++ b/xtrn/dicewarz/maps.js
@@ -60,7 +60,7 @@ function NewGame(minp,maxp,n)
}
return count;
}
- this.GetVote=function(playerNumber)
+ this.getVote=function(playerNumber)
{
if(this.players[playerNumber].vote==0) return("wait");
else return("start");
@@ -104,7 +104,6 @@ function Map(c,r,p,gn)
this.maxTerr=11; //MAXIMUM FOR RANDOM TERRITORY GENERATION PER PLAYER
//NOTIFY NEXT PLAYER OF TURN
- //TODO: FIGURE OUT WHY THE GAME (OR THE BBS) IS SENDING DUPLICATE TELEGRAM NOTICES FOR THE SAME TURN
this.Notify= function() //NOTIFY NEXT PLAYER OF TURN
{
nextTurn=this.nextTurn;
--
GitLab