Commit Graph

8361 Commits

Author SHA1 Message Date
Bart House
16d5631235 Merge branch 'macosx-curses-fall2018' of https://rodney.nethack.org:20040/git/NHsource into macosx-curses-fall2018 2018-11-19 09:22:32 -08:00
Bart House
aa48ed18e7 Initial check-in of work in progress xcode build of NetHack.
Buyer beware.  This is a check-point of the xcode work to allow others
to play.
2018-11-19 09:22:11 -08:00
nhmall
7ee4fa3c3f some curses window-port doc bits 2018-11-19 10:40:51 -05:00
nhmall
a4eb3df5f0 Merge branch 'NetHack-3.6.2-beta01' into macosx-curses-fall2018 2018-11-19 09:58:40 -05:00
nhmall
923e1c5854 Merge branch 'NetHack-3.6.2-beta01' into win-curses 2018-11-19 09:57:58 -05:00
nhmall
86fc87f21e Merge branch 'NetHack-3.6.2' 2018-11-19 09:57:22 -05:00
nhmall
9273aa29b6 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-11-19 09:56:14 -05:00
nhmall
a58571a475 .gitignore update 2018-11-18 23:53:49 -05:00
Mike Allison
779ef42d6f Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2018-11-18 23:38:36 -05:00
Mike Allison
84c2d78a42 add .DS_Store to .gitignore 2018-11-18 23:37:49 -05:00
Mike Allison
a4402679d8 add .DS_Store to .gitignore 2018-11-18 23:27:18 -05:00
PatR
40ce977522 fix #H7573 - impossible zero payment in money2mon
When paying for shop door or wall damage, if the entire amount was
covered by shop credit then impossible "zero payment in money2mon"
would occur as the shop code tried to transfer 0 zorkmids from hero
to shopkeeper after using credit to pay.
2018-11-18 18:48:59 -08:00
nhmall
9958fda6b5 Merge branch 'NetHack-3.6.2-beta01' into win-curses 2018-11-18 14:58:31 -05:00
Bart House
360ee21861 Revert "Hint file for macOS X with curses."
This reverts commit f7fbbb8cb0.
2018-11-18 11:45:36 -08:00
nhmall
079782ac55 Merge branch 'NetHack-3.6.2' 2018-11-18 14:21:33 -05:00
nhmall
305aedb7e4 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-11-18 14:20:07 -05:00
Bart House
444d1ec50a Merge branch 'win-curses' of https://rodney.nethack.org:20040/git/NHsource into win-curses 2018-11-18 09:30:11 -08:00
Bart House
f7fbbb8cb0 Hint file for macOS X with curses. 2018-11-18 09:28:45 -08:00
nhmall
15da3e4d53 Merge branch 'win-curses' into macosx-curses-fall2018 2018-11-18 09:10:26 -05:00
nhmall
bc8be48a92 quiet some mismatched prototype warnings with visual studio compiler
pager.c
.\pager.c(1886): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1887): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1888): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1889): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1890): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1891): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1893): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1895): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1896): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1897): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1898): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1902): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
.\pager.c(1921): warning C4113: 'void (__cdecl *)()' differs in parameter lists from 'void (__cdecl *)(void)'
2018-11-18 08:45:32 -05:00
nhmall
60c3c2f113 fix a build error when curses is NOT enabled
Fix an error when curses build macros are not defined
makefile(1262) : fatal error U1083: target macro '$(PDCLIB)' expands to nothing
2018-11-18 08:34:24 -05:00
nhmall
1b36af5d8a update Install.nt 2018-11-18 07:59:59 -05:00
nhmall
bf0e0b9f12 Makefile cut-and-paste error 2018-11-18 07:10:58 -05:00
nhmall
935fe5bca8 Makefile macro correction 2018-11-18 06:57:17 -05:00
nhmall
bbe7029e77 more curses Makfile mods 2018-11-18 06:48:47 -05:00
nhmall
9c4de50c9a windows VS Makefile with curses and PDCurses 2018-11-18 06:24:32 -05:00
nhmall
312f492149 Merge branch 'win-minor' into win-curses 2018-11-18 04:32:28 -05:00
Bart House
6ba270563c Build curses if PDCurses is available.
There are two ways to enable curses in the build.  Either set the
environment variable PDCURSES to a folder containing a PDCurses repository
OR place the PDCurses folder alongside the NetHack source repository.
2018-11-17 23:56:31 -08:00
nhmall
816a7dd871 Revert "curses port: accept return on Windows platform"
This reverts commit ac367ef4cc.
2018-11-17 21:30:01 -05:00
nhmall
2829e3f780 Revert "more CR on windows"
This reverts commit 83fb79b775.
2018-11-17 21:29:41 -05:00
nhmall
83fb79b775 more CR on windows 2018-11-17 21:17:43 -05:00
nhmall
ac367ef4cc curses port: accept return on Windows platform 2018-11-17 20:27:21 -05:00
PatR
27fe555bc1 src/ formatting
Clean up quite a bit of minor things found with simple grep patterns:
operator at end of continued line instead of beginning of continuation
(and a few comments which produced false matches, so that they won't
do so next time), trailing spaces (only one or two of those), tabs (a
dozen or so of those), several casts which didn't have a space between
the type and the expression (I wasn't systematic about finding these).

I think the only code change was in the function for the help command.
2018-11-17 16:40:53 -08:00
PatR
8f4c2d2a82 formatting: tile.c
A while back I changed tilemap.c to clean up the formatting of
generated tile.c.  This is a smaller change to revise the layout
of its big array.
2018-11-17 16:31:22 -08:00
Bart House
afe828507a Getting build working. 2018-11-17 14:48:38 -08:00
nhmall
47d4dc50a5 Merge branch 'NetHack-3.6.2' 2018-11-17 08:32:59 -05:00
nhmall
92925417aa Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-11-17 08:31:50 -05:00
nhmall
fecef470e0 Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-11-17 06:22:56 -05:00
Bart House
d2436d9f3c Map curso blinking controlled by win32_cursorblink. 2018-11-16 21:48:00 -08:00
nhmall
39c8f4347a Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-11-16 23:55:02 -05:00
PatR
141dec6d2e feedback for missing readonly data files
If bogusmon, engrave, epitaph, oralces, or rumors won't open, assume
it's because the file is missing so don't have impossible() tack on
"saving and restoring might fix this" when telling the player.
(Missing rumors or oracles previously only used pline() rather than
impossible() so this hadn't been an issue for them.  Now it would be.)
2018-11-16 18:49:12 -08:00
nhmall
113d5cdb26 missed include/wincurs.h 2018-11-16 21:00:11 -05:00
nhmall
748280d5dc curses new file additions 2018-11-16 20:53:38 -05:00
nhmall
cb43061076 curses changes to existing files 2018-11-16 20:51:22 -05:00
nhmall
20018c2719 Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-11-16 20:28:54 -05:00
nhmall
96ec49213f Add some windows command line option hooks 2018-11-16 19:32:00 -05:00
PatR
6839ad3faa more vms (vmsbuild.com vs monstr.c)
Apparently I exited emacs without saving and the revised vmsbuild.com
ended up as a backup file that 'git nhadd' wouldn't see.  This was
supposed to be included in the patch committed several hours ago....
2018-11-16 15:34:09 -08:00
Bart House
dcac95b4b3 Delete GDI objects when map window is destroyed. 2018-11-16 13:50:12 -08:00
Bart House
90562f23c0 Menu check boxes drawn correctly when scaled.
Changed from using pattern brush to strech blt when rendering check box.
2018-11-16 13:29:59 -08:00
Bart House
94c4acc144 Made map cursor blink a compile time option. 2018-11-16 13:00:02 -08:00