Commit Graph
102 Commits
Author SHA1 Message Date
Anders Jenbo 88a715cdcc Clean up narator sound logic
Also this provides a helper function for calculating the length of a
sound
2021-01-24 07:08:11 +01:00
Anders Jenbo 6f8f4c3293 Unify another chunk of simple Hellfire code paths 2021-01-07 07:19:07 +01:00
Anders Jenbo e609e170d0 Merge a large chunk of Hellfire the code paths 2021-01-06 08:07:20 +01:00
Anders Jenbo fa3785a475 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-04 03:02:48 +01:00
Anders Jenbo 43b5dea6e5 Merge branch 'master' of github.com:diasurgical/devilution 2020-11-03 00:56:51 +01:00
Anders Jenbo 95173539ce Reorder effects.cpp 2020-11-02 15:50:09 +01:00
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 7ffb595370 Load rouge and sorceror sounds in multiplayer 2020-10-20 20:54:30 +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 c009b72d9d Unify SFX enums 2020-10-20 08:05:45 +02:00
Anders Jenbo 2d6c1efeab Merge branch 'master' of github.com:diasurgical/devilution 2020-10-12 10:46:28 +02:00
BDC 74938fdacd Fix memory leak with audio stream not been released
SFileChunk was not been release.
2020-04-17 09:36:55 +02:00
Anders Jenbo 7108145a04 Merge branch 'master' of github.com:diasurgical/devilution 2020-04-14 15:30:49 +02:00
Anders Jenbo 630655d9e4 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-08 21:58:34 +02:00
Anders Jenbo edcd92e012 Misc clean ups that missed last round 2020-04-08 21:47:32 +02:00
Anders Jenbo cc280eeba3 Enable asserts in files that where cleaned 2020-04-08 20:41:11 +02:00
Anders Jenbo c9db23de5b Correct sfx_* names, can be seen in assert strings 2020-04-08 20:34:45 +02:00
Anders Jenbo 7db4ed749a Apply more enums, defines and types 2020-04-08 20:18:11 +02:00
Anders Jenbo c384711a5f Backport cleanups from hellfire branch 2020-04-08 20:16:32 +02:00
Anders Jenbo 684d6b73f8 Correct ifdef 2020-04-08 14:30:28 +02:00
Anders Jenbo 1fc287e504 Use define to minimize ifdef in effects.cpp 2020-04-08 00:47:57 +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 b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02:00
Anders Jenbo 187a021b30 More documentation from sanctuary/notes (#2026) 2020-03-30 11:31:36 +02:00
Anders Jenbo 776ab10476 Merge branch 'master' of github.com:diasurgical/devilution 2020-03-29 23:40:05 +02:00
galaxyhaxz f89204e7dd Fix function/var names (effects/sound) 2020-03-24 00:22:36 -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
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 c26fa8fa3f Remove threading from miniwin 2020-02-11 01:24:43 +01:00
Anders Jenbo 40cea40aa4 Remove windows call types collisions 2019-12-26 05:00:02 +01:00
Anders Jenbo da03bae69d Merge branch 'master' of github.com:diasurgical/devilution 2019-12-25 20:38:25 +01:00
Anders Jenbo 7369deba1b Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-25 20:25:56 +01:00
Anders Jenbo 0c90ad0527 Set bool values TRUE/FALSE 2019-12-22 23:57:10 +01:00
Anders Jenbo 85ab626437 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-15 02:22:17 +01:00
Gleb Mazovetskiy ef20d1a038 Fix more UBSAN errors 2019-11-07 10:02:09 +01:00
Anders Jenbo 4e8a8d2157 Merge remote-tracking branch 'refs/remotes/devilution/master' 2019-10-26 13:43:28 +02:00
Robin Eklind e155a9423e rename random to random_ to avoid collision with random in stdlib.h
Fixes #1813.
2019-10-21 09:56:36 +02:00
Anders Jenbo ba9288c6cf Unify error dialogs, for looks and portability
- Use UiOkDialog() to display all error messages
- Add SDL simple message, and console fallbacks to UiOkDialog()
- Boot graphics early on to facilitate most error messages with build in
gui
- Some more miniwin clean ups
2019-10-06 01:27:11 +02:00
Anders Jenbo 1d03064fee Clean up sound code 2019-09-25 11:32:30 +02:00
Anders Jenbo 14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
qndel 847f69165d [hellfire] stream_update bin exact 2019-09-08 22:04:18 +02:00
Anders Jenbo 10c33575ac Clean ups from hellfire branch 2019-08-31 07:35:04 +02:00
Anders Jenbo 0abe56f006 [hellfire] RndSFX, stream_update and priv_sound_init 2019-08-30 12:23:06 +02:00
Anders Jenbo 98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Robin Eklind fab7f1b5fa effects: rename monster_action_sounds to MonstSndChar
Rationale described in https://github.com/sanctuary/notes/commit/f609ea371d0768a6927d5e8ef931d23243d73387:
as included below:

Note, the PSX sym file does not seem to include the
original name for monster_action_sounds. However, it
does include the names for very similar global
variables used for players rather than monsters, so
from these we may infer a similar name for
monster_action_sounds.

In particular, ArmourChar, WepChar and CharChar are
used for player graphics. So, following the same naming
convention we arrive at MonstSndChar.
2019-08-18 07:44:22 +02:00
Anders Jenbo 68d51e7d27 Implementing Spawned Shareware version 2019-08-12 16:04:20 +02:00