Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/core/entity.cc8
-rw-r--r--src/core/entity.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 96b0f8f..f25bef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,11 +5,11 @@
------------------------------------------------------------------
- * build-0.2.5-svn1327
+ * build-0.2.5-svn1328
2013-09-29
- src revision 1327
+ src revision 1328
- Replaced the inventory mount button with an in-place mount indicator,
- Binds 'X' key to target other players.
diff --git a/src/core/entity.cc b/src/core/entity.cc
index b7d7646..8ea0db5 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -1281,17 +1281,17 @@ void EntityControlable::set_target_controlflags(int controlflags)
}
}
-void EntityControlable::set_target_controlflag(const ControlFlag controlflag)
+void EntityControlable::set_target_controlflag(const ControlFlags controlflag)
{
- if (!has_controlflag(controlflag);
+ if (!has_controlflag(controlflag)) {
target_controlflags = target_controlflags | controlflag;
set_dirty();
}
}
-void EntityControlable::unset_target_controlflag(const ControlFlag controlflag)
+void EntityControlable::unset_target_controlflag(const ControlFlags controlflag)
{
- if (has_controlflag(controlflag);
+ if (has_controlflag(controlflag)) {
target_controlflags = target_controlflags & ~controlflag;
set_dirty();
}
diff --git a/src/core/entity.h b/src/core/entity.h
index c748e98..90f350e 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -789,10 +789,10 @@ public:
void set_target_controlflags(int controlflags);
/// set target control flags
- void set_target_controlflag(const ControlFlag controlflag);
+ void set_target_controlflag(const ControlFlags controlflag);
/// unset target control flag
- void unset_target_controlflag(const ControlFlag controlflag);
+ void unset_target_controlflag(const ControlFlags controlflag);
/**
* @brief set the zone the entity is currently in