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
374e8177ef
Remove wave.cpp
2021-01-23 21:24:25 +01:00
Anders Jenbo
9b1568cc08
Startup issues with shareware version
2021-01-17 16:04:13 +01:00
Anders Jenbo
c802cbdc4d
Merge more Hellfire code paths
2021-01-05 23:14:35 +01:00
Anders Jenbo
16c00f3119
Always save sound and video settings to the same section of the ini
2020-12-31 04:36:01 +01:00
Anders Jenbo
d4976f70ac
Merge branch 'master' of github.com:diasurgical/devilution
2020-11-09 06:36:10 +01:00
Anders Jenbo
72e2637061
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-25 17:38:06 +01: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
2d6c1efeab
Merge branch 'master' of github.com:diasurgical/devilution
2020-10-12 10:46:28 +02:00
Anders Jenbo
893efd51ea
Merge branch 'master' of github.com:diasurgical/devilution
2020-09-27 03:34:42 +02:00
Anders Jenbo
7108145a04
Merge branch 'master' of github.com:diasurgical/devilution
2020-04-14 15:30:49 +02:00
Anders Jenbo
3c5982083f
Merge branch 'master' of github.com:diasurgical/devilution
2020-04-06 12:05:13 +02:00
Anders Jenbo
776ab10476
Merge branch 'master' of github.com:diasurgical/devilution
2020-03-29 23:40:05 +02:00
Anders Jenbo
25993b4043
Merge branch 'master' of github.com:diasurgical/devilution
2020-02-14 23:03:31 +01:00
Anders Jenbo
08aa6a860a
Move generic helpers out of miniwin
2020-02-01 13:56:08 +01:00
Anders Jenbo
6e9987cc93
Rename dsound and it nolonger reflects DirectSound
2020-01-31 01:20:10 +01:00
Anders Jenbo
171323b987
Make sure that sgbSaveSoundOn is initialized
...
Fixes #480
2019-12-30 22:58:52 +01:00
Anders Jenbo
16d3fa69c6
Fix checking if sound is playing
...
Fixes #392
2019-12-26 17:15:50 +01:00
Anders Jenbo
4cc4cd011c
Merge branch 'master' of github.com:diasurgical/devilution
2019-10-28 21:57:36 +01:00
Anders Jenbo
0e578ffb11
Enable assertions
2019-10-22 19:04:55 +02:00
Anders Jenbo
810b12a37d
Drop unused code
2019-10-13 00:08:24 +02:00
Anders Jenbo
a8e4db538f
Display SDL error messages in UI dialog
...
This will also end the application in most cases
2019-10-12 23:02:04 +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
97e09e3e25
Fix music in shareware
2019-10-03 23:12:33 +02:00
Anders Jenbo
d2c4b461d4
Add option to compile shareware version
2019-10-01 17:42:40 +02:00
Anders Jenbo
18532e7c9b
Format SourceX and SourceS
...
Fixes #262
2019-09-26 01:28:27 +02:00
Gleb Mazovetskiy
2bfcbbfb2f
Fix memory leak in sound.cpp
...
Also link ASAN for devilutionx
2019-09-25 21:28:46 +02:00
Anders Jenbo
1d03064fee
Clean up sound code
2019-09-25 11:32:30 +02:00
Anders Jenbo
88813c4042
Strip some now unused parts of miniwin and windows api
2019-09-25 01:18:42 +02:00
Pyr0Byt3
2c8641194d
fix multiple voices playing simultaneously
2019-09-24 19:41:01 +02:00
Gleb Mazovetskiy
85295838a4
An option to use SDL1 instead of SDL2
...
Adds a USE_SDL1 build option to use SDL v1 instead of v2.
This is useful for porting Diablo on devices that don't support SDL2,
such as the RetroFW / OpenDingux devices (e.g. RG300 Retro Gaming Handheld)
Not yet supported:
* Fullscreen
* Upscaling
* Audio
2019-09-23 01:42:05 +02:00
Anders Jenbo
6a73d98e25
Remove reamaning dummy methodes only used in sound.cpp and dx.cpp
2019-08-27 04:35:34 +02:00
Anders Jenbo
1ebf8fe27d
Remove unused fallbacks
2019-08-26 14:05:04 +02:00
Alex Yatskov
f1da6e6a38
Fix invalid file and line constants ( #222 )
...
* Fix invalid file and line constants
* add macros
* remove ASSERT_FAIL macro
2019-08-07 15:49:20 +02:00
Anders Jenbo
b919548f55
Avoid audio system conflicts during video playback
2019-07-21 23:26:01 +02:00
Anders Jenbo
4c314380ee
Correct line encoding
2019-07-06 16:50:38 +02:00
Anders Jenbo
9496f151cd
Fix bug from upstream
2019-06-15 11:27:39 +02:00
Anders Jenbo
0f8545d3c4
Clean up SDL error logging
2019-05-21 22:36:27 +02:00
Anders Jenbo
b81ca8502d
Fix some memory leaks
2019-05-12 23:35:48 +02:00
Anders Jenbo
b78a8c5ef2
Merge sound.cpp
2019-04-07 18:33:35 +02:00
Anders Jenbo
3f9691bf2c
Enable building with MSVC 2017 ( #75 )
2019-04-06 15:08:20 +02:00
Anders Jenbo
a907a4d49b
Merge branch 'master' of github.com:diasurgical/devilution
2019-04-05 15:21:53 +02:00
Anders Jenbo
bc26a2f730
Merge branch 'master' of github.com:diasurgical/devilution
2019-03-18 21:52:35 +01:00
Xadhoom
f00e427ed2
Remove pch.h
2019-03-17 18:28:37 +00:00
Xadhoom
545009f729
Fix merge
2019-03-16 13:15:07 +00:00
Xadhoom
83d902c4a4
Merge branch 'master'
2019-03-16 12:37:02 +00:00
Anders Jenbo
0bd6375969
Implementing dsound wrapper
2019-03-16 03:16:08 +01:00
Xadhoom
ba0faf2d0c
miniwin fully macro-clean
2019-03-13 15:39:58 +00:00
Xadhoom
c1ba436e69
miniwin_misc.h macro-clean
2019-03-13 13:23:05 +00:00
Xadhoom
30fbfa36a1
Progress with miniwin macros
2019-03-11 23:48:35 +00:00