Changeset 7221 in orxonox.OLD for trunk/src/util/multiplayer_team_deathmatch.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/util/multiplayer_team_deathmatch.h (modified) (1 diff)

trunk/src/util/multiplayer_team_deathmatch.h

@@ -38 +38 @@
     inline void setDeathPenaltyTimeout(float time) { this->deathTimeout = time; }
     inline void setMaxKills(int kills) { this->maxKills = kills; }
-    void setDeathScreen(const char* imageName);
+    void setDeathScreen(const std::string& imageName);
 
   protected: