Anders Jenbo
72e2637061
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-25 17:38:06 +01:00
Gleb Mazovetskiy
ec329e645c
Fix all "no-write-strings" warnings
2020-10-25 15:37:51 +01: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
09a51aa300
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-18 15:25:51 +02:00
Anders Jenbo
5e535c43bb
Update Source/objects.cpp
2020-10-16 23:50:21 +02:00
Chance4us
2477d956e9
[hellfire] correct the name for barrels
2020-10-16 22:51:32 +02:00
Anders Jenbo
ad2ac2aeeb
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-15 03:55:36 +02:00
Anders Jenbo
1a57d98484
Clean up InitObjectGFX
2020-10-15 03:19:18 +02:00
Anders Jenbo
57326c6c7f
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-14 11:02:48 +02:00
Anders Jenbo
e48e10a44c
Add Hellfire barral sounds
2020-10-14 10:58:40 +02:00
Anders Jenbo
749cda49f1
Implement loading of hellfire object files
2020-10-14 09:31:05 +02:00
Anders Jenbo
e773e76fdc
Apply enums
2020-10-14 08:52:04 +02:00
Anders Jenbo
13258db968
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-13 23:51:12 +02:00
Anders Jenbo
3157885502
Correct shareware ifdefs
2020-10-13 07:42:35 +02:00
Anders Jenbo
b62b3375bd
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-13 02:05:36 +02:00
Anders Jenbo
9e4458edc2
Add data for hellfire shrines
2020-10-13 00:37:59 +02:00
qndel
a62ea81495
more cleanup
2020-10-12 14:59:29 +02:00
qndel
132723e851
door fix
2020-10-12 14:55:25 +02:00
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