/[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.51 by reallysoft, Thu Apr 24 07:19:24 2003 UTC revision 1.52 by dheck, Sat Apr 26 07:32:41 2003 UTC
# Line 75  world::PerformAction(Object *o, bool ono Line 75  world::PerformAction(Object *o, bool ono
75      if (action == "callback") {      if (action == "callback") {
76          lua::CallFunc(target.c_str(), Value(onoff));          lua::CallFunc(target.c_str(), Value(onoff));
77      }      }
78      else if (action == "oxydsignal") {      else if (action == "signal") {
79            world::EmitSignals (o);
80      }      }
81      else if (Object *o = GetNamedObject(target)) {      else if (Object *o = GetNamedObject(target)) {
82          SendMessage(o, action);          SendMessage(o, action);
# Line 334  and will fall into abyss when the bridge Line 334  and will fall into abyss when the bridge
334  - \b open       open the bridge so actors cannot pass it  - \b open       open the bridge so actors cannot pass it
335  - \b close      close the bridge so actors can pass it  - \b close      close the bridge so actors can pass it
336  - \b openclose  toggle the state of the bridge  - \b openclose  toggle the state of the bridge
337    - \b signal     same as \b openclose
338    
339  */  */
340  namespace  namespace
# Line 373  void Bridge::message(const string &m, co Line 374  void Bridge::message(const string &m, co
374          change_state(OPENING);          change_state(OPENING);
375      else if (m=="close" && (state==OPEN || state==OPENING))      else if (m=="close" && (state==OPEN || state==OPENING))
376          change_state(CLOSING);          change_state(CLOSING);
377      else if (m=="openclose") {      else if (m=="openclose" || m=="signal") {
378          if (state==OPEN || state==OPENING)          if (state==OPEN || state==OPENING)
379              change_state(CLOSING);              change_state(CLOSING);
380          else          else
# Line 1955  DoorBase::message(const string &m, const Line 1956  DoorBase::message(const string &m, const
1956          change_state(OPENING);          change_state(OPENING);
1957      else if (m=="close" && (state==OPEN || state==OPENING))      else if (m=="close" && (state==OPEN || state==OPENING))
1958          change_state(CLOSING);          change_state(CLOSING);
1959      else if (m=="openclose") {      else if (m=="openclose" || m=="signal") {
1960          if (state==OPEN || state==OPENING)          if (state==OPEN || state==OPENING)
1961              change_state(CLOSING);              change_state(CLOSING);
1962          else          else
# Line 2389  namespace Line 2390  namespace
2390  }  }
2391    
2392  LaserSwitch::LaserSwitch()  LaserSwitch::LaserSwitch()
2393      : PhotoStone("st-laserswitch"), state(OFF), model_bak(0)  : PhotoStone("st-laserswitch"), state(OFF), model_bak(0)
2394  {  {
2395  }  }
2396    

Legend:
Removed from v.1.51  
changed lines
  Added in v.1.52

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