summaryrefslogtreecommitdiff
path: root/src/scripting/lua.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripting/lua.cpp')
-rw-r--r--src/scripting/lua.cpp259
1 files changed, 104 insertions, 155 deletions
diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp
index 72456789..c186be8b 100644
--- a/src/scripting/lua.cpp
+++ b/src/scripting/lua.cpp
@@ -1,6 +1,7 @@
/*
* The Mana Server
* Copyright (C) 2007-2010 The Mana World Development Team
+ * Copyright (C) 2010 The Mana Developers
*
* This file is part of The Mana Server.
*
@@ -69,8 +70,8 @@ static int npc_message(lua_State *s)
NPC *p = getNPC(s, 1);
Character *q = getCharacter(s, 2);
size_t l;
- const char *m = lua_tolstring(s, 3, &l);
- if (!p || !q || !m)
+ const char *m = luaL_checklstring(s, 3, &l);
+ if (!p || !q)
{
raiseScriptError(s, "npc_message called with incorrect parameters.");
return 0;
@@ -92,7 +93,7 @@ static int npc_choice(lua_State *s)
Character *q = getCharacter(s, 2);
if (!p || !q)
{
- raiseScriptError(s, "npc_Choice called with incorrect parameters.");
+ raiseScriptError(s, "npc_choice called with incorrect parameters.");
return 0;
}
MessageOut msg(GPMSG_NPC_CHOICE);
@@ -113,7 +114,7 @@ static int npc_choice(lua_State *s)
}
else
{
- raiseScriptError(s, "npc_Choice called with incorrect parameters.");
+ raiseScriptError(s, "npc_choice called with incorrect parameters.");
return 0;
}
lua_pop(s, 1);
@@ -121,7 +122,7 @@ static int npc_choice(lua_State *s)
}
else
{
- raiseScriptError(s, "npc_Choice called with incorrect parameters.");
+ raiseScriptError(s, "npc_choice called with incorrect parameters.");
return 0;
}
}
@@ -185,15 +186,15 @@ static int npc_ask_string(lua_State *s)
*/
static int npc_create(lua_State *s)
{
- if (!lua_isstring(s, 1) || !lua_isnumber(s, 2) || !lua_isnumber(s, 3) || !lua_isnumber(s, 4))
- {
- raiseScriptError(s, "npc_create called with incorrect parameters.");
- return 0;
- }
+ const char *name = luaL_checkstring(s, 1);
+ const int id = luaL_checkint(s, 2);
+ const int x = luaL_checkint(s, 3);
+ const int y = luaL_checkint(s, 4);
+
lua_pushlightuserdata(s, (void *)&registryKey);
lua_gettable(s, LUA_REGISTRYINDEX);
Script *t = static_cast<Script *>(lua_touserdata(s, -1));
- NPC *q = new NPC(lua_tostring(s, 1), lua_tointeger(s, 2), t);
+ NPC *q = new NPC(name, id, t);
MapComposite *m = t->getMap();
if (!m)
{
@@ -201,7 +202,7 @@ static int npc_create(lua_State *s)
return 0;
}
q->setMap(m);
- q->setPosition(Point(lua_tointeger(s, 3), lua_tointeger(s, 4)));
+ q->setPosition(Point(x, y));
bool b = GameState::insert(q);
/* Do not try to deal with a failure there. There are some serious issues
if an insertion failed on an almost empty map. */
@@ -287,10 +288,12 @@ static int npc_disable(lua_State *s)
*/
static int chr_warp(lua_State *s)
{
+ int x = luaL_checkint(s, 3);
+ int y = luaL_checkint(s, 4);
+
Character *q = getCharacter(s, 1);
bool b = lua_isnil(s, 2);
- if (!q || !(b || lua_isnumber(s, 2)) ||
- !lua_isnumber(s, 3) || !lua_isnumber(s, 4))
+ if (!q || !(b || lua_isnumber(s, 2)))
{
raiseScriptError(s, "chr_warp called with incorrect parameters.");
return 0;
@@ -313,9 +316,6 @@ static int chr_warp(lua_State *s)
return 0;
}
- int x = lua_tointeger(s, 3);
- int y = lua_tointeger(s, 4);
-
Map *map = m->getMap();
// If the wanted warp place is unwalkable
@@ -421,13 +421,7 @@ static int chr_inv_count(lua_State *s)
Inventory inv(q);
for (int i = 2; i <= nb_items + 1; ++i)
{
- if (!lua_isnumber(s, i))
- {
- raiseScriptError(s, "chr_inv_count called with incorrect parameters.");
- return 0;
- }
- int id = lua_tointeger(s, i);
- int nb = id ? inv.count(id) : 0;
+ int nb = inv.count(luaL_checkint(s, i));
lua_pushinteger(s, nb);
}
return nb_items;
@@ -545,14 +539,15 @@ static int npc_trade(lua_State *s)
static int being_apply_status(lua_State *s)
{
- if (!lua_isuserdata(s, 1) || !lua_isnumber(s, 2) || !lua_isnumber(s, 3))
+ const int id = luaL_checkint(s, 2);
+ const int time = luaL_checkint(s, 3);
+
+ if (!lua_isuserdata(s, 1))
{
raiseScriptError(s, "being_apply_status called with incorrect parameters.");
return 0;
}
Being *being = getBeing(s, 1);
- int id = lua_tointeger(s, 2);
- int time = lua_tointeger(s, 3);
being->applyStatusEffect(id, time);
return 1;
}
@@ -563,13 +558,15 @@ static int being_apply_status(lua_State *s)
*/
static int being_remove_status(lua_State *s)
{
- if (!lua_isuserdata(s, 1) || !lua_isnumber(s, 2))
+ const int id = luaL_checkint(s, 2);
+
+ if (!lua_isuserdata(s, 1))
{
raiseScriptError(s, "being_remove_status called with incorrect parameters.");
return 0;
}
Being *being = getBeing(s, 1);
- being->removeStatusEffect(lua_tointeger(s,2));
+ being->removeStatusEffect(id);
return 1;
}
@@ -579,13 +576,15 @@ static int being_remove_status(lua_State *s)
*/
static int being_has_status(lua_State *s)
{
- if (!lua_isuserdata(s, 1) || !lua_isnumber(s, 2))
+ const int id = luaL_checkint(s, 2);
+
+ if (!lua_isuserdata(s, 1))
{
raiseScriptError(s, "being_has_status called with incorrect parameters.");
return 0;
}
Being *being = getBeing(s, 1);
- lua_pushboolean(s, being->hasStatusEffect(lua_tointeger(s,2)));
+ lua_pushboolean(s, being->hasStatusEffect(id));
return 1;
}
@@ -595,33 +594,37 @@ static int being_has_status(lua_State *s)
*/
static int being_get_status_time(lua_State *s)
{
- if (!lua_isuserdata(s, 1) || !lua_isnumber(s, 2))
+ const int id = luaL_checkint(s, 2);
+
+ if (!lua_isuserdata(s, 1))
{
raiseScriptError(s, "being_time_status called with incorrect parameters.");
return 0;
}
Being *being = getBeing(s, 1);
- lua_pushinteger(s, being->getStatusEffectTime(lua_tointeger(s,2)));
+ lua_pushinteger(s, being->getStatusEffectTime(id));
return 1;
}
/**
* Sets the time left on the given status effect
- * mana.being_set_status_time(Being *being, int id)
+ * mana.being_set_status_time(Being *being, int id, int time)
*/
static int being_set_status_time(lua_State *s)
{
- if (!lua_isuserdata(s, 1) || !lua_isnumber(s, 2) || !lua_isnumber(s, 3))
+ const int id = luaL_checkint(s, 2);
+ const int time = luaL_checkint(s, 3);
+
+ if (!lua_isuserdata(s, 1))
{
raiseScriptError(s, "being_time_status called with incorrect parameters.");
return 0;
}
Being *being = getBeing(s, 1);
- being->setStatusEffectTime(lua_tointeger(s,2), lua_tointeger(s,3));
+ being->setStatusEffectTime(id, time);
return 1;
}
-
/**
* Returns the Thing type of the given Being
* mana.being_type(Being *being)
@@ -635,7 +638,8 @@ static int being_type(lua_State *s)
}
Being *being = getBeing(s, 1);
- if (!being) return 0;
+ if (!being)
+ return 0;
lua_pushinteger(s, being->getType());
return 1;
}
@@ -643,22 +647,18 @@ static int being_type(lua_State *s)
/**
* Function for making a being walk to a position
- * being_walk(Being *being, int x, int y, int speed)
+ * being_walk(Being *being, int x, int y[, float speed])
* The speed is in tile per second
*/
static int being_walk(lua_State *s)
{
- if (!lua_isnumber(s, 2) || !lua_isnumber(s, 3))
- {
- raiseScriptError(s, "being_walk called with incorrect parameters.");
- return 0;
- }
+ const int x = luaL_checkint(s, 2);
+ const int y = luaL_checkint(s, 3);
lua_pushlightuserdata(s, (void *)&registryKey);
lua_gettable(s, LUA_REGISTRYINDEX);
Being *being = getBeing(s, 1);
- Point destination(lua_tointeger(s, 2), lua_tointeger(s, 3));
- being->setDestination(destination);
+ being->setDestination(Point(x, y));
if (lua_isnumber(s, 4))
{
@@ -676,16 +676,17 @@ static int being_walk(lua_State *s)
*/
static int being_say(lua_State *s)
{
- if (!lua_isuserdata(s, 1) || !lua_isstring(s, 2) )
+ const char *message = luaL_checkstring(s, 2);
+
+ if (!lua_isuserdata(s, 1))
{
raiseScriptError(s, "being_say called with incorrect parameters.");
return 0;
}
Being *being = getBeing(s, 1);
- std::string message = lua_tostring(s, 2);
- if (being && message != "")
+ if (being && message[0] != 0)
{
GameState::sayAround(being, message);
} else {
@@ -913,11 +914,9 @@ static int posY(lua_State *s)
*/
static int monster_create(lua_State *s)
{
- if (!lua_isnumber(s, 1) || !lua_isnumber(s, 2) || !lua_isnumber(s, 3))
- {
- raiseScriptError(s, "monster_create called with incorrect parameters.");
- return 0;
- }
+ const int monsterId = luaL_checkint(s, 1);
+ const int x = luaL_checkint(s, 2);
+ const int y = luaL_checkint(s, 3);
lua_pushlightuserdata(s, (void *)&registryKey);
lua_gettable(s, LUA_REGISTRYINDEX);
@@ -929,7 +928,6 @@ static int monster_create(lua_State *s)
return 0;
}
- int monsterId = lua_tointeger(s, 1);
MonsterClass *spec = monsterManager->getMonster(monsterId);
if (!spec)
{
@@ -940,7 +938,7 @@ static int monster_create(lua_State *s)
Monster *q = new Monster(spec);
q->setMap(m);
- q->setPosition(Point(lua_tointeger(s, 2), lua_tointeger(s, 3)));
+ q->setPosition(Point(x, y));
if (!GameState::insertSafe(q))
{
LOG_WARN("Monster_Create failed to insert monster");
@@ -964,10 +962,10 @@ static int monster_load_script(lua_State *s)
return 0;
}
- std::string scriptName(lua_tostring(s, 2));
- if (scriptName == "")
+ const char *scriptName = luaL_checkstring(s, 2);
+ if (scriptName[0] == 0)
{
- raiseScriptError(s, "monster_load_script called with incorrect parameters.");
+ raiseScriptError(s, "monster_load_script called with empty script file name.");
return 0;
}
@@ -989,10 +987,10 @@ static int chr_get_quest(lua_State *s)
raiseScriptError(s, "chr_get_quest called for nonexistent character.");
}
- const char *m = lua_tostring(s, 2);
- if (!m || m[0] == 0)
+ const char *m = luaL_checkstring(s, 2);
+ if (m[0] == 0)
{
- raiseScriptError(s, "chr_get_quest called with incorrect parameters.");
+ raiseScriptError(s, "chr_get_quest called with empty string.");
return 0;
}
std::string value, name = m;
@@ -1017,9 +1015,9 @@ static int chr_get_quest(lua_State *s)
static int chr_set_quest(lua_State *s)
{
Character *q = getCharacter(s, 1);
- const char *m = lua_tostring(s, 2);
- const char *n = lua_tostring(s, 3);
- if (!m || !n || m[0] == 0 || strlen(m) == 0)
+ const char *m = luaL_checkstring(s, 2);
+ const char *n = luaL_checkstring(s, 3);
+ if (m[0] == 0 || strlen(m) == 0)
{
raiseScriptError(s, "chr_set_quest called with incorrect parameters.");
return 0;
@@ -1040,14 +1038,14 @@ static int chr_set_quest(lua_State *s)
*/
static int trigger_create(lua_State *s)
{
- // TODO: argument check
- if (!lua_isnumber(s, 1) ||
- !lua_isnumber(s, 2) ||
- !lua_isnumber(s, 3) ||
- !lua_isnumber(s, 4) ||
- !lua_isstring(s, 5) ||
- !lua_isnumber(s, 6) ||
- !lua_isboolean(s, 7))
+ const int x = luaL_checkint(s, 1);
+ const int y = luaL_checkint(s, 2);
+ const int width = luaL_checkint(s, 3);
+ const int height = luaL_checkint(s, 4);
+ const char *function = luaL_checkstring(s, 5);
+ const int id = luaL_checkint(s, 6);
+
+ if (!lua_isboolean(s, 7))
{
raiseScriptError(s, "trigger_create called with incorrect parameters.");
return 0;
@@ -1056,12 +1054,6 @@ static int trigger_create(lua_State *s)
lua_pushlightuserdata(s, (void *)&registryKey);
lua_gettable(s, LUA_REGISTRYINDEX);
Script *script = static_cast<Script *>(lua_touserdata(s, -1));
- int x = lua_tointeger(s, 1);
- int y = lua_tointeger(s, 2);
- int width = lua_tointeger(s, 3);
- int height = lua_tointeger(s, 4);
- std::string function = lua_tostring(s, 5);
- int id = lua_tointeger(s, 6);
bool once = lua_toboolean(s, 7);
LOG_INFO("Created script trigger at " << x << ":" << y
@@ -1122,9 +1114,9 @@ static int chatmessage(lua_State *s)
*/
static int get_beings_in_circle(lua_State *s)
{
- int x = lua_tointeger(s, 1);
- int y = lua_tointeger(s, 2);
- int r = lua_tointeger(s, 3);
+ const int x = luaL_checkint(s, 1);
+ const int y = luaL_checkint(s, 2);
+ const int r = luaL_checkint(s, 3);
lua_pushlightuserdata(s, (void *)&registryKey);
lua_gettable(s, LUA_REGISTRYINDEX);
@@ -1209,12 +1201,13 @@ static int being_register(lua_State *s)
/**
* Triggers a special effect from the clients effects.xml
* mana.effect_create (id, x, y)
- * mana.effect_create (id,being)
+ * mana.effect_create (id, being)
*/
static int effect_create(lua_State *s)
{
- if (!lua_isnumber(s, 1) ||
- ((!lua_isnumber(s, 2) || !lua_isnumber(s, 3))
+ const int id = luaL_checkint(s, 1);
+
+ if (((!lua_isnumber(s, 2) || !lua_isnumber(s, 3))
&& (!lua_isuserdata(s, 2))))
{
raiseScriptError(s, "effect_create called with incorrect parameters.");
@@ -1225,7 +1218,6 @@ static int effect_create(lua_State *s)
Script *t = static_cast<Script *>(lua_touserdata(s, -1));
MapComposite *m = t->getMap();
- int id = lua_tointeger(s, 1);
if (lua_isuserdata(s, 2))
{
@@ -1262,9 +1254,8 @@ static int chr_get_exp(lua_State *s)
return 0;
}
- int skill = lua_tointeger(s, 2);
-
- int exp = c->getExperience(skill);
+ const int skill = luaL_checkint(s, 2);
+ const int exp = c->getExperience(skill);
lua_pushinteger(s, exp);
return 1;
@@ -1286,15 +1277,10 @@ static int chr_give_exp(lua_State *s)
return 0;
}
- int skill = lua_tointeger(s, 2);
-
- int exp = lua_tointeger(s, 3);
+ const int skill = luaL_checkint(s, 2);
+ const int exp = luaL_checkint(s, 3);
+ const int optimalLevel = luaL_optint(s, 4, 0);
- int optimalLevel = 0;
- if (lua_isnumber(s, 4))
- {
- optimalLevel = lua_tointeger(s, 4);
- }
c->receiveExperience(skill, exp, optimalLevel);
return 0;
@@ -1313,7 +1299,7 @@ static int chr_set_hair_style(lua_State *s)
return 0;
}
- int style = lua_tointeger(s, 2);
+ const int style = luaL_checkint(s, 2);
if (style < 0)
{
raiseScriptError(s, "chr_set_hair_style called for nonexistent style id %d.", style);
@@ -1339,9 +1325,7 @@ static int chr_get_hair_style(lua_State *s)
return 0;
}
- int style = c->getHairStyle();
-
- lua_pushinteger(s, style);
+ lua_pushinteger(s, c->getHairStyle());
return 1;
}
@@ -1358,7 +1342,7 @@ static int chr_set_hair_color(lua_State *s)
return 0;
}
- int color = lua_tointeger(s, 2);
+ const int color = luaL_checkint(s, 2);
if (color < 0)
{
raiseScriptError(s, "chr_set_hair_color called for nonexistent style id %d.", color);
@@ -1384,9 +1368,7 @@ static int chr_get_hair_color(lua_State *s)
return 0;
}
- int color = c->getHairColor();
-
- lua_pushinteger(s, color);
+ lua_pushinteger(s, c->getHairColor());
return 1;
}
@@ -1403,17 +1385,9 @@ static int chr_get_kill_count(lua_State *s)
return 0;
}
- if (!lua_isnumber(s, 2))
- {
- raiseScriptError(s, "chr_get_kill_count called with incorect parameters");
- return 0;
- }
-
- int id = lua_tointeger(s, 2);
+ const int id = luaL_checkint(s, 2);
- int kills = c->getKillCount(id);
-
- lua_pushinteger(s, kills);
+ lua_pushinteger(s, c->getKillCount(id));
return 1;
}
@@ -1431,12 +1405,7 @@ static int chr_give_special(lua_State *s)
raiseScriptError(s, "chr_give_special called for nonexistent character.");
return 0;
}
- if (!lua_isnumber(s, 2))
- {
- raiseScriptError(s, "chr_give_special called with incorect parameters");
- return 0;
- }
- int special = lua_tointeger(s, 2);
+ const int special = luaL_checkint(s, 2);
c->giveSpecial(special);
return 0;
@@ -1454,12 +1423,7 @@ static int chr_has_special(lua_State *s)
raiseScriptError(s, "chr_has_special called for nonexistent character.");
return 0;
}
- if (!lua_isnumber(s, 2))
- {
- raiseScriptError(s, "chr_has_special called with incorect parameters");
- return 0;
- }
- int special = lua_tointeger(s, 2);
+ const int special = luaL_checkint(s, 2);
lua_pushboolean(s, c->hasSpecial(special));
return 1;
@@ -1477,12 +1441,7 @@ static int chr_take_special(lua_State *s)
raiseScriptError(s, "chr_take_special called for nonexistent character.");
return 0;
}
- if (!lua_isnumber(s, 2))
- {
- raiseScriptError(s, "chr_take_special called with incorect parameters");
- return 0;
- }
- int special = lua_tointeger(s, 2);
+ const int special = luaL_checkint(s, 2);
lua_pushboolean(s, c->hasSpecial(special));
c->takeSpecial(special);
@@ -1513,11 +1472,8 @@ static int chr_get_rights(lua_State *s)
*/
static int exp_for_level(lua_State *s)
{
- int level = lua_tointeger(s, 1);
-
- int exp = Character::expForLevel(level);
-
- lua_pushinteger(s, exp);
+ const int level = luaL_checkint(s, 1);
+ lua_pushinteger(s, Character::expForLevel(level));
return 1;
}
@@ -1597,22 +1553,10 @@ static int get_map_id(lua_State *s)
*/
static int item_drop(lua_State *s)
{
- if (!lua_isnumber(s, 1) ||
- !lua_isnumber(s, 2) ||
- !lua_isnumber(s, 3))
- {
- raiseScriptError(s, "trigger_create called with incorrect parameters.");
- return 0;
- }
-
- int x = lua_tointeger(s, 1);
- int y = lua_tointeger(s, 2);
- int type = lua_tointeger(s, 3);
- int number = 1;
- if (lua_isnumber(s, 4))
- {
- number = lua_tointeger(s, 4);
- }
+ const int x = luaL_checkint(s, 1);
+ const int y = luaL_checkint(s, 2);
+ const int type = luaL_checkint(s, 3);
+ const int number = luaL_optint(s, 4, 1);
ItemClass *ic = itemManager->getItem(type);
if (!ic)
@@ -1726,12 +1670,17 @@ LuaScript::LuaScript():
{ NULL, NULL }
};
luaL_register(mState, "mana", callbacks);
+ lua_pop(mState, 1); // pop the 'mana' table
// Make script object available to callback functions.
lua_pushlightuserdata(mState, (void *)&registryKey);
lua_pushlightuserdata(mState, this);
lua_settable(mState, LUA_REGISTRYINDEX);
- lua_settop(mState, 0);
+ // Push the error handler to first index of the stack
+ lua_getglobal(mState, "debug");
+ lua_getfield(mState, -1, "traceback");
+ lua_remove(mState, 1); // remove the 'debug' table
+
loadFile("scripts/lua/libmana.lua");
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-07 06:29:03 +0000