Dropped the & from the Lua function tables

It's not actually necessary.

1 files changed, 149 insertions, 149 deletions

diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp
index f2a0779..8f4a051 100644
--- a/src/scripting/lua.cpp
+++ b/src/scripting/lua.cpp
@@ -3638,59 +3638,59 @@ LuaScript::LuaScript():
 
     // Put the callback functions in the scripting environment.
     static luaL_Reg const callbacks[] = {
-        { "on_update_derived_attribute",     &on_update_derived_attribute     },
-        { "on_recalculate_base_attribute",   &on_recalculate_base_attribute   },
-        { "on_character_death",              &on_character_death              },
-        { "on_character_death_accept",       &on_character_death_accept       },
-        { "on_character_login",              &on_character_login              },
-        { "on_being_death",                  &on_being_death                  },
-        { "on_entity_remove",                &on_entity_remove                },
-        { "on_update",                       &on_update                       },
-        { "on_create_npc_delayed",           &on_create_npc_delayed           },
-        { "on_map_initialize",               &on_map_initialize               },
-        { "on_craft",                        &on_craft                        },
-        { "on_mapvar_changed",               &on_mapvar_changed               },
-        { "on_worldvar_changed",             &on_worldvar_changed             },
-        { "on_mapupdate",                    &on_mapupdate                    },
-        { "get_item_class",                  &get_item_class                  },
-        { "get_monster_class",               &get_monster_class               },
-        { "get_status_effect",               &get_status_effect               },
-        { "npc_create",                      &npc_create                      },
-        { "say",                             &say                             },
-        { "ask",                             &ask                             },
-        { "ask_number",                      &ask_number                      },
-        { "ask_string",                      &ask_string                      },
-        { "trade",                           &trade                           },
-        { "npc_post",                        &npc_post                        },
-        { "npc_enable",                      &npc_enable                      },
-        { "npc_disable",                     &npc_disable                     },
-        { "chr_get_quest",                   &chr_get_quest                   },
-        { "chr_set_quest",                   &chr_set_quest                   },
-        { "chr_request_quest",               &chr_request_quest               },
-        { "chr_try_get_quest",               &chr_try_get_quest               },
-        { "getvar_map",                      &getvar_map                      },
-        { "setvar_map",                      &setvar_map                      },
-        { "getvar_world",                    &getvar_world                    },
-        { "setvar_world",                    &setvar_world                    },
-        { "chr_get_post",                    &chr_get_post                    },
-        { "xp_for_level",                    &xp_for_level                    },
-        { "monster_create",                  &monster_create                  },
-        { "trigger_create",                  &trigger_create                  },
-        { "get_beings_in_circle",            &get_beings_in_circle            },
-        { "get_beings_in_rectangle",         &get_beings_in_rectangle         },
-        { "get_character_by_name",           &get_character_by_name           },
-        { "effect_create",                   &effect_create                   },
-        { "test_tableget",                   &test_tableget                   },
-        { "get_map_id",                      &get_map_id                      },
-        { "get_map_property",                &get_map_property                },
-        { "is_walkable",                     &is_walkable                     },
-        { "map_get_pvp",                     &map_get_pvp                     },
-        { "item_drop",                       &item_drop                       },
-        { "log",                             &log                             },
-        { "get_distance",                    &get_distance                    },
-        { "map_get_objects",                 &map_get_objects                 },
-        { "announce",                        &announce                        },
-        { "get_special_info",                &get_special_info                },
+        { "on_update_derived_attribute",    on_update_derived_attribute       },
+        { "on_recalculate_base_attribute",  on_recalculate_base_attribute     },
+        { "on_character_death",             on_character_death                },
+        { "on_character_death_accept",      on_character_death_accept         },
+        { "on_character_login",             on_character_login                },
+        { "on_being_death",                 on_being_death                    },
+        { "on_entity_remove",               on_entity_remove                  },
+        { "on_update",                      on_update                         },
+        { "on_create_npc_delayed",          on_create_npc_delayed             },
+        { "on_map_initialize",              on_map_initialize                 },
+        { "on_craft",                       on_craft                          },
+        { "on_mapvar_changed",              on_mapvar_changed                 },
+        { "on_worldvar_changed",            on_worldvar_changed               },
+        { "on_mapupdate",                   on_mapupdate                      },
+        { "get_item_class",                 get_item_class                    },
+        { "get_monster_class",              get_monster_class                 },
+        { "get_status_effect",              get_status_effect                 },
+        { "npc_create",                     npc_create                        },
+        { "say",                            say                               },
+        { "ask",                            ask                               },
+        { "ask_number",                     ask_number                        },
+        { "ask_string",                     ask_string                        },
+        { "trade",                          trade                             },
+        { "npc_post",                       npc_post                          },
+        { "npc_enable",                     npc_enable                        },
+        { "npc_disable",                    npc_disable                       },
+        { "chr_get_quest",                  chr_get_quest                     },
+        { "chr_set_quest",                  chr_set_quest                     },
+        { "chr_request_quest",              chr_request_quest                 },
+        { "chr_try_get_quest",              chr_try_get_quest                 },
+        { "getvar_map",                     getvar_map                        },
+        { "setvar_map",                     setvar_map                        },
+        { "getvar_world",                   getvar_world                      },
+        { "setvar_world",                   setvar_world                      },
+        { "chr_get_post",                   chr_get_post                      },
+        { "xp_for_level",                   xp_for_level                      },
+        { "monster_create",                 monster_create                    },
+        { "trigger_create",                 trigger_create                    },
+        { "get_beings_in_circle",           get_beings_in_circle              },
+        { "get_beings_in_rectangle",        get_beings_in_rectangle           },
+        { "get_character_by_name",          get_character_by_name             },
+        { "effect_create",                  effect_create                     },
+        { "test_tableget",                  test_tableget                     },
+        { "get_map_id",                     get_map_id                        },
+        { "get_map_property",               get_map_property                  },
+        { "is_walkable",                    is_walkable                       },
+        { "map_get_pvp",                    map_get_pvp                       },
+        { "item_drop",                      item_drop                         },
+        { "log",                            log                               },
+        { "get_distance",                   get_distance                      },
+        { "map_get_objects",                map_get_objects                   },
+        { "announce",                       announce                          },
+        { "get_special_info",               get_special_info                  },
         { NULL, NULL }
     };
 #if LUA_VERSION_NUM < 502
@@ -3703,130 +3703,130 @@ LuaScript::LuaScript():
     lua_pop(mRootState, 1);                     // pop the globals table
 
     static luaL_Reg const members_AttackInfo[] = {
-        { "priority",                        &attack_get_priority             },
-        { "cooldowntime",                    &attack_get_cooldowntime         },
-        { "warmuptime",                      &attack_get_warmuptime           },
-        { "reusetime",                       &attack_get_reusetime            },
-        { "damage",                          &attack_get_damage               },
-        { "on_attack",                       &attack_on_attack                },
+        { "priority",                       attack_get_priority               },
+        { "cooldowntime",                   attack_get_cooldowntime           },
+        { "warmuptime",                     attack_get_warmuptime             },
+        { "reusetime",                      attack_get_reusetime              },
+        { "damage",                         attack_get_damage                 },
+        { "on_attack",                      attack_on_attack                  },
         { NULL, NULL }
     };
 
     static luaL_Reg const members_Damage[] = {
-        { "id",                              &damage_get_id                   },
-        { "skill",                           &damage_get_skill                },
-        { "base",                            &damage_get_base                 },
-        { "delta",                           &damage_get_delta                },
-        { "cth",                             &damage_get_cth                  },
-        { "element",                         &damage_get_element              },
-        { "type",                            &damage_get_type                 },
-        { "is_truestrike",                   &damage_is_truestrike            },
-        { "range",                           &damage_get_range                },
+        { "id",                             damage_get_id                     },
+        { "skill",                          damage_get_skill                  },
+        { "base",                           damage_get_base                   },
+        { "delta",                          damage_get_delta                  },
+        { "cth",                            damage_get_cth                    },
+        { "element",                        damage_get_element                },
+        { "type",                           damage_get_type                   },
+        { "is_truestrike",                  damage_is_truestrike              },
+        { "range",                          damage_get_range                  },
         { NULL, NULL }
     };
 
     static luaL_Reg const members_Entity[] = {
-        { "remove",                          &entity_remove                   },
-        { "say",                             &entity_say                      },
-        { "message",                         &entity_message                  },
-        { "inventory",                       &entity_get_inventory            },
-        { "inv_change",                      &entity_inv_change               },
-        { "inv_count",                       &entity_inv_count                },
-        { "equipment",                       &entity_get_equipment            },
-        { "equip_slot",                      &entity_equip_slot               },
-        { "equip_item",                      &entity_equip_item               },
-        { "unequip_slot",                    &entity_unequip_slot             },
-        { "unequip_item",                    &entity_unequip_item             },
-        { "set_special_recharge_speed",      &entity_set_special_recharge_speed },
-        { "special_recharge_speed",          &entity_get_special_recharge_speed },
-        { "set_special_mana",                &entity_set_special_mana         },
-        { "special_mana",                    &entity_get_special_mana         },
-        { "walk",                            &entity_walk                     },
-        { "damage",                          &entity_damage                   },
-        { "heal",                            &entity_heal                     },
-        { "name",                            &entity_get_name                 },
-        { "type",                            &entity_get_type                 },
-        { "action",                          &entity_get_action               },
-        { "set_action",                      &entity_set_action               },
-        { "direction",                       &entity_get_direction            },
-        { "set_direction",                   &entity_set_direction            },
-        { "set_walkmask",                    &entity_set_walkmask             },
-        { "walkmask",                        &entity_get_walkmask             },
-        { "warp",                            &entity_warp                     },
-        { "position",                        &entity_get_position             },
-        { "x",                               &entity_get_x                    },
-        { "y",                               &entity_get_y                    },
-        { "base_attribute",                  &entity_get_base_attribute       },
-        { "set_base_attribute",              &entity_set_base_attribute       },
-        { "modified_attribute",              &entity_get_modified_attribute   },
-        { "apply_attribute_modifier",        &entity_apply_attribute_modifier },
-        { "remove_attribute_modifier",       &entity_remove_attribute_modifier },
-        { "gender",                          &entity_get_gender               },
-        { "set_gender",                      &entity_set_gender               },
-        { "level",                           &entity_get_level                },
-        { "xp",                              &entity_get_xp                   },
-        { "give_xp",                         &entity_give_xp                  },
-        { "hair_color",                      &entity_get_hair_color           },
-        { "set_hair_color",                  &entity_set_hair_color           },
-        { "hair_style",                      &entity_get_hair_style           },
-        { "set_hair_style",                  &entity_set_hair_style           },
-        { "kill_count",                      &entity_get_kill_count           },
-        { "rights",                          &entity_get_rights               },
-        { "kick",                            &entity_kick                     },
-        { "mapid",                           &entity_get_mapid                },
-        { "register",                        &entity_register                 },
-        { "shake_screen",                    &entity_shake_screen             },
-        { "show_text_particle",              &entity_show_text_particle       },
-        { "give_special",                    &entity_give_special             },
-        { "has_special",                     &entity_has_special              },
-        { "take_special",                    &entity_take_special             },
-        { "monster_id",                      &entity_get_monster_id           },
-        { "change_anger",                    &entity_change_anger             },
-        { "drop_anger",                      &entity_drop_anger               },
-        { "angerlist",                       &entity_get_angerlist            },
-        { "apply_status",                    &entity_apply_status             },
-        { "remove_status",                   &entity_remove_status            },
-        { "has_status",                      &entity_has_status               },
-        { "status_time",                     &entity_get_status_time          },
-        { "set_status_time",                 &entity_set_status_time          },
+        { "remove",                         entity_remove                     },
+        { "say",                            entity_say                        },
+        { "message",                        entity_message                    },
+        { "inventory",                      entity_get_inventory              },
+        { "inv_change",                     entity_inv_change                 },
+        { "inv_count",                      entity_inv_count                  },
+        { "equipment",                      entity_get_equipment              },
+        { "equip_slot",                     entity_equip_slot                 },
+        { "equip_item",                     entity_equip_item                 },
+        { "unequip_slot",                   entity_unequip_slot               },
+        { "unequip_item",                   entity_unequip_item               },
+        { "set_special_recharge_speed",     entity_set_special_recharge_speed },
+        { "special_recharge_speed",         entity_get_special_recharge_speed },
+        { "set_special_mana",               entity_set_special_mana           },
+        { "special_mana",                   entity_get_special_mana           },
+        { "walk",                           entity_walk                       },
+        { "damage",                         entity_damage                     },
+        { "heal",                           entity_heal                       },
+        { "name",                           entity_get_name                   },
+        { "type",                           entity_get_type                   },
+        { "action",                         entity_get_action                 },
+        { "set_action",                     entity_set_action                 },
+        { "direction",                      entity_get_direction              },
+        { "set_direction",                  entity_set_direction              },
+        { "set_walkmask",                   entity_set_walkmask               },
+        { "walkmask",                       entity_get_walkmask               },
+        { "warp",                           entity_warp                       },
+        { "position",                       entity_get_position               },
+        { "x",                              entity_get_x                      },
+        { "y",                              entity_get_y                      },
+        { "base_attribute",                 entity_get_base_attribute         },
+        { "set_base_attribute",             entity_set_base_attribute         },
+        { "modified_attribute",             entity_get_modified_attribute     },
+        { "apply_attribute_modifier",       entity_apply_attribute_modifier   },
+        { "remove_attribute_modifier",      entity_remove_attribute_modifier  },
+        { "gender",                         entity_get_gender                 },
+        { "set_gender",                     entity_set_gender                 },
+        { "level",                          entity_get_level                  },
+        { "xp",                             entity_get_xp                     },
+        { "give_xp",                        entity_give_xp                    },
+        { "hair_color",                     entity_get_hair_color             },
+        { "set_hair_color",                 entity_set_hair_color             },
+        { "hair_style",                     entity_get_hair_style             },
+        { "set_hair_style",                 entity_set_hair_style             },
+        { "kill_count",                     entity_get_kill_count             },
+        { "rights",                         entity_get_rights                 },
+        { "kick",                           entity_kick                       },
+        { "mapid",                          entity_get_mapid                  },
+        { "register",                       entity_register                   },
+        { "shake_screen",                   entity_shake_screen               },
+        { "show_text_particle",             entity_show_text_particle         },
+        { "give_special",                   entity_give_special               },
+        { "has_special",                    entity_has_special                },
+        { "take_special",                   entity_take_special               },
+        { "monster_id",                     entity_get_monster_id             },
+        { "change_anger",                   entity_change_anger               },
+        { "drop_anger",                     entity_drop_anger                 },
+        { "angerlist",                      entity_get_angerlist              },
+        { "apply_status",                   entity_apply_status               },
+        { "remove_status",                  entity_remove_status              },
+        { "has_status",                     entity_has_status                 },
+        { "status_time",                    entity_get_status_time            },
+        { "set_status_time",                entity_set_status_time            },
         { NULL, NULL }
     };
 
     static luaL_Reg const members_ItemClass[] = {
-        { "on",                              &item_class_on                   },
-        { "name",                            &item_class_get_name             },
-        { "attacks",                         &item_class_attacks              },
+        { "on",                             item_class_on                     },
+        { "name",                           item_class_get_name               },
+        { "attacks",                        item_class_attacks                },
         { NULL, NULL }
     };
 
     static luaL_Reg const members_MapObject[] = {
-        { "property",                        &map_object_get_property         },
-        { "bounds",                          &map_object_get_bounds           },
-        { "name",                            &map_object_get_name             },
-        { "type",                            &map_object_get_type             },
+        { "property",                       map_object_get_property           },
+        { "bounds",                         map_object_get_bounds             },
+        { "name",                           map_object_get_name               },
+        { "type",                           map_object_get_type               },
         { NULL, NULL }
     };
 
     static luaL_Reg const members_MonsterClass[] = {
-        { "on_update",                       &monster_class_on_update         },
-        { "on_damage",                       &monster_class_on_damage         },
-        { "name",                            &monster_class_get_name          },
-        { "attacks",                         &monster_class_attacks           },
+        { "on_update",                      monster_class_on_update           },
+        { "on_damage",                      monster_class_on_damage           },
+        { "name",                           monster_class_get_name            },
+        { "attacks",                        monster_class_attacks             },
         { NULL, NULL }
     };
 
     static luaL_Reg const members_StatusEffect[] = {
-        { "on_tick",                         &status_effect_on_tick           },
+        { "on_tick",                        status_effect_on_tick             },
         { NULL, NULL }
     };
 
     static luaL_Reg const members_SpecialInfo[] = {
-        { "name",                            &specialinfo_get_name            },
-        { "needed_mana",                     &specialinfo_get_needed_mana     },
-        { "rechargeable",                    &specialinfo_is_rechargeable     },
-        { "on_use",                          &specialinfo_on_use              },
-        { "on_recharged",                    &specialinfo_on_recharged        },
-        { "category",                        &specialinfo_get_category        },
+        { "name",                           specialinfo_get_name              },
+        { "needed_mana",                    specialinfo_get_needed_mana       },
+        { "rechargeable",                   specialinfo_is_rechargeable       },
+        { "on_use",                         specialinfo_on_use                },
+        { "on_recharged",                   specialinfo_on_recharged          },
+        { "category",                       specialinfo_get_category          },
         { NULL, NULL}
     };