More small fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
@@ -214,7 +214,7 @@ namespace Online{
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
const CurrentUser::SignOutRequest * CurrentUser::requestSignOut(){
|
||||
void CurrentUser::requestSignOut(){
|
||||
assert(m_state == US_SIGNED_IN || m_state == US_GUEST);
|
||||
SignOutRequest * request = new SignOutRequest();
|
||||
request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
|
||||
@@ -223,7 +223,6 @@ namespace Online{
|
||||
request->setParameter("userid", getID());
|
||||
HTTPManager::get()->addRequest(request);
|
||||
m_state = US_SIGNING_OUT;
|
||||
return request;
|
||||
}
|
||||
|
||||
void CurrentUser::signOut(bool success, const XMLNode * input)
|
||||
@@ -647,7 +646,7 @@ namespace Online{
|
||||
}
|
||||
}
|
||||
// FIXME show connection error??
|
||||
// after 2 misses I'll show something
|
||||
// Perhaps show something after 2 misses.
|
||||
|
||||
}
|
||||
// ============================================================================
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace Online{
|
||||
{
|
||||
virtual void callback ();
|
||||
public:
|
||||
SignOutRequest() : XMLRequest() {}
|
||||
SignOutRequest() : XMLRequest(true) {}
|
||||
};
|
||||
|
||||
class ServerCreationRequest : public XMLRequest {
|
||||
@@ -151,7 +151,7 @@ namespace Online{
|
||||
const irr::core::stringw &password,
|
||||
bool save_session,
|
||||
bool request_now = true);
|
||||
const SignOutRequest * requestSignOut();
|
||||
void requestSignOut();
|
||||
const ServerCreationRequest * requestServerCreation(const irr::core::stringw &name, int max_players);
|
||||
ServerJoinRequest * requestServerJoin(uint32_t server_id, bool request_now = true);
|
||||
|
||||
|
||||
@@ -234,7 +234,7 @@ namespace Online{
|
||||
void Profile::addFriend( const uint32_t id)
|
||||
{
|
||||
assert (m_has_fetched_friends);
|
||||
for(int i=0; i< m_friends.size(); i++)
|
||||
for(unsigned int i=0; i< m_friends.size(); i++)
|
||||
if(m_friends[i] == id)
|
||||
return;
|
||||
m_friends.push_back(id);
|
||||
|
||||
@@ -221,7 +221,7 @@ namespace Online{
|
||||
return m_profiles_persistent[id];
|
||||
if(cacheHit(id))
|
||||
return m_profiles_cache[id];
|
||||
//FIXME not able to get! fetch it ourselves and put it in cache
|
||||
//FIXME not able to get! Now this should actually fetch the info from the server, but I haven't come up with a good asynchronous idea yet.
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -210,6 +210,7 @@ bool UserInfoDialog::onEscapePressed()
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
|
||||
void UserInfoDialog::onUpdate(float dt)
|
||||
{
|
||||
if(m_processing) m_info_widget->setText(Messages::processing(), false);
|
||||
|
||||
@@ -114,8 +114,7 @@ void VoteDialog::onUpdate(float dt)
|
||||
if(m_fetch_vote_request->isSuccess())
|
||||
{
|
||||
m_info_widget->setDefaultColor();
|
||||
m_info_widget->setText(_("bla"), false); //FIXME
|
||||
std::string voted;
|
||||
std::string voted("");
|
||||
m_fetch_vote_request->getResult()->get("voted", &voted);
|
||||
if(voted == "yes")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user