Context Navigation

ClientInformation.h

Timestamp:

Feb 14, 2009, 10:17:35 PM (16 years ago)

Author:

rgrieder

Message:

Merged presentation branch back to trunk.

Location:

code/trunk

Files:

Property svn:mergeinfo changed

/code/branches/lodfinal (added)	merged: 2372,2380,2388,2394-2395,2402,2411
/code/branches/network (added)	merged: 2356
/code/branches/network64 (added)	merged: 2210-2211,2245-2247,2255,2307,2309-2312,2316,2355
/code/branches/objecthierarchy2 (added)	merged: 2172-2176,2182,2207,2212-2213,2254,2256-2257,2259,2343-2345,2350,2358,2361-2365,2369,2396,2400,2406,2414,2422,2428,2437-2438,2441,2447,2449-2450,2461-2462,2467,2478-2479
/code/branches/overlay (added)	merged: 2117-2118,2120,2140,2152,2180-2181,2200,2222,2225,2320
/code/branches/physics (added)	merged: 1913,1919-1920,1922-1925,1933,1963-1967,1971-1974,1983-1988,1995,2047,2121-2122,2124,2141,2147-2151,2177-2179,2183-2185,2187-2190,2192,2201,2291-2292,2296-2306,2313-2315,2321,2323,2373-2374,2377,2403-2405,2407-2408,2421,2423-2427,2429-2434
/code/branches/physics_merge (added)	merged: 2439-2440,2442-2446,2448,2451-2457
/code/branches/pickups2 (added)	merged: 2110,2136,2202,2227,2289-2290,2293-2294,2324,2342,2389,2397
/code/branches/presentation (added)	merged: 2370-2371,2378,2381-2382,2385,2387,2413,2415-2420,2435-2436,2459-2460,2463-2466,2468-2477,2480-2506,2513-2515,2527,2535-2545,2548-2565,2571,2575,2578,2655,2660
/code/branches/weapon2 (added)	merged: 2108,2145,2186,2203,2232,2272-2273,2288,2308,2319,2327,2331,2337,2347,2354,2366-2368,2379,2391,2393,2398,2410

-                      r2171
+                      r2662
 #include <boost/thread/recursive_mutex.hpp>
 // WATCH OUT: THE CLIENTINFORMATION LIST IS NOT THREADSAFE ANYMORE
 namespace orxonox
+{
-  static const unsigned int GAMESTATEID_INITIAL = (unsigned int)-1;
-  static const unsigned int CLIENTID_UNKNOWN = (unsigned int)-2;
   /**

Note: See TracChangeset for help on using the changeset viewer.