Bart House
8dc9a3d930
Merge branch 'macosx-curses-fall2018' of https://rodney.nethack.org:20040/git/NHsource into macosx-curses-fall2018
2018-11-19 14:11:59 -08:00
Bart House
9f525b3241
Added building of special and quest levels in xcode build.
2018-11-19 14:11:39 -08:00
nhmall
becfe90bfc
more .gitignore updates for XCode
2018-11-19 16:27:57 -05:00
Bart House
d1b6581c08
Added building of more resources in xcode build.
2018-11-19 13:03:06 -08:00
Bart House
cbe2669e05
Removing personal data.
2018-11-19 12:17:37 -08:00
Bart House
d83ae1a4da
Adding the ignoring of xcuserdata.
2018-11-19 12:17:20 -08:00
Bart House
f47893258d
Removed personal user data.
2018-11-19 12:14:45 -08:00
Bart House
b2e65ad9cd
Adding the ignoring of xcuserdata.
2018-11-19 12:14:27 -08:00
Bart House
f221db4a94
Added NH_INC_DIR to xcode project build settings.
2018-11-19 12:13:58 -08:00
Bart House
bf549e865f
Added project wide build settings for nethack directories.
2018-11-19 12:03:02 -08:00
Bart House
898a22159f
Added building of data to xcode build.
2018-11-19 11:33:11 -08:00
Bart House
4788b10d88
XCode project check-point.
2018-11-19 11:06:57 -08:00
Bart House
3c5556d45e
Fix vi induced build problem.
2018-11-19 09:53:46 -08:00
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
a4eb3df5f0
Merge branch 'NetHack-3.6.2-beta01' into macosx-curses-fall2018
2018-11-19 09:58:40 -05:00
nhmall
a58571a475
.gitignore update
2018-11-18 23:53:49 -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
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
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
Bart House
52cbbdafae
Completed map back buffer work and implemented map cursor blink.
...
Map back buffer work is done eliminating all flickering caused by
clears of the front buffer during partial updates.
Implemented a cursor blink in both ascii and tile modes.
Fixed bug where we would lose fit to screen when entering rogue level.
2018-11-16 12:39:04 -08:00
PatR
6ecf97f6e3
vms build/install update
...
New-ish files 'engrave', 'epitaph', and 'bogusmon' added for 3.6.0
were not handled by playground setup. NetHack runs without them so
limited testing didn't notice.
Add 'makedefs -s' to build them and include them in installed files.
Also, remove 'makedefs -m' and obsolete monstr.c.
2018-11-16 09:16:48 -08:00