Commit graph

395 commits

Author SHA1 Message Date
Anders Jenbo
cec9579186 Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:48:34 +02:00
Anders Jenbo
2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
Anders Jenbo
e837130a98
Add missing book names (#2113) 2020-10-12 09:13:26 +02:00
qndel
1d84a096d1 fix compiling 2020-10-12 01:07:26 +02:00
qndel
b81d2eb831
some cleanups (#2099) 2020-10-12 00:42:02 +02:00
qndel
baa2eacb0c
OperateFountain cleanup (#2096) 2020-10-12 00:24:36 +02:00
qndel
95e084dbd3
apply enums (#2088) 2020-10-12 00:23:59 +02:00
qndel
92c6d23fad
apply DIABOOLS (#2097) 2020-10-12 00:22:13 +02:00
qndel
613fe07b48 BreakBarrel cleanup 2020-10-12 00:11:48 +02:00
qndel
cf15c6e9d2 FindValidShrine cleanup + enums 2020-10-12 00:11:05 +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
b948f0212c MAXBELTITEMS + PMSG_COUNT 2020-10-11 06:41:17 +02:00
pionere
f0a51ccf65 use defs instead of literals 2020-10-11 06:37:14 +02:00
Anders Jenbo
893efd51ea Merge branch 'master' of github.com:diasurgical/devilution 2020-09-27 03:34:42 +02:00
Anders Jenbo
f9b7ac3bfa Expose chest with traps to set maps 2020-09-20 01:27:36 +02:00
Anders Jenbo
cd2f7fc4d4 Fix mapping objects and monsters
Added sound to fire trap lever
Added damage to fire trap

Fix rendering of skull pile

Remove one to many hellfire monsters

Remove duplicate items from ObjTypeConv
Remove slain hero (crashes game on low level heros)
Remove water (it's miss aligned and not realy useful)
Added trap variants of all chests
Added book stand
Removed door objects (they aren't of much use and will crash the game if
used on the wrong levels)
Rmoved all story books (crashes game if not use on the right level, tied
to specific quests etc)
2020-09-19 14:23:57 +02:00
Anders Jenbo
e226b918a0 Clean up enum usage 2020-09-19 14:22:34 +02:00
Cyril SIX
fb87bab3eb Fixing explosive barrels prespawning skeletons
The AddBarrel function was not checking the type of the barrel when
generating the oVar2. This led to skeletons being pre-spawned in
explosive barrels; except that explosive barrels do not trigger the
spawn, resulting in unreachable monsters sitting at (0, 0) even after a
full clear.

While this does not affect functionality of regular Diablo gameplay, it
potentially affects modders who would like to use the nummonsters
global variable to check for full clears.
2020-09-01 06:51:57 +02:00
Anders Jenbo
c1b4d3d8b5 Copy documentation from sanctuary/notes 2020-07-06 05:43:25 +02:00
Anders Jenbo
1ba96a6777 Add doxygen description to remaining engine files 2020-07-06 05:43:25 +02:00
Anders Jenbo
f62f983622 Fix broken wall tile 2020-04-18 16:28:55 +02:00
Anders Jenbo
7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +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
3c5982083f Merge branch 'master' of github.com:diasurgical/devilution 2020-04-06 12:05:13 +02:00
Anders Jenbo
cc0f92d45b Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-06 06:09:30 +02:00
Anders Jenbo
a291939a7d Value types 2020-04-06 05:43:20 +02:00
Anders Jenbo
53ccf38a8c Bool types 2020-04-06 05:43:20 +02:00
Anders Jenbo
31181b77c4 Bool comparisons 2020-04-06 05:43:20 +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
galaxyhaxz
71565b9c02
Several updates [enums+names] (#2002)
* Several updates

* Correct msg_get_next_packet

* Update enums.h

Co-Authored-By: Robin Eklind <mewmew@users.noreply.github.com>

Co-authored-by: Robin Eklind <mewmew@users.noreply.github.com>
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
Anders Jenbo
40ba1e7a6f Merge branch 'master' of github.com:diasurgical/devilution 2020-02-01 14:48:39 +01:00
qndel
c2587d9786 use enums (#1997) 2020-01-28 17:33:34 +01:00
qndel
760b89138e [hellfire] new functions 2020-01-21 07:25:20 +01:00
qndel
3008439bc7 enums and stuff 2020-01-15 15:46:21 +01:00
Marco
29b9c99e5a added some more values from enums (#1955) 2020-01-14 17:30:13 +01:00
qndel
c11804d11f [hellfire] OperateStoryBook bin exact 2020-01-13 21:38:33 +01:00
qndel
c685a03a0e [hellfire] OperateL1LDoor bin exact 2020-01-13 21:37:03 +01:00
Anders Jenbo
5a469e7b97 Merge branch 'master' into hellfire 2020-01-13 00:02:47 +01:00
qndel
2cab17027e [hellfire] InitObjects bin exact 2020-01-12 22:52:49 +01:00
qndel
18abb94604 [hellfire] some loop fixes 2020-01-12 18:06:25 +01:00