nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
4,676 Commits 2 Branches 0 Tags
63291b3f989752ac2be8217455dfd0a0400e44b5
Commit Graph

4676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nhmall
63291b3f98 Merge branch 'master' into win32-x64-working 2015-04-17 00:34:43 -04:00
nhmall
f6bf9f9999 protect against bad dates 
A recent fault on mingw32 revealed that faulty
code which passes a bad or out-of-range date
value could have game-fatal consequences.
Add some protection.
 2015-04-17 00:31:22 -04:00
nhmall
d52c6a208d date verification 2015-04-17 00:12:53 -04:00
Dion Nicolaas
eb9f7b3177 typo in comment 2015-04-16 22:40:22 +02:00
Dion Nicolaas
0c4573d82a fix tile2bmp build under mingw. Provide alternatives for Microsoft-specific macros. Be consistent about slashes in gcc Makefile. Don't include shlwapi.h for any compiler. 2015-04-16 22:36:06 +02:00
Alex Kompel
c8679c8e0e win32_gui: encode copy-to-clipboard and save-to-file text in UTF-8 2015-04-15 22:13:10 -07:00
Derek S. Ray
7c644c1507 Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource into win32-x64-working 
* 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource: (27 commits)
  Makefile bit
  gcc Makefile updates for recent file additions
  ...

Conflicts:
	src/files.c
 2015-04-15 18:30:13 -04:00
Derek S. Ray
df52ba17ec add debugger window support via _RPT*; add regex 
currently it's locked behind _MSC_VER, but anything that runs on Win32
should be able to use those functions as long as it has something that
can pass as a debug window.

also, add a non-wildcard-accepting version of showdebug for the dumpit()
functions in dungeon.c and questpgr.c; this makes DEBUGFILES=* workable
without being excruciatingly painful
 2015-04-15 18:19:16 -04:00
Pasi Kallinen
38bdb175cc Prevent divide by zero in newman 
...which happened when your max power was 0
 2015-04-15 21:05:46 +03:00
Pasi Kallinen
5a08671fc0 Prevent illegal positions for tmp_at 
It seems like m_throw() can call tmp_at() with !isok coordinates,
so prevent those in both functions
 2015-04-15 20:35:52 +03:00
Pasi Kallinen
97f6834730 Prevent infinite loop 
...if the map is filled with monsters, and for some reason
the drowning just won't kill you.

Infinite looping cannot currently happen, because no-one who
can drown can keep surviving the drowning once their amulet
of life saving is used up.
 2015-04-15 20:13:30 +03:00
Pasi Kallinen
35e0027328 Prevent out-of-bounds coords when closing a door 2015-04-15 19:43:53 +03:00
Pasi Kallinen
e77ea2ae61 Prevent segfault when looking around inside monster 
A recent change by me introduced a segfault when
counting swallowed hero as a monster inventory item.
 2015-04-15 17:06:44 +03:00
nhmall
1354215b97 Makefile bit 2015-04-14 20:45:18 -04:00
nhmall
0c769146ba gcc Makefile updates for recent file additions 2015-04-14 20:24:52 -04:00
nhmall
1e388fc1b9 update Makefile.gcc 
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
 2015-04-14 20:18:19 -04:00
nhmall
e8667b36a1 win32 perm inventory fix (from Alex) 2015-04-14 18:31:00 -04:00
nhmall
3d3ee78a0b Merge branch 'master' into win32-x64-working 
Conflicts:
	src/files.c
	src/potion.c
	sys/winnt/Makefile.msc

 Changes to be committed:
	modified:   .gitignore
	modified:   DEVEL/hooksdir/nhsub
	modified:   dat/.gitignore
	modified:   dat/opthelp
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
	modified:   doc/fixes35.0
	modified:   include/context.h
	modified:   include/decl.h
	modified:   include/extern.h
	modified:   include/flag.h
	modified:   include/hack.h
	modified:   include/patchlevel.h
	modified:   src/apply.c
	modified:   src/attrib.c
	modified:   src/decl.c
	modified:   src/do.c
	modified:   src/do_name.c
	modified:   src/dothrow.c
	modified:   src/eat.c
	modified:   src/files.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mklev.c
	modified:   src/mondata.c
	modified:   src/monmove.c
	modified:   src/music.c
	modified:   src/options.c
	modified:   src/potion.c
	modified:   src/pray.c
	modified:   src/sit.c
	modified:   src/sp_lev.c
	modified:   src/uhitm.c
	modified:   sys/share/posixregex.c
	modified:   sys/winnt/Makefile.msc
	modified:   util/.gitignore
	modified:   win/win32/vs2010/NetHackW.vcxproj
 2015-04-14 18:23:48 -04:00
Pasi Kallinen
647a072b62 Move triplicate defines into single place 2015-04-14 20:33:30 +03:00
Pasi Kallinen
dc7d8eb244 YAFM for magic flute 2015-04-14 20:04:46 +03:00
Pasi Kallinen
cd3b0efe5d Unify description of hero's visage into single function 2015-04-14 19:41:44 +03:00
Alex Kompel
116a4147a7 win32_gui: follow-up bit on x64 patch (premature optimization) 2015-04-14 09:33:05 -07:00
Pasi Kallinen
9b2c298fec Sinks may be teleported or polymorphed by rings 
Original patches by Leon Arnott and me.
 2015-04-14 19:21:37 +03:00
Alex Kompel
62617092b5 win32_gui: gettting x64 build to work 2015-04-14 08:54:44 -07:00
Alex Kompel
3c6f01f022 win32_gui: couple of perm_invent tweaks 2015-04-13 23:47:42 -07:00
Alex Kompel
7eefb8a250 win32_gui: use AdjustWindowRect to get more accurate measurement of status window 2015-04-13 23:29:02 -07:00
Alex Kompel
16ffab2c3c win32-gui: use showdebug() to control nhtrace logging 2015-04-13 23:19:52 -07:00
Pasi Kallinen
f1a5de16d9 Guard against merge segfaults 
Trying to throw a quivered object resulted in a segfault, when
the code tried to merge the quivered object into itself.
 2015-04-14 08:55:47 +03:00
Pasi Kallinen
31eed002c3 YAFM for dragon sitting on gold 2015-04-14 08:45:29 +03:00
Derek S. Ray
f244fd34f8 cppregex target accidentally commented out; fix 2015-04-13 20:57:01 -04:00
PatR
615b25f5fc lint bits 2015-04-13 17:50:17 -07:00
PatR
cf74f1cfd8 regex lint 
For the POSIX regexp interface, move local declaration to beginning
of block to avoid requiring C99.  Also switch to alloc() from bare
malloc() so that MONITOR_HEAP won't log a free which doesn't match
up to any allocation.  This results in a change in behavior:  if
the allocation fails, nethack will panic rather than report an
option parsing error.  In practice there will be no difference
because nethack is not going to run out of dynamic memory during
initial options processing.
 2015-04-13 17:21:59 -07:00
keni
b490b10b0f Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-13 19:33:26 -04:00
keni
4e45cf3e7f nhsub: handle git add/commit options that take an argument 2015-04-13 19:32:51 -04:00
Pasi Kallinen
879f6d55c2 Add Auto open doors -patch 2015-04-13 21:11:44 +03:00
Pasi Kallinen
1dd43be266 Inaccessible niches occasionally have iron bars 2015-04-13 19:55:10 +03:00
Pasi Kallinen
1c970b171e Some monsters can eat through iron bars 
Any monster with rusting or corrosion attack can eat through
the bars. This includes rust monsters, grey oozes, and black puddings.

Original patch by Malcolm Ryan
 2015-04-13 19:41:51 +03:00
Pasi Kallinen
6209d458f9 A camera may contain a picture-painting demon 
Original patch by Leon Arnott
 2015-04-13 18:54:24 +03:00
Pasi Kallinen
eba5bf7d5e Add litmus test 
Original patch by Dylan O'Donnell
 2015-04-13 18:30:53 +03:00
Pasi Kallinen
0b0c769a05 Use our dupstr instead of strdup 2015-04-13 10:07:12 +03:00
Pasi Kallinen
ee5002210f Fix gitignored 2015-04-13 08:30:47 +03:00
Alex Kompel
aae391d274 Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource into win32-x64-working 2015-04-12 17:51:32 -07:00
Alex Kompel
261c128b84 win32-gui: fix menu item measuring bug (ever-increasing item height on window resize) 2015-04-12 17:47:42 -07:00
nhmall
6e62d56367 fix Makefile build in branch 2015-04-12 20:27:21 -04:00
nhmall
ed783b9940 yet more integration bits (thanks to my typo) 2015-04-12 16:48:06 -04:00
nhmall
636da9887b more regex integration bits 2015-04-12 13:27:36 -04:00
nhmall
5dd00aca54 Makefile bit following merge 2015-04-12 12:16:59 -04:00
nhmall
7e781d4013 Merge branch 'master' into win32-x64-working 
Conflicts:
	include/config.h
	src/options.c
 2015-04-12 11:58:14 -04:00
nhmall
a66224f9dc Add some new files to top level Files 2015-04-12 11:46:56 -04:00
Derek S. Ray
38861c1e0d add cppregex.cpp to NetHackW so it'll link properly 2015-04-12 11:46:56 -04:00