Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 14, 2011, 3:53:38 AM (14 years ago)
Author:
rgrieder
Message:

Merged ois_update branch (before it was renamed to mac_osx) into kicklib branch.

Location:
code/branches/kicklib
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib

  • code/branches/kicklib/src/modules/designtools/DesignToolsPrereqs.h

    r7163 r8071  
    5353#    endif
    5454#  endif
    55 #elif defined ( ORXONOX_GCC_VISIBILITY )
     55#  define _DesignToolsPrivate
     56#elif defined (ORXONOX_GCC_VISIBILITY)
    5657#  define _DesignToolsExport  __attribute__ ((visibility("default")))
     58#  define _DesignToolsPrivate __attribute__ ((visibility("hidden")))
    5759#else
    5860#  define _DesignToolsExport
     61#  define _DesignToolsPrivate
    5962#endif
    6063
  • code/branches/kicklib/src/modules/notifications/NotificationsPrereqs.h

    r7403 r8071  
    5353#    endif
    5454#  endif
    55 #elif defined ( ORXONOX_GCC_VISIBILITY )
     55#  define _NotificationsPrivate
     56#elif defined (ORXONOX_GCC_VISIBILITY)
    5657#  define _NotificationsExport  __attribute__ ((visibility("default")))
     58#  define _NotificationsPrivate __attribute__ ((visibility("hidden")))
    5759#else
    5860#  define _NotificationsExport
     61#  define _NotificationsPrivate
    5962#endif
    6063
  • code/branches/kicklib/src/modules/objects/ObjectsPrereqs.h

    r7601 r8071  
    5353#    endif
    5454#  endif
    55 #elif defined ( ORXONOX_GCC_VISIBILITY )
     55#  define _ObjectsPrivate
     56#elif defined (ORXONOX_GCC_VISIBILITY)
    5657#  define _ObjectsExport  __attribute__ ((visibility("default")))
     58#  define _ObjectsPrivate __attribute__ ((visibility("hidden")))
    5759#else
    5860#  define _ObjectsExport
     61#  define _ObjectsPrivate
    5962#endif
    6063
  • code/branches/kicklib/src/modules/overlays/OverlaysPrereqs.h

    r7935 r8071  
    5353#    endif
    5454#  endif
    55 #elif defined ( ORXONOX_GCC_VISIBILITY )
     55#  define _OverlaysPrivate
     56#elif defined (ORXONOX_GCC_VISIBILITY)
    5657#  define _OverlaysExport  __attribute__ ((visibility("default")))
     58#  define _OverlaysPrivate __attribute__ ((visibility("hidden")))
    5759#else
    5860#  define _OverlaysExport
     61#  define _OverlaysPrivate
    5962#endif
    6063
  • code/branches/kicklib/src/modules/pickup/PickupPrereqs.h

    r7163 r8071  
    5353#    endif
    5454#  endif
    55 #elif defined ( ORXONOX_GCC_VISIBILITY )
     55#  define _PickupPrivate
     56#elif defined (ORXONOX_GCC_VISIBILITY)
    5657#  define _PickupExport  __attribute__ ((visibility("default")))
     58#  define _PickupPrivate __attribute__ ((visibility("hidden")))
    5759#else
    5860#  define _PickupExport
     61#  define _PickupPrivate
    5962#endif
    6063
  • code/branches/kicklib/src/modules/pong/PongPrereqs.h

    r7163 r8071  
    5353#    endif
    5454#  endif
    55 #elif defined ( ORXONOX_GCC_VISIBILITY )
     55#  define _PongPrivate
     56#elif defined (ORXONOX_GCC_VISIBILITY)
    5657#  define _PongExport  __attribute__ ((visibility("default")))
     58#  define _PongPrivate __attribute__ ((visibility("hidden")))
    5759#else
    5860#  define _PongExport
     61#  define _PongPrivate
    5962#endif
    6063
  • code/branches/kicklib/src/modules/questsystem/QuestEffect.cc

    r7456 r8071  
    6868    /*static*/ bool QuestEffect::invokeEffects(PlayerInfo* player, std::list<QuestEffect*> & effects)
    6969    {
    70         bool check = true;
     70        bool temp = true;
    7171
    7272        COUT(4) << "Invoking QuestEffects on player: " << player << " ."  << std::endl;
    7373
    7474        for (std::list<QuestEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)
    75             check = check && (*effect)->invoke(player);
     75            temp = temp && (*effect)->invoke(player);
    7676
    77         return check;
     77        return temp;
    7878    }
    7979
  • code/branches/kicklib/src/modules/questsystem/QuestEffectBeacon.cc

    r7552 r8071  
    143143        COUT(4) << "QuestEffectBeacon executed on player: " << player << " ." << std::endl;
    144144
    145         bool check = QuestEffect::invokeEffects(player, this->effects_); // Invoke the QuestEffects on the PlayerInfo.
    146         if(check)
     145        bool temp = QuestEffect::invokeEffects(player, this->effects_); // Invoke the QuestEffects on the PlayerInfo.
     146        if(temp)
    147147        {
    148148            this->decrementTimes(); // Decrement the number of times the beacon can be used.
  • code/branches/kicklib/src/modules/questsystem/QuestsystemPrereqs.h

    r7474 r8071  
    5353#    endif
    5454#  endif
    55 #elif defined ( ORXONOX_GCC_VISIBILITY )
     55#  define _QuestsystemPrivate
     56#elif defined (ORXONOX_GCC_VISIBILITY)
    5657#  define _QuestsystemExport  __attribute__ ((visibility("default")))
     58#  define _QuestsystemPrivate __attribute__ ((visibility("hidden")))
    5759#else
    5860#  define _QuestsystemExport
     61#  define _QuestsystemPrivate
    5962#endif
    6063
  • code/branches/kicklib/src/modules/questsystem/effects/AddReward.cc

    r7456 r8071  
    105105        COUT(5) << "AddReward on player: " << player << " ." << std::endl;
    106106
    107         bool check = true;
     107        bool temp = true;
    108108        for ( std::list<Rewardable*>::iterator reward = this->rewards_.begin(); reward != this->rewards_.end(); ++reward )
    109             check = check && (*reward)->reward(player);
     109            temp = temp && (*reward)->reward(player);
    110110
    111111        COUT(4) << "Rewardable successfully added to player." << player << " ." << std::endl;
    112112
    113         return check;
     113        return temp;
    114114    }
    115115
  • code/branches/kicklib/src/modules/weapons/WeaponsPrereqs.h

    r7846 r8071  
    5353#    endif
    5454#  endif
    55 #elif defined ( ORXONOX_GCC_VISIBILITY )
     55#  define _WeaponsPrivate
     56#elif defined (ORXONOX_GCC_VISIBILITY)
    5657#  define _WeaponsExport  __attribute__ ((visibility("default")))
     58#  define _WeaponsPrivate __attribute__ ((visibility("hidden")))
    5759#else
    5860#  define _WeaponsExport
     61#  define _WeaponsPrivate
    5962#endif
    6063
Note: See TracChangeset for help on using the changeset viewer.