diff options
| author | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
|---|---|---|
| committer | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
| commit | 77df09540c4d7eadef760779e123af88a48aafaa (patch) | |
| tree | febf1009328d30c31a14a1a1ca1600e99b4c3e6b /src/nameidmapping.h | |
| parent | 3454e6779337d8523ae76c7fa16eb8c565aa2381 (diff) | |
| parent | a1eb2836c0764829ebad1462432bb3c5f32750df (diff) | |
| download | minetest-77df09540c4d7eadef760779e123af88a48aafaa.tar.xz | |
Merge remote branch 'upstream/master' into sapier_experimental
Conflicts:
src/scriptapi.cpp
Diffstat (limited to 'src/nameidmapping.h')
| -rw-r--r-- | src/nameidmapping.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nameidmapping.h b/src/nameidmapping.h index 071599e10..238deb451 100644 --- a/src/nameidmapping.h +++ b/src/nameidmapping.h @@ -70,6 +70,9 @@ public: result = i->second; return true; } + u16 size() const{ + return m_id_to_name.size(); + } private: std::map<u16, std::string> m_id_to_name; std::map<std::string, u16> m_name_to_id; |