diff --git a/.gitignore b/.gitignore index 6a161df64..db3e64482 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,19 @@ _$* core # CVS default ignores end .*.swp + # We generate makefiles by shell script Makefile + +# Win32-specific ignores +binary/ +build/ +Nethack.sln +Nethack.sdf +Nethack.opensdf +Makefile.bcc +Makefile.gcc +*.pdb +*.ilk +# Win32-specific ignores end + diff --git a/dat/.gitignore b/dat/.gitignore index e5bd4aba6..88e516283 100644 --- a/dat/.gitignore +++ b/dat/.gitignore @@ -14,3 +14,6 @@ dungeon nethack.png nhsplash.xpm nhdat +dlb.lst +guioptions +porthelp diff --git a/include/.gitignore b/include/.gitignore index 5bae20a5f..b9bd5d8ab 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,3 +1,7 @@ .cvsignore -date.h onames.h pm.h vis_tab.h -dgn_comp.h lev_comp.h +date.h +onames.h +pm.h +vis_tab.h +dgn_comp.h +lev_comp.h diff --git a/src/.gitignore b/src/.gitignore index 602f782b0..04325af79 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -6,3 +6,4 @@ tile.c Sysunix nethack *.o +tiles.bmp diff --git a/src/cmd.c b/src/cmd.c index 064d85a88..74d5a5db7 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1276,7 +1276,7 @@ int final; /* ENL_GAMEINPROGRESS:0, ENL_GAVEOVERALIVE, ENL_GAMEOVERDEAD */ *tmpbuf = highc(*tmpbuf); /* same adjustment as bottom line */ /* as in background_enlighenment, when poly'd we need to use the saved gender in u.mfemale rather than the current you-as-monster gender */ - Sprintf(buf, "%s the %s's atttributes:", tmpbuf, + Sprintf(buf, "%s the %s's attributes:", tmpbuf, ((Upolyd ? u.mfemale : flags.female) && urole.name.f) ? urole.name.f : urole.name.m); diff --git a/sys/unix/sysconf b/sys/unix/sysconf index 34efdcb8a..99bcab3d8 100644 --- a/sys/unix/sysconf +++ b/sys/unix/sysconf @@ -29,7 +29,7 @@ MAXPLAYERS=10 # Record (high score) file options. # CAUTION: changing these after people have started playing games can # lead to lost high scores! -# Maximum entries for one persion. +# Maximum entries for one person. #PERSMAX=10 # Maximum entries in the record file. #ENTRYMAX=100 diff --git a/win/share/.gitignore b/win/share/.gitignore new file mode 100644 index 000000000..10969bb60 --- /dev/null +++ b/win/share/.gitignore @@ -0,0 +1 @@ +tiletxt.c diff --git a/win/win32/.gitignore b/win/win32/.gitignore new file mode 100644 index 000000000..c40993f47 --- /dev/null +++ b/win/win32/.gitignore @@ -0,0 +1,4 @@ +# Build-generated stuff that we don't want +*.bmp +*.ico +