Merge branch 'keni-luabits2' into NetHack-3.7

This commit is contained in:
nhkeni
2024-01-04 10:40:27 -05:00
17 changed files with 181 additions and 102 deletions

View File

@@ -1,4 +1,4 @@
# NetHack 3.7 sysconf $NHDT-Date: 1646322470 2022/03/03 15:47:50 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.41 $
# NetHack 3.7 sysconf $NHDT-Date: 1704043695 2023/12/31 17:28:15 $ $NHDT-Branch: keni-luabits2 $:$NHDT-Revision: 1.44 $
# Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
# NetHack may be freely redistributed. See license for details.
#
@@ -93,7 +93,7 @@ MAXPLAYERS=10
# Use "Live logging" for important events (achievements, wishes, etc)
# Only available if NetHack was compiled with LIVELOG.
# Only really meaningful for public servers.
# Only really meaningful for public servers or debugging.
# See the log in-game with #chronicle -command.
# Bitmask for kinds of things you want to log - combine the following values
# as desired.
@@ -113,7 +113,7 @@ MAXPLAYERS=10
# 0x1000 - Log 'minor' achievements - can be spammy
# 0x2000 - Spoiler event; can include in livelog but hidden from #chronicle
# 0x4000 - Include as 'major' event in dumplog; can be hidden from livelog
# 0x8000 - Livelog debug msgs (currently only 'enter new level')
# 0x8000 - Livelog debug msgs
#LIVELOG=0x1FFF
# Show debugging information originating from these source files.

View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 unixmain.c $NHDT-Date: 1699233290 2023/11/06 01:14:50 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.118 $ */
/* NetHack 3.7 unixmain.c $NHDT-Date: 1704043695 2023/12/31 17:28:15 $ $NHDT-Branch: keni-luabits2 $:$NHDT-Revision: 1.124 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */
@@ -482,6 +482,14 @@ process_options(int argc, char *argv[])
config_error_add("Unknown option: %.60s", origarg);
}
break;
case 'l':
#ifdef LIVELOG
if(!strncmp(arg, "-loglua", 7)){
gl.loglua = 1;
} else
#endif
config_error_add("Unknown option: %.60s", origarg);
break;
case 'p': /* profession (role) */
if (arg[2]) {
if ((i = str2role(&arg[2])) >= 0)