Commit Graph
348 Commits
Author SHA1 Message Date
Anders Jenbo 4ae75753c8 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-09 01:24:02 +01:00
SourceCodeDeleted 39a9ada5ff [Hellfire] DoEnding BinExact (#2151) 2020-11-08 22:53:05 +01:00
qndel 3ce3dedd4d Cleanup (#2147) 2020-11-07 12:34:07 +01:00
qndel c94c04d049 some cleanup (#2146) 2020-11-04 03:33:40 +01:00
Anders Jenbo fa3785a475 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-04 03:02:48 +01:00
Anders Jenbo dca5a135b6 Reorder monster.cpp 2020-11-03 19:26:03 +01:00
Anders Jenbo 43b5dea6e5 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-03 00:56:51 +01:00
Anders Jenbo 2867b811c0 Fix incorrectly mapped functions in hellfire 2020-11-02 18:28:24 +01:00
Anders Jenbo 72e2637061 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-25 17:38:06 +01:00
qndel fa0b326498 unify names 2020-10-24 08:07:56 +02:00
Anders Jenbo a2d431cbc0 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-22 23:51:57 +02:00
Anders Jenbo 8b877603a8 Fix spawning NaKrul 2020-10-22 23:51:19 +02:00
Anders Jenbo e90f84dd03 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-22 22:14:49 +02:00
qndel 36dba1cc1c cleanup (#2127) 2020-10-22 17:26:24 +02:00
Anders Jenbo e073422ce7 Unify executable for Spawn and Retail
The game will now autodetect if it should run in shareware mode or full
retail based on the found mpq file. Additionally it can beforced in the
shareware mode with --spawn even if the retail data is found.

This simplifies a lot of the spagetty code and lets us better refactor,
also worth noteing is that we won't have to setup a secound set of build
tests.
2020-10-20 19:42:01 +02:00
Anders Jenbo 8eeab8a93e Fix OOB in monster_posok 2020-10-14 08:50:03 +02:00
Anders Jenbo 2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
Anders Jenbo 7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
Anders Jenbo f1a193e1e2 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-11 07:01:25 +02:00
pionere 92cc9d589c Apply another bunch defines 2020-10-11 06:42:13 +02:00
pionere f0a51ccf65 use defs instead of literals 2020-10-11 06:37:14 +02:00
Anders Jenbo f5647c4788 Merge branch 'master' of github.com:diasurgical/devilution 2020-09-28 02:11:28 +02:00
pionere f6d16b4907 UCHAR_MAX to squelch 2020-09-28 01:55:03 +02:00
Anders Jenbo 893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Anders Jenbo 8272a37aea Add connection state and player state enums 2020-09-25 06:47:11 +02:00
Anders Jenbo f1c7e65ba7 Fix build 2020-09-17 00:45:22 +02:00
Troy Bronzan 5b1b5fa8ae Fixed monster to hit and unique monster ac difficulty bonus. 2020-09-17 00:09:56 +02:00
Juliano Leal Goncalves 1e8bba9109 Remove blank space before ':' on monster info 2020-09-12 02:05:52 +02:00
Robin Eklindandqndel 85ece87a75 Update Source/monster.cpp
Co-authored-by: qndel <[email protected]>
2020-07-16 00:06:28 +02:00
Robin Eklind 7b63273336 monster: add BUGFIX comment to DirOK
The issue here is probably very unlikely to trigger anything in-game, as
the first 4 monster array elements are reserverd for golems. However,
after executing the body of the `if (mi != 0) { mi-- }` if-statement,
it is not possible to determine whether mi was 0 or 1 before executing
the body. This is relevant as the pack member check should only be
performed if mi was non-zero prior to executing the body of the
if-statement.

A fixed may look something as follows:

	if (mi != 0) {
		mi--;
		// BUGFIX: should only run pack member check if mi was non-zero prior to executing the body of the above if-statemnet (fixed).
		if (monster[mi].leaderflag == 1
		    && monster[mi].leader == i
		    && monster[mi]._mfutx == x
		    && monster[mi]._mfuty == y) {
			mcount++;
	}
2020-07-16 00:06:28 +02:00
Robin Eklind 7cabbb43f6 monster: add BUGFIX to MAI_Golum
The dMonster array stores monster array index numbers + 1
(or the corresponding negative version -(index + 1)).
Prior to use, these must be decremented by 1.
2020-07-16 00:06:28 +02:00
Anders Jenbo c1b4d3d8b5 Copy documentation from sanctuary/notes 2020-07-06 05:43:25 +02:00
Anders Jenbo 36e319cb7f Add bugfix to MonstStartKill 2020-06-06 20:03:27 +02:00
Anders Jenbo 7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo f066b57cd0 Merge master in to hellfire 2020-04-09 02:14:08 +02:00
Anders Jenbo 2ec7c78eae Format source 2020-04-08 22:28:53 +02:00
Anders Jenbo c384711a5f Backport cleanups from hellfire branch 2020-04-08 20:16:32 +02:00
Anders Jenbo e6e0ebe15a Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-07 03:46:20 +02:00
Anders Jenbo f1c216e688 Make player struct x/y fields match monster struct 2020-04-07 03:26:38 +02:00
Anders Jenbo f7de4c46a7 Strip eflag logic now that it is fixed in the render 2020-04-06 22:51:32 +02:00
Anders Jenbo b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02:00
Anders Jenbo 776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02:00
galaxyhaxz c632e2d1d0 Names and bug fixes (#1974) 2020-03-12 04:32:53 +01:00
Anders Jenbo ba084d25a6 [hellfire] PostOkMonst, PostOkMonst2, PostOkMonst3 and monster_posok 2020-03-12 04:30:27 +01:00
Anders Jenbo 86830baadc [hellfire] CheckMonsterHit 2020-03-12 04:29:18 +01:00
galaxyhaxzandRobin Eklind 71565b9c02 Several updates [enums+names] (#2002)
* Several updates

* Correct msg_get_next_packet

* Update enums.h

Co-Authored-By: Robin Eklind <[email protected]>

Co-authored-by: Robin Eklind <[email protected]>
2020-03-11 21:27:40 -05:00
Anders Jenbo 3c276a3cd3 Add documentation
- Add file documentation to about 1/4 of the files in Source
- Copy over a lot of the documentation from the sanctuary/notes repo
- Standardise all the existing documentation
- Create a configuration for Doxygen
- Add more documentation (engine.cpp is now fully documented)
2020-03-01 22:18:00 +01:00
Anders Jenbo 25993b4043 Merge branch 'master' of github.com:diasurgical/devilution 2020-02-14 23:03:31 +01:00
Robin Eklind 27b40436a9 Use pointers instead of references for Devilution exported API
With this change, all exported declarations of Devilution are now
compatible with the C-ABI; that is, all declarations of Source/*.h.

This makes it possible to link against DevilutionX from mods written in
other languages than C++, for instance Rust, Go or Python.

Updates #612.
2020-02-14 22:41:13 +01:00
Anders Jenbo 20621a0642 add all.h and use in place of diablo.h (#2005)
Now diablo.h is treated in the same way as all other header files of
Source, as it only contains the declarations of global variables and
functions of diablo.cpp.

Besides consistency, this also enables mods to include diablo.h just
like any other header file without having to include every header file
(and without having to include C++ specific aspects of the now all.h).
2020-02-14 13:12:54 +01:00