/[enigma]/enigma/src/objects.cc
ViewVC logotype

Diff of /enigma/src/objects.cc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.106 by reallysoft, Sat Jul 5 08:27:47 2003 UTC revision 1.107 by reallysoft, Sun Jul 6 12:47:04 2003 UTC
# Line 139  bool Line 139  bool
139  Object::is_kind(const char *kind_templ) const {  Object::is_kind(const char *kind_templ) const {
140      return string_match(get_kind(), kind_templ);      return string_match(get_kind(), kind_templ);
141  }  }
142    bool
143    Object::is_kind(const string& kind_templ) const {
144        return string_match(get_kind(), kind_templ.c_str());
145    }
146    
147  void  void
148  Object::set_attrib(const string& key, const Value& val)  Object::set_attrib(const string& key, const Value& val)
# Line 312  Floor::message(const string& /*msg*/, co Line 316  Floor::message(const string& /*msg*/, co
316    
317  px::V2 Floor::process_mouseforce (Actor *a, px::V2 force)  px::V2 Floor::process_mouseforce (Actor *a, px::V2 force)
318  {  {
319      if (a->int_attrib("player") == player::CurrentPlayer())      if (player::IsCurrentPlayer(a))
320          return mousefactor() * force;          return mousefactor() * force;
321      else      else
322          return V2();          return V2();
# Line 629  namespace Line 633  namespace
633    
634          px::V2 process_mouseforce (Actor *a, px::V2 force)          px::V2 process_mouseforce (Actor *a, px::V2 force)
635          {          {
636              if (a->int_attrib("player") == 0 && player::CurrentPlayer() == 0)              if (player::CurrentPlayer() == 0 && player::IsCurrentPlayer(a))
637                  return mousefactor() * force;                  return mousefactor() * force;
638              else              else
639                  return V2();                  return V2();
# Line 642  namespace Line 646  namespace
646    
647          px::V2 process_mouseforce (Actor *a, px::V2 force)          px::V2 process_mouseforce (Actor *a, px::V2 force)
648          {          {
649              if (a->int_attrib("player") == 1 && player::CurrentPlayer() == 1)              if (player::CurrentPlayer() == 1 && player::IsCurrentPlayer(a))
650                  return mousefactor() * force;                  return mousefactor() * force;
651              else              else
652                  return V2();                  return V2();

Legend:
Removed from v.1.106  
changed lines
  Added in v.1.107

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26