nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Lua object generation didn't obey locked state

Browse Source 
Defining des.object({ id="large box", locked=false })
was the same as random locked state. Make it actually mean unlocked,
and not defining locked at all means random.
This commit is contained in:
Pasi Kallinen
2023-03-19 20:12:09 +02:00
parent 59fd05dd5e
commit fa0ae08f94
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sp_lev.c
View File

@@ -2259,8 +2259,8 @@ create_object(object* o, struct mkroom* croom)
} }
if (o->recharged) if (o->recharged)
otmp->recharged = (o->recharged % 8); otmp->recharged = (o->recharged % 8);
if (o->locked) { if (o->locked == 0 || o->locked == 1) {
otmp->olocked = 1; otmp->olocked = o->locked;
} else if (o->broken) { } else if (o->broken) {
otmp->obroken = 1; otmp->obroken = 1;
otmp->olocked = 0; /* obj generation may set */ otmp->olocked = 0; /* obj generation may set */
@@ -3529,6 +3529,7 @@ lspo_object(lua_State *L)
tmpobj.spe = -127; tmpobj.spe = -127;
tmpobj.quan = -1; tmpobj.quan = -1;
tmpobj.trapped = -1; tmpobj.trapped = -1;
tmpobj.locked = -1;
tmpobj.corpsenm = NON_PM; tmpobj.corpsenm = NON_PM;
if (argc == 1 && lua_type(L, 1) == LUA_TSTRING) { if (argc == 1 && lua_type(L, 1) == LUA_TSTRING) {
@@ -3579,7 +3580,7 @@ lspo_object(lua_State *L)
tmpobj.buried = get_table_boolean_opt(L, "buried", 0); tmpobj.buried = get_table_boolean_opt(L, "buried", 0);
tmpobj.lit = get_table_boolean_opt(L, "lit", 0); tmpobj.lit = get_table_boolean_opt(L, "lit", 0);
tmpobj.eroded = get_table_int_opt(L, "eroded", 0); tmpobj.eroded = get_table_int_opt(L, "eroded", 0);
tmpobj.locked = get_table_boolean_opt(L, "locked", 0); tmpobj.locked = get_table_boolean_opt(L, "locked", -1);
tmpobj.trapped = get_table_int_opt(L, "trapped", -1); tmpobj.trapped = get_table_int_opt(L, "trapped", -1);
tmpobj.recharged = get_table_int_opt(L, "recharged", 0); tmpobj.recharged = get_table_int_opt(L, "recharged", 0);
tmpobj.greased = get_table_boolean_opt(L, "greased", 0); tmpobj.greased = get_table_boolean_opt(L, "greased", 0);