summaryrefslogtreecommitdiffstats
path: root/src/scripting
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-28 11:52:08 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-05-02 21:45:54 +0200
commit0261eb73e5588f5732aef5df753311d488c45d06 (patch)
treed641b0cad81ea58b8d8680b002197a4f592ef4a9 /src/scripting
parent23ccc8080a5283adce9f06909fc89b63d0e25452 (diff)
downloadmanaserv-0261eb73e5588f5732aef5df753311d488c45d06.tar.gz
manaserv-0261eb73e5588f5732aef5df753311d488c45d06.tar.xz
manaserv-0261eb73e5588f5732aef5df753311d488c45d06.zip
Fixed a bunch of cppcheck warnings
Diffstat (limited to 'src/scripting')
-rw-r--r--src/scripting/luascript.cpp8
-rw-r--r--src/scripting/luautil.h6
2 files changed, 6 insertions, 8 deletions
diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp
index 2b9644d..1617f74 100644
--- a/src/scripting/luascript.cpp
+++ b/src/scripting/luascript.cpp
@@ -101,14 +101,12 @@ void LuaScript::push(const std::list<InventoryItem> &itemList)
lua_createtable(mCurrentState, itemList.size(), 0);
int itemTable = lua_gettop(mCurrentState);
- for (std::list<InventoryItem>::const_iterator i = itemList.begin();
- i != itemList.end();
- i++)
+ for (const InventoryItem &inventoryItem : itemList)
{
// create the item structure
std::map<std::string, int> item;
- item["id"] = i->itemId;
- item["amount"] = i->amount;
+ item["id"] = inventoryItem.itemId;
+ item["amount"] = inventoryItem.amount;
pushSTLContainer<std::string, int>(mCurrentState, item);
lua_rawseti(mCurrentState, itemTable, ++position);
}
diff --git a/src/scripting/luautil.h b/src/scripting/luautil.h
index 8bcc2a3..26ed33c 100644
--- a/src/scripting/luautil.h
+++ b/src/scripting/luautil.h
@@ -230,7 +230,7 @@ void pushSTLContainer(lua_State *s, const std::list<T> &container)
{
push(s, *i);
lua_rawseti(s, table, key);
- i++;
+ ++i;
}
}
@@ -264,7 +264,7 @@ void pushSTLContainer(lua_State *s, const std::map<Tkey, Tval> &container)
push(s, i->first);
push(s, i->second);
lua_settable(s, table);
- i++;
+ ++i;
}
}
@@ -282,7 +282,7 @@ void pushSTLContainer(lua_State *s, const std::set<T> &container)
{
push(s, *i);
lua_rawseti(s, table, key);
- i++;
+ ++i;
}
}