From 79b2af32217db9b74518f0b1a3d8a9ce42ce316d Mon Sep 17 00:00:00 2001 From: kongju Date: Mon, 4 Dec 2023 21:15:54 +0800 Subject: [PATCH] modify --- src/NetHack_3.7/src/allmain.c | 2 +- src/NetHack_3.7/src/decl.c | 25 ++++++++++++++----------- src/NetHack_3.7/src/detect.c | 2 +- src/NetHack_3.7/src/dig.c | 2 +- src/NetHack_3.7/src/display.c | 2 +- src/NetHack_3.7/src/dlb.c | 2 +- src/NetHack_3.7/src/do.c | 2 +- src/NetHack_3.7/src/do_name.c | 2 +- src/NetHack_3.7/src/do_wear.c | 2 +- src/NetHack_3.7/src/dog.c | 2 +- src/NetHack_3.7/src/dogmove.c | 2 +- src/NetHack_3.7/src/dokick.c | 2 +- src/NetHack_3.7/src/dothrow.c | 2 +- 13 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/NetHack_3.7/src/allmain.c b/src/NetHack_3.7/src/allmain.c index d9c8c74..75d88f5 100644 --- a/src/NetHack_3.7/src/allmain.c +++ b/src/NetHack_3.7/src/allmain.c @@ -12,7 +12,7 @@ #include #endif -static void moveloop_preamble(boolean); +static void moveloop_preamble(boolean); static void u_calc_moveamt(int); static void maybe_do_tutorial(void); #ifdef POSITIONBAR diff --git a/src/NetHack_3.7/src/decl.c b/src/NetHack_3.7/src/decl.c index 9c32394..5aeeecd 100644 --- a/src/NetHack_3.7/src/decl.c +++ b/src/NetHack_3.7/src/decl.c @@ -498,26 +498,26 @@ const struct instance_globals_l g_init_l = { 0U, /* last_hider */ /* nhlan.c */ #ifdef MAX_LAN_USERNAME - UNDEFINED_VALUES, /* lusername */ - MAX_LAN_USERNAME, /* lusername_size */ + UNDEFINED_VALUES, /* lusername */ //是一个全局变量,用于存储本地区域网络的用户名。如果定义了MAX_LAN_USERNAME宏,则将其初始化为UNDEFINED_VALUES,否则将其初始化为未定义的值。注释后面的注释表示该变量在代码中的使用位置。 + MAX_LAN_USERNAME, /* lusername_size */ //是一个全局变量,用于存储本地区域网络用户名的大小。 #endif /* MAX_LAN_USERNAME */ /* nhlua.c */ - UNDEFINED_VALUE, /* luacore */ - DUMMY, /* lua_warnbuf[] */ + UNDEFINED_VALUE, /* luacore */ //是一个全局变量,用于存储Lua脚本的核心。将其初始化为未定义的值。 + DUMMY, /* lua_warnbuf[] */ //是一个数组,用于存储Lua警告信息的缓冲区。 /* options.c */ - FALSE, /* loot_reset_justpicked */ + FALSE, /* loot_reset_justpicked */ //是一个全局变量,用于表示是否刚刚拾取了战利品并需要重置。将其初始化为FALSE。 /* save.c */ - (struct obj *) 0, /* looseball */ + (struct obj *) 0, /* looseball */ //是全局变量,用于表示游戏中的松散物品 (struct obj *) 0, /* loosechain */ /* sp_lev.c */ - NULL, /* lev_message */ - UNDEFINED_PTR, /* lregions */ + NULL, /* lev_message */ //是一个全局变量,用于存储地图生成时的消息。 + UNDEFINED_PTR, /* lregions */ //一个全局变量,用于存储地图生成时的区域信息 /* trap.c */ - { UNDEFINED_PTR, 0, 0 }, /* launchplace */ + { UNDEFINED_PTR, 0, 0 }, /* launchplace */ //是一个结构体变量,用于表示陷阱的发射位置。 /* windows.c */ - UNDEFINED_PTR, /* last_winchoice */ + UNDEFINED_PTR, /* last_winchoice */ //是一个全局变量,用于存储上次选择的窗口选项。 /* new */ - DUMMY, /* lua_ver[LUA_VER_BUFSIZ] */ + DUMMY, /* lua_ver[LUA_VER_BUFSIZ] */ //是一个字符数组,用于存储Lua版本信息。 DUMMY, /* lua_copyright[LUA_COPYRIGHT_BUFSIZ] */ TRUE, /* havestate*/ IVMAGIC /* l_magic to validate that structure layout has been preserved */ @@ -960,8 +960,11 @@ const struct const_globals cg = { }; #define ZERO(x) memset(&x, 0, sizeof(x)) +//是一个宏定义,用于将变量x的内存空间清零。使用memset函数将x的内存空间的值设置为0,大小为sizeof(x)。 #define MAGICCHECK(xx) \ +//是一个宏定义,用于检查结构体变量xx的魔术值和状态。 +//如果xx的magic字段不等于IVMAGIC(预定义的魔术值),则输出错误信息并退出程序。如果xx的havestate字段不等于TRUE,则输出错误信息并退出程序。 do { \ if ((xx).magic != IVMAGIC) { \ raw_printf( \ diff --git a/src/NetHack_3.7/src/detect.c b/src/NetHack_3.7/src/detect.c index 00960fb..2754e00 100644 --- a/src/NetHack_3.7/src/detect.c +++ b/src/NetHack_3.7/src/detect.c @@ -11,7 +11,7 @@ #include "hack.h" #include "artifact.h" -static boolean unconstrain_map(void); +static boolean unconstrain_map(void); static void reconstrain_map(void); static void map_redisplay(void); static void browse_map(unsigned, const char *); diff --git a/src/NetHack_3.7/src/dig.c b/src/NetHack_3.7/src/dig.c index 04c1419..5e3d81a 100644 --- a/src/NetHack_3.7/src/dig.c +++ b/src/NetHack_3.7/src/dig.c @@ -17,7 +17,7 @@ static boolean furniture_handled(coordxy, coordxy, boolean); /* Indices returned by dig_typ() */ enum dig_types { - DIGTYP_UNDIGGABLE = 0, + DIGTYP_UNDIGGABLE = 0, DIGTYP_ROCK, DIGTYP_STATUE, DIGTYP_BOULDER, diff --git a/src/NetHack_3.7/src/display.c b/src/NetHack_3.7/src/display.c index 079c287..0211e14 100644 --- a/src/NetHack_3.7/src/display.c +++ b/src/NetHack_3.7/src/display.c @@ -19,7 +19,7 @@ * interface. * * The display system deals with an abstraction called a glyph. Anything - * that could possibly be displayed has a unique glyph identifier. + * that could possibly be displayed has a unique glyph identifier. * * What is seen on the screen is a combination of what the hero remembers * and what the hero currently sees. Objects and dungeon features (walls diff --git a/src/NetHack_3.7/src/dlb.c b/src/NetHack_3.7/src/dlb.c index c6788d9..3e1ea9e 100644 --- a/src/NetHack_3.7/src/dlb.c +++ b/src/NetHack_3.7/src/dlb.c @@ -26,7 +26,7 @@ typedef struct dlb_procs { int (*dlb_fread_proc)(char *, int, int, DLB_P); int (*dlb_fseek_proc)(DLB_P, long, int); char *(*dlb_fgets_proc)(char *, int, DLB_P); - int (*dlb_fgetc_proc)(DLB_P); + int (*dlb_fgetc_proc)(DLB_P); long (*dlb_ftell_proc)(DLB_P); } dlb_procs_t; diff --git a/src/NetHack_3.7/src/do.c b/src/NetHack_3.7/src/do.c index 75f6bee..e50d8a7 100644 --- a/src/NetHack_3.7/src/do.c +++ b/src/NetHack_3.7/src/do.c @@ -26,7 +26,7 @@ static void temperature_change_msg(schar); /* the #drop command: drop one inventory item */ int -dodrop(void) +dodrop(void) { int result; diff --git a/src/NetHack_3.7/src/do_name.c b/src/NetHack_3.7/src/do_name.c index 5d074ed..3e94a14 100644 --- a/src/NetHack_3.7/src/do_name.c +++ b/src/NetHack_3.7/src/do_name.c @@ -28,7 +28,7 @@ static void do_oname(struct obj *); static char *docall_xname(struct obj *); static void namefloorobj(void); -extern const char what_is_an_unknown_object[]; /* from pager.c */ +extern const char what_is_an_unknown_object[]; /* from pager.c */ #define NUMMBUF 5 diff --git a/src/NetHack_3.7/src/do_wear.c b/src/NetHack_3.7/src/do_wear.c index 360db95..6593ebf 100644 --- a/src/NetHack_3.7/src/do_wear.c +++ b/src/NetHack_3.7/src/do_wear.c @@ -32,7 +32,7 @@ static int Shirt_on(void); static void dragon_armor_handling(struct obj *, boolean, boolean); static void Amulet_on(void); static void learnring(struct obj *, boolean); -static void adjust_attrib(struct obj *, int, int); +static void adjust_attrib(struct obj *, int, int); static void Ring_off_or_gone(struct obj *, boolean); static int select_off(struct obj *); static struct obj *do_takeoff(void); diff --git a/src/NetHack_3.7/src/dog.c b/src/NetHack_3.7/src/dog.c index 934d88a..5a8480d 100644 --- a/src/NetHack_3.7/src/dog.c +++ b/src/NetHack_3.7/src/dog.c @@ -34,7 +34,7 @@ free_edog(struct monst *mtmp) { if (mtmp->mextra && EDOG(mtmp)) { free((genericptr_t) EDOG(mtmp)); - EDOG(mtmp) = (struct edog *) 0; + EDOG(mtmp) = (struct edog *) 0; } mtmp->mtame = 0; } diff --git a/src/NetHack_3.7/src/dogmove.c b/src/NetHack_3.7/src/dogmove.c index 5beaea7..710c4f0 100644 --- a/src/NetHack_3.7/src/dogmove.c +++ b/src/NetHack_3.7/src/dogmove.c @@ -33,7 +33,7 @@ droppables(struct monst *mon) * be considered a duplicate and get treated as a normal candidate * for dropping. * - * This could be 'auto', but then 'gcc -O2' warns that this function + * This could be 'auto', but then 'gcc -O2' warns that this function * might return the address of a local variable. It's mistaken, * &dummy is never returned. 'static' is simplest way to shut it up. */ diff --git a/src/NetHack_3.7/src/dokick.c b/src/NetHack_3.7/src/dokick.c index 8fc6585..e9b9d79 100644 --- a/src/NetHack_3.7/src/dokick.c +++ b/src/NetHack_3.7/src/dokick.c @@ -31,7 +31,7 @@ static const char kick_passes_thru[] = "kick passes harmlessly through"; static void kickdmg(struct monst *mon, boolean clumsy) { - int mdx, mdy; + int mdx, mdy; int dmg = (ACURRSTR + ACURR(A_DEX) + ACURR(A_CON)) / 15; int specialdmg, kick_skill = P_NONE; boolean trapkilled = FALSE; diff --git a/src/NetHack_3.7/src/dothrow.c b/src/NetHack_3.7/src/dothrow.c index cea2f77..dec8fba 100644 --- a/src/NetHack_3.7/src/dothrow.c +++ b/src/NetHack_3.7/src/dothrow.c @@ -30,7 +30,7 @@ static boolean mhurtle_step(genericptr_t, coordxy, coordxy); && ((o)->otyp == AKLYS \ || ((o)->oartifact == ART_MJOLLNIR && Role_if(PM_VALKYRIE)))) \ || (o)->otyp == BOOMERANG) - + /* gt.thrownobj (decl.c) tracks an object until it lands */ int