Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7462 for code/trunk/src


Ignore:
Timestamp:
Sep 17, 2010, 8:49:06 PM (14 years ago)
Author:
dafrick
Message:

Small changes in Notification to work towards synchronizing them…

Location:
code/trunk/src/modules
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/notifications/Notification.cc

    r7456 r7462  
    3636#include "core/CoreIncludes.h"
    3737#include "network/NetworkFunction.h"
     38#include "network/Host.h"
    3839#include "NotificationManager.h"
    3940
     
    4344    CreateUnloadableFactory(Notification);
    4445
    45     registerMemberNetworkFunction(Notification, sendHelper);
     46    registerMemberNetworkFunction(Notification, send);
    4647
    4748    /**
     
    113114    bool Notification::send(unsigned int clientId, const std::string & sender = NotificationManager::NONE)
    114115    {
    115 
    116         if(GameMode::isStandalone())
     116        if(GameMode::isStandalone() || Host::getPlayerID() == clientId)
    117117        {
    118118            this->sendHelper(sender);
    119119        }
    120         else
     120        else if(GameMode::isServer())
    121121        {
    122             callMemberNetworkFunction(Notification, sendHelper, this->getObjectID(), clientId, sender);
     122            callMemberNetworkFunction(Notification, send, this->getObjectID(), clientId, clientId, sender);
    123123        }
    124124
  • code/trunk/src/modules/questsystem/QuestListener.cc

    r7456 r7462  
    4444    CreateFactory(QuestListener);
    4545
    46     //! Initialization of the static variables for the modes as strings.
     46    // Initialization of the static variables for the modes as strings.
    4747    /*static*/ const std::string QuestListener::ALL = "all";
    4848    /*static*/ const std::string QuestListener::START = "start";
Note: See TracChangeset for help on using the changeset viewer.