diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2010-06-20 01:58:55 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2010-06-20 20:27:50 +0200 |
| commit | 0fa67c59d6d763d68b570f015f93f746529b57ff (patch) | |
| tree | 730125251b074051e230728a56bfa0dbc344e9a1 /crawl-ref/source/l_mons.cc | |
| parent | f1f190d3e3f4a100d95ebc843b0d9bc024f0adb7 (diff) | |
| download | crawl-ref-0fa67c59d6d763d68b570f015f93f746529b57ff.tar.gz crawl-ref-0fa67c59d6d763d68b570f015f93f746529b57ff.zip | |
Get rid of ambiguous longs from CrawlHashTable and a lot of misc places.
Diffstat (limited to 'crawl-ref/source/l_mons.cc')
| -rw-r--r-- | crawl-ref/source/l_mons.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/l_mons.cc b/crawl-ref/source/l_mons.cc index bae5b3dc74..be5f5a8ccf 100644 --- a/crawl-ref/source/l_mons.cc +++ b/crawl-ref/source/l_mons.cc @@ -291,7 +291,7 @@ static int l_mons_do_set_prop(lua_State *ls) // NOTE: number has to be before string, or numbers will get converted // into strings. else if (lua_isnumber(ls, 2)) - mons->props[prop_name] = luaL_checklong(ls, 2); + mons->props[prop_name].get_int() = luaL_checklong(ls, 2); else if (lua_isstring(ls, 2)) mons->props[prop_name] = lua_tostring(ls, 2); else if (lua_isfunction(ls, 2)) @@ -342,7 +342,7 @@ static int l_mons_do_get_prop(lua_State *ls) case SV_BOOL: lua_pushboolean(ls, prop.get_bool()); break; case SV_BYTE: lua_pushboolean(ls, prop.get_byte()); break; case SV_SHORT: lua_pushnumber(ls, prop.get_short()); break; - case SV_LONG: lua_pushnumber(ls, prop.get_long()); break; + case SV_INT: lua_pushnumber(ls, prop.get_int()); break; case SV_FLOAT: lua_pushnumber(ls, prop.get_float()); break; case SV_STR: lua_pushstring(ls, prop.get_string().c_str()); break; case SV_COORD: |