summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-11-25 01:35:20 +0100
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-11-25 01:35:20 +0100
commitbdf3e3b9c91dc1531a44b1cabaaf598f16d377e8 (patch)
tree51ad716f804c7ce5b954cbb4911a8e35666728f6 /common
parenta265fcaf73543d028b44a10fbbca2b18979f3845 (diff)
Remove Action::player and turn Action::target into an int.
Diffstat (limited to 'common')
-rw-r--r--common/action.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/common/action.h b/common/action.h
index bae22cf..7ad84ee 100644
--- a/common/action.h
+++ b/common/action.h
@@ -22,17 +22,16 @@ class Action {
//! Type of action.
Type type;
- //! Targets of action (if applicable).
- std::vector<int> target;
-
- //! Player doing this action
- int player;
+ //! Target of action (if applicable).
+ int target;
+
+ //! Compare to another action.
+ bool operator==(Action other);
template<class Archive>
void serialize(Archive & ar, const unsigned int version) {
ar & type;
ar & target;
- ar & player;
}
};