Changeset 8194 for code/branches/dockingsystem/src/modules/overlays/hud/GametypeStatus.h

Timestamp:

Apr 6, 2011, 12:07:29 PM (13 years ago)

Author:

dafrick

Message:

Merging trunk into dockingsystem branch to be able to use the recent bugfix in MultiTrigger.

Location:

code/branches/dockingsystem

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/GametypeStatus.h (modified) (1 diff)

code/branches/dockingsystem/src/modules/overlays/hud/GametypeStatus.h

@@ -49 +49 @@
 
         private:
+            //Gametype* game_;
             PlayerInfo* owner_;
             bool bNoCaption_;
+            //bool bForcedSpawn_;
 
     };