[Enigma-cvs] enigma/src lua.cc,1.15,1.16

[Ralf Westram <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv5276/src

Modified Files:
        lua.cc 
Log Message:
- sorted commands
- enigma.GetPos returns most covered grid position for specific actors



Index: lua.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/lua.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** lua.cc      13 Jul 2003 19:30:29 -0000      1.15
--- lua.cc      23 Oct 2003 20:21:50 -0000      1.16
***************
*** 321,324 ****
--- 321,327 ----
      if (world::GridObject *gobj = dynamic_cast<world::GridObject*>(obj))
          p = gobj->get_pos();
+     else if (world::Actor *a = dynamic_cast<world::Actor*>(obj)) {
+         p = GridPos(a->get_pos());
+     }
      else
          p = GridPos(-1, -1);
***************
*** 417,444 ****
  
  static CFunction luafuncs[] = {
!     {en_set_attrib,         "SetAttrib"},
!     {en_get_attrib,         "GetAttrib"},
!     {en_make_object,        "MakeObject"},
      {get_object_template,   "GetObjectTemplate"},
!     {en_set_floor,          "SetFloor"},
!     {en_set_item,           "SetItem"},
!     {en_set_stone,          "SetStone"},
!     {en_kill_stone,         "KillStone"},
!     {en_kill_item,          "KillItem"},
      {en_set_actor,          "SetActor"},
!     {en_send_message,       "SendMessage"},
!     {en_play_sound,         "PlaySound"},
!     {en_name_object,        "NameObject"},
      {en_get_named_object,   "GetNamedObject"},
      {en_get_floor,          "GetFloor"},
      {en_get_item,           "GetItem"},
      {en_get_stone,          "GetStone"},
      {en_get_pos,            "GetPos"},
      {add_constant_force,    "AddConstantForce"},
      {add_rubber_band,       "AddRubberBand"},
-     {lua::FindDataFile,     "FindDataFile"},
-     {get_ticks,             "GetTicks"},
      {en_add_scramble,       "AddScramble"},
      {en_set_scramble_intensity, "SetScrambleIntensity"},
      {0,0}
  };
--- 420,470 ----
  
  static CFunction luafuncs[] = {
! 
!     // internal functions
! 
!     {lua::FindDataFile,     "FindDataFile"},
      {get_object_template,   "GetObjectTemplate"},
!     {en_make_object,        "MakeObject"},
      {en_set_actor,          "SetActor"},
! 
!     // finding objects
! 
      {en_get_named_object,   "GetNamedObject"},
+ 
      {en_get_floor,          "GetFloor"},
      {en_get_item,           "GetItem"},
      {en_get_stone,          "GetStone"},
+ 
+     // information from objects
+ 
      {en_get_pos,            "GetPos"},
+     {en_get_attrib,         "GetAttrib"},
+ 
+     // manipulating objects
+ 
+     {en_set_attrib,         "SetAttrib"},
+     {en_send_message,       "SendMessage"},
+     {en_name_object,        "NameObject"},
+     {en_play_sound,         "PlaySound"},
+ 
+     // manipulating level
+ 
+     {en_set_floor,          "SetFloor"},
+     {en_set_item,           "SetItem"},
+     {en_set_stone,          "SetStone"},
+ 
+     {en_kill_stone,         "KillStone"},
+     {en_kill_item,          "KillItem"},
+ 
+     // access/modify global data
+ 
+     {get_ticks,             "GetTicks"},
+ 
      {add_constant_force,    "AddConstantForce"},
      {add_rubber_band,       "AddRubberBand"},
      {en_add_scramble,       "AddScramble"},
      {en_set_scramble_intensity, "SetScrambleIntensity"},
+ 
+ 
      {0,0}
  };