Merge branch 'NetHack-3.7'
This commit is contained in:
@@ -291,6 +291,7 @@ char ch;
|
||||
return i;
|
||||
}
|
||||
|
||||
#if !defined(CROSSCOMPILE) || defined(CROSSCOMPILE_TARGET)
|
||||
/*
|
||||
* Explanations of the functions found below:
|
||||
*
|
||||
@@ -810,5 +811,6 @@ const struct symparse loadsyms[] = {
|
||||
{ SYM_OTH, SYM_HERO_OVERRIDE + SYM_OFF_X, "S_hero_override" },
|
||||
{ 0, 0, (const char *) 0 } /* fence post */
|
||||
};
|
||||
#endif /* !CROSSCOMPILE || CROSSCOMPILE_TARGET */
|
||||
|
||||
/*drawing.c*/
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 nhlua.c $NHDT-Date: 1574646949 2019/11/25 01:55:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.8 $ */
|
||||
/* NetHack 3.6 nhlua.c $NHDT-Date: 1574825214 2019/11/27 03:26:54 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.9 $ */
|
||||
/* Copyright (c) 2018 by Pasi Kallinen */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -37,7 +37,6 @@ nhl_error(L, msg)
|
||||
lua_State *L;
|
||||
const char *msg;
|
||||
{
|
||||
extern int FDECL(lua_error, (lua_State *)) NORETURN;
|
||||
lua_Debug ar;
|
||||
char buf[BUFSZ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user