matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update gitignore, show votes correctly, fixes #97

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-14 13:06:10 +01:00
parent c877e445b9
commit 4f3e03e317
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -35,3 +35,5 @@ Makefile.me
config.log config.log
*.sconsign.dblite *.sconsign.dblite
*.sconf_temp *.sconf_temp
*.gch
*.pyc

22
src/client/Client.cpp
View File

@ -927,24 +927,18 @@ RequestStatus Client::ExecVote(int saveID, int direction)
int dataLength = 0; int dataLength = 0;
std::stringstream idStream; std::stringstream idStream;
idStream << saveID; idStream << saveID;
std::string directionS;
if(direction==1) std::string saveIDText = format::NumberToString<int>(saveID);
{ std::string directionText = direction==1?"Up":"Down";
directionS = "Up";
} std::string userIDText = format::NumberToString<int>(authUser.ID);
else
{
directionS = "Down";
}
std::stringstream userIDStream;
userIDStream << authUser.ID;
if(authUser.ID) if(authUser.ID)
{ {
char * postNames[] = { "ID", "Action", NULL }; char * postNames[] = { "ID", "Action", NULL };
char * postDatas[] = { (char*)(idStream.str().c_str()), (char*)(directionS.c_str()) }; char * postDatas[] = { (char*)(saveIDText.c_str()), (char*)(directionText.c_str()) };
int postLengths[] = { idStream.str().length(), directionS.length() }; int postLengths[] = { saveIDText.length(), directionText.length() };
//std::cout << postNames[0] << " " << postDatas[0] << " " << postLengths[0] << std::endl; //std::cout << postNames[0] << " " << postDatas[0] << " " << postLengths[0] << std::endl;
data = http_multipart_post("http://" SERVER "/Vote.api", postNames, postDatas, postLengths, (char *)(userIDStream.str().c_str()), NULL, (char *)(authUser.SessionID.c_str()), &dataStatus, &dataLength); data = http_multipart_post("http://" SERVER "/Vote.api", postNames, postDatas, postLengths, (char *)(userIDText.c_str()), NULL, (char *)(authUser.SessionID.c_str()), &dataStatus, &dataLength);
} }
else else
{ {

11
src/game/GameController.cpp
View File

@ -1028,7 +1028,16 @@ void GameController::FrameStep()
void GameController::Vote(int direction) void GameController::Vote(int direction)
{ {
if(gameModel->GetSave() && gameModel->GetUser().ID && gameModel->GetSave()->GetID() && gameModel->GetSave()->GetVote()==0) if(gameModel->GetSave() && gameModel->GetUser().ID && gameModel->GetSave()->GetID() && gameModel->GetSave()->GetVote()==0)
gameModel->SetVote(direction); {
try
{
gameModel->SetVote(direction);
}
catch(GameModelException & ex)
{
new ErrorMessage("Error while voting", ex.what());
}
}
} }
void GameController::ChangeBrush() void GameController::ChangeBrush()

4
src/game/GameModel.cpp
View File

@ -263,6 +263,10 @@ void GameModel::SetVote(int direction)
currentSave->vote = direction; currentSave->vote = direction;
notifySaveChanged(); notifySaveChanged();
} }
else
{
throw GameModelException("Could not vote: "+Client::Ref().GetLastError());
}
} }
} }

10
src/game/GameView.cpp
View File

@ -873,14 +873,16 @@ void GameView::NotifySaveChanged(GameModel * sender)
reloadButton->Enabled = true; reloadButton->Enabled = true;
upVoteButton->Enabled = (sender->GetSave()->GetID() && sender->GetUser().ID && sender->GetSave()->GetVote()==0); upVoteButton->Enabled = (sender->GetSave()->GetID() && sender->GetUser().ID && sender->GetSave()->GetVote()==0);
if(sender->GetSave()->GetID() && sender->GetUser().ID && sender->GetSave()->GetVote()==1) if(sender->GetSave()->GetID() && sender->GetUser().ID && sender->GetSave()->GetVote()==1)
upVoteButton->Appearance.BackgroundInactive = (ui::Colour(0, 200, 40)); upVoteButton->Appearance.BackgroundDisabled = (ui::Colour(0, 200, 40, 100));
else else
upVoteButton->Appearance.BackgroundInactive = (ui::Colour(0, 0, 0)); upVoteButton->Appearance.BackgroundDisabled = (ui::Colour(0, 0, 0));
downVoteButton->Enabled = upVoteButton->Enabled; downVoteButton->Enabled = upVoteButton->Enabled;
if(sender->GetSave()->GetID() && sender->GetUser().ID && sender->GetSave()->GetVote()==-1) if(sender->GetSave()->GetID() && sender->GetUser().ID && sender->GetSave()->GetVote()==-1)
downVoteButton->Appearance.BackgroundInactive = (ui::Colour(200, 40, 40)); downVoteButton->Appearance.BackgroundDisabled = (ui::Colour(200, 40, 40, 100));
else else
downVoteButton->Appearance.BackgroundInactive = (ui::Colour(0, 0, 0)); downVoteButton->Appearance.BackgroundDisabled = (ui::Colour(0, 0, 0));
tagSimulationButton->Enabled = (sender->GetSave()->GetID() && sender->GetUser().ID); tagSimulationButton->Enabled = (sender->GetSave()->GetID() && sender->GetUser().ID);
if(sender->GetSave()->GetID()) if(sender->GetSave()->GetID())
{ {