summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-12-13 07:34:19 +0100
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-12-13 07:34:19 +0100
commit392335ddba90464ffeebe1a59114858b350a2ea9 (patch)
tree0553b7df517b6cbee062985c39d052d513e5c64d
parent9470e934ea8201b03e20983cf10ad09f5b3d03d7 (diff)
Changed RoundEnd::yakus to std::pair.
-rw-r--r--common/connectionbase.cpp1
-rw-r--r--common/message.h13
2 files changed, 2 insertions, 12 deletions
diff --git a/common/connectionbase.cpp b/common/connectionbase.cpp
index 9a110f7..e2384e2 100644
--- a/common/connectionbase.cpp
+++ b/common/connectionbase.cpp
@@ -2,6 +2,7 @@
#include <boost/serialization/vector.hpp>
#include <boost/serialization/string.hpp>
+#include <boost/serialization/utility.hpp>
#include <boost/serialization/shared_ptr.hpp>
#include <boost/archive/binary_oarchive.hpp>
#include <boost/archive/binary_iarchive.hpp>
diff --git a/common/message.h b/common/message.h
index cbb46a4..7cddbe3 100644
--- a/common/message.h
+++ b/common/message.h
@@ -244,20 +244,9 @@ namespace Message {
}
};
- struct Yaku {
- std::string name;
- int value;
-
- template<class Archive>
- void serialize(Archive & ar, const unsigned int v) {
- ar & name;
- ar & value;
- }
- };
-
RoundEnd() : Base(Types::RoundEnd) {}
Tiles hand;
- std::vector<Yaku> yakus;
+ std::vector<std::pair<std::string, int> > yakus;
int total_han;
int total_fu;
int won;