diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-24 16:53:02 +0200 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-24 16:54:16 +0200 |
commit | af12180611e2c0520ee4974d5246e474fd8e704e (patch) | |
tree | 83cbf23b1c0fd4e0e31c7839c10bbd4c8c889a8e /src/scripting/lua.cpp | |
parent | 680256595a0083afd77aaa2d5e1e98f9bb619429 (diff) | |
download | manaserv-af12180611e2c0520ee4974d5246e474fd8e704e.tar.gz manaserv-af12180611e2c0520ee4974d5246e474fd8e704e.tar.bz2 manaserv-af12180611e2c0520ee4974d5246e474fd8e704e.tar.xz manaserv-af12180611e2c0520ee4974d5246e474fd8e704e.zip |
Fixed a few code style issues
Also renamed Guild::totalMembers to Guild::memberCount
Diffstat (limited to 'src/scripting/lua.cpp')
-rw-r--r-- | src/scripting/lua.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp index 0136210a..f5ec0671 100644 --- a/src/scripting/lua.cpp +++ b/src/scripting/lua.cpp @@ -129,7 +129,8 @@ static int npc_ask_integer(lua_State *s) int min = lua_tointeger(s, 3); int max = lua_tointeger(s, 4); int default_num = min; - if(lua_gettop(s) == 5) default_num = lua_tointeger(s, 5); + if (lua_gettop(s) == 5) + default_num = lua_tointeger(s, 5); msg.writeLong(min); msg.writeLong(max); @@ -732,7 +733,7 @@ static int chr_set_quest(lua_State *s) */ static int trigger_create(lua_State *s) { - //TODO: argument check + // TODO: argument check if (!lua_isnumber(s, 1) || !lua_isnumber(s, 2) || !lua_isnumber(s, 3) || @@ -756,7 +757,9 @@ static int trigger_create(lua_State *s) int id = lua_tointeger(s, 6); bool once = lua_toboolean(s, 7); - LOG_INFO("Created script trigger at "<<x<<":"<<y<<" ("<<width<<"x"<<height<<") function: "<<function<<" ("<<id<<")"); + LOG_INFO("Created script trigger at " << x << ":" << y + << " (" << width << "x" << height << ") function: " << function + << " (" << id << ")"); MapComposite *m = script->getMap(); @@ -792,7 +795,7 @@ static int chatmessage(lua_State *s) GameState::sayTo(being, NULL, message); } } - else if(lua_gettop(s) == 1 && lua_isstring(s, 1)) + else if (lua_gettop(s) == 1 && lua_isstring(s, 1)) { // TODO: make chatserver send a global message } |