Changeset 3183 for code/branches/pch/src/orxonox/interfaces
- Timestamp:
- Jun 15, 2009, 10:48:12 PM (16 years ago)
- Location:
- code/branches/pch/src/orxonox/interfaces
- Files:
-
- 1 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc
r3181 r3183 37 37 #include "RadarListener.h" 38 38 #include "Rewardable.h" 39 #include "Team colourable.h"39 #include "TeamColourable.h" 40 40 #include "Tickable.h" 41 41 #include "TimeFactorListener.h" … … 74 74 75 75 //---------------------------- 76 // Team colourable76 // TeamColourable 77 77 //---------------------------- 78 Team colourable::Teamcolourable()78 TeamColourable::TeamColourable() 79 79 { 80 RegisterRootObject(Team colourable);80 RegisterRootObject(TeamColourable); 81 81 } 82 82 -
code/branches/pch/src/orxonox/interfaces/TeamColourable.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/buildsystem/src/orxonox/interfaces/Teamcolourable.h 1874-2276,2278-2400 /code/branches/buildsystem2/src/orxonox/interfaces/Teamcolourable.h 2506-2658 /code/branches/buildsystem3/src/orxonox/interfaces/Teamcolourable.h 2662-2708 /code/branches/ceguilua/src/orxonox/interfaces/Teamcolourable.h 1802-1808 /code/branches/core3/src/orxonox/interfaces/Teamcolourable.h 1572-1739 /code/branches/gametypes/src/orxonox/interfaces/Teamcolourable.h 2826-3031 /code/branches/gcc43/src/orxonox/interfaces/Teamcolourable.h 1580 /code/branches/gui/src/orxonox/interfaces/Teamcolourable.h 1635-1723,2795-2894 /code/branches/input/src/orxonox/interfaces/Teamcolourable.h 1629-1636 /code/branches/lodfinal/src/orxonox/interfaces/Teamcolourable.h 2372-2411 /code/branches/map/src/orxonox/interfaces/Teamcolourable.h 2801-3086,3089 /code/branches/miniprojects/src/orxonox/interfaces/Teamcolourable.h 2754-2824 /code/branches/netp2/src/orxonox/interfaces/Teamcolourable.h 2835-2988 /code/branches/netp3/src/orxonox/interfaces/Teamcolourable.h 2988-3082 /code/branches/network/src/orxonox/interfaces/Teamcolourable.h 2356 /code/branches/network64/src/orxonox/interfaces/Teamcolourable.h 2210-2355 /code/branches/objecthierarchy/src/orxonox/interfaces/Teamcolourable.h 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/orxonox/interfaces/Teamcolourable.h 2171-2479 /code/branches/overlay/src/orxonox/interfaces/Teamcolourable.h 2117-2385 /code/branches/particles/src/orxonox/interfaces/Teamcolourable.h 2829-3085 /code/branches/physics/src/orxonox/interfaces/Teamcolourable.h 1912-2055,2107-2439 /code/branches/physics_merge/src/orxonox/interfaces/Teamcolourable.h 2436-2457 /code/branches/pickups/src/orxonox/interfaces/Teamcolourable.h 1926-2086,2127,2827-2915 /code/branches/pickups2/src/orxonox/interfaces/Teamcolourable.h 2107-2497,2915-3071 /code/branches/presentation/src/orxonox/interfaces/Teamcolourable.h 2369-2652,2654-2660 /code/branches/questsystem/src/orxonox/interfaces/Teamcolourable.h 1894-2088 /code/branches/questsystem2/src/orxonox/interfaces/Teamcolourable.h 2107-2259 /code/branches/questsystem5/src/orxonox/interfaces/Teamcolourable.h 2776-2905 /code/branches/script_trigger/src/orxonox/interfaces/Teamcolourable.h 1295-1953,1955 /code/branches/sound/src/orxonox/interfaces/Teamcolourable.h 2829-3010 /code/branches/weapon/src/orxonox/interfaces/Teamcolourable.h 1925-2094 /code/branches/weapon2/src/orxonox/interfaces/Teamcolourable.h 2107-2488 /code/branches/weapons/src/orxonox/interfaces/Teamcolourable.h 2897-3051 /code/branches/weaponsystem/src/orxonox/interfaces/Teamcolourable.h 2742-2890
r3182 r3183 27 27 */ 28 28 29 #ifndef _Team colourable_H__30 #define _Team colourable_H__29 #ifndef _TeamColourable_H__ 30 #define _TeamColourable_H__ 31 31 32 32 #include "OrxonoxPrereqs.h" … … 37 37 namespace orxonox 38 38 { 39 class _OrxonoxExport Team colourable : virtual public OrxonoxClass39 class _OrxonoxExport TeamColourable : virtual public OrxonoxClass 40 40 { 41 41 public: … … 43 43 44 44 protected: 45 Team colourable();45 TeamColourable(); 46 46 }; 47 47 } 48 48 49 #endif /* _Team colourable_H__ */49 #endif /* _TeamColourable_H__ */ -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.