Changeset 9008 in orxonox.OLD for trunk/src/util/game_rules.h

Timestamp:

Jul 2, 2006, 2:22:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD ​https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

File:

• trunk/src/util/game_rules.h (modified) (2 diffs)

trunk/src/util/game_rules.h

@@ -9 +9 @@
 
 #include "base_object.h"
+#include <list>
 #include <vector>
 
@@ -54 +55 @@
     std::vector<MissionGoal*>   missionList;            //!< list of mission goals
 
-    std::vector<Kill>          killList;               //!<  list of kills in the world
+    std::list<Kill>             killList;               //!<  list of kills in the world
 };