/[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.83 by reallysoft, Sun May 18 15:17:13 2003 UTC revision 1.84 by reallysoft, Mon May 19 12:14:35 2003 UTC
# Line 61  world::PerformAction(Object *o, bool ono Line 61  world::PerformAction(Object *o, bool ono
61      else if (action == "signal") {      else if (action == "signal") {
62          world::EmitSignals (o);          world::EmitSignals (o);
63      }      }
64      else if (Object *o = GetNamedObject(target)) {      else if (Object *t = GetNamedObject(target)) {
65          SendMessage(o, action);          SendMessage(t, action);
66      }      }
67      else {      else {
68          fprintf(stderr, "Unknown target '%s' for action '%s'\n", target.c_str(), action.c_str());          fprintf(stderr, "Unknown target '%s' for action '%s'\n", target.c_str(), action.c_str());
# Line 79  Object::Object(const char *kind) Line 79  Object::Object(const char *kind)
79  }  }
80    
81  void  void
82  Object::message(const string& msg, const Value &val)  Object::message(const string& /*msg*/, const Value &/*val*/)
83  {  {
84  }  }
85    
# Line 223  GridObject::play_sound(const char *name) Line 223  GridObject::play_sound(const char *name)
223  void  void
224  GridObject::warning(const char *format, ...) const {  GridObject::warning(const char *format, ...) const {
225      va_list        arg_ptr;      va_list        arg_ptr;
226      const GridPos& pos = get_pos();      const GridPos& position = get_pos();
227    
228      va_start(arg_ptr, format);      va_start(arg_ptr, format);
229      cerr << setbase(16) << long(this) << " \"" << get_kind() << '\"'      cerr << setbase(16) << long(this) << " \"" << get_kind() << '\"'
230           << setbase(8) << " at " << pos.x << '/' << pos.y << ": "           << setbase(8) << " at " << position.x << '/' << position.y << ": "
231           << vstrf(format, arg_ptr) << '\n';           << vstrf(format, arg_ptr) << '\n';
232      va_end(arg_ptr);      va_end(arg_ptr);
233  }  }
# Line 239  GridObject::warning(const char *format, Line 239  GridObject::warning(const char *format,
239  // FLOORS  // FLOORS
240  //======================================================================  //======================================================================
241    
242  Floor::Floor(const char *kind, double friction, double mfactor)  Floor::Floor(const char *kind, double friction_, double mfactor)
243  : TGridObject<GRID_FLOOR>(kind),  : TGridObject<GRID_FLOOR>(kind),
244    traits (kind, friction, mfactor, FLOOR_Normal)    traits (kind, friction_, mfactor, FLOOR_Normal)
245  {  {
246  }  }
247    
# Line 260  void Floor::dispose() { Line 260  void Floor::dispose() {
260  }  }
261    
262  void  void
263  Floor::message(const string& msg, const Value &val)  Floor::message(const string& /*msg*/, const Value &/*val*/)
264  {  {
265  }  }
266    
# Line 377  void Gradient::init_model() Line 377  void Gradient::init_model()
377  }  }
378    
379  px::V2  px::V2
380  Gradient::get_force(Actor *a)  Gradient::get_force(Actor */*a*/)
381  {  {
382      V2 force;      V2 force;
383      int t = get_type();      int t = get_type();

Legend:
Removed from v.1.83  
changed lines
  Added in v.1.84

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