Commit graph

127 commits

Author SHA1 Message Date
Anders Jenbo
02416d3fc7 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-12 18:15:34 +02:00
galaxyhaxz
3c7a08a336
Fix function order [scrollrt.cpp] (#1800) 2019-10-12 06:27:58 -05:00
Anders Jenbo
d840f388c7 Merge branch 'master' of github.com:diasurgical/devilution 2019-10-08 22:05:10 +02:00
arczi84
1ab2fb2666 Endian madness 2019-10-08 02:28:03 +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
qndel
0fb6025948 scrollrt_draw_lower_2 cleanup 2019-10-03 18:32:48 +02:00
qndel
2dadb3e3a3 scrollrt_draw_lower cleanup 2019-10-03 18:32:36 +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
Robin Eklind
d16f603537 all: remove unused storm imports
While no storm functions are called from these source files
it is determined that they included storm in the original
source files as made visible by the inclusion of infinity
in the data segments of the respective source files.

ref: diasurgical/devilution#1695.
2019-09-20 11:05:25 +02:00
Anders Jenbo
14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
qndel
6cf1da4045 Apply enums to _mFlags 2019-08-31 09:21:15 +02:00
qndel
a17e34c4bf applied enums to _pmode and untangled ifs 2019-08-31 06:23:35 +02:00
Anders Jenbo
1ebf8fe27d Remove unused fallbacks 2019-08-26 14:05:04 +02:00
Anders Jenbo
f605138c79 Strip ASM code 2019-08-26 13:33:03 +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
2fcf8dab70 Merge branch 'master' of github.com:diasurgical/devilution 2019-07-21 19:39:17 +02:00
Anders Jenbo
9d3ce818f0 Correct BOOLS 2019-07-21 19:11:11 +02:00
Anders Jenbo
6fba17eec5 Correct GLOBAL types based on PSX SYM 3 2019-07-21 04:10:31 +02:00
Anders Jenbo
5ab9f4609a Clean up signedness 2019-07-21 00:57:53 +02:00
Sergey Semushin
843ae57592 Make scrollrt_draw_dungeon bin exact. 2019-07-20 21:42:58 +03:00
Anders Jenbo
60ee365dff Merge branch 'master' of github.com:diasurgical/devilution 2019-07-20 19:52:50 +02:00
Joan Karadimov
f695061d05 Replace resolution-related hard-coded numbers with constants 2019-07-20 17:24:34 +02:00
Anders Jenbo
3bc8ba66b0 Use defines for more screen geometry values 2019-07-20 17:10:49 +02:00
Anders Jenbo
a7ad382c10 Get scrollrt_draw_dungeon to min diff
Co-Authored-By: Sergey Semushin <predelnik@gmail.com>
2019-07-20 00:29:11 +02:00
Xadhoom
148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo
55b5ce883d Clean up unformatted files 2019-07-08 04:28:31 +02:00
Anders Jenbo
d2cb6a59e7 Apply scrollrt naming to town.cpp 2019-07-05 13:23:48 +02:00
Anders Jenbo
f187fe7d3a Merge branch 'master' of github.com:diasurgical/devilution 2019-06-22 18:14:48 +02:00
Anders Jenbo
d437d48f66 Align scrollrt_draw_dungeon with cliped versions 2019-06-17 21:37:40 +02:00
Anders Jenbo
e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Anders Jenbo
dec73be85e Apply bflags 2019-06-14 02:10:17 +02:00
Manuel K
97c1edd3a0 Use BUFFER_WIDTH 2019-06-05 20:13:34 +02:00
Anders Jenbo
8cb04b0d9b Merge branch 'master' of github.com:diasurgical/devilution 2019-06-02 19:11:49 +02:00
Manuel K
896933f55e Replace magic number 352 with VIEWPORT_HEIGHT (#1232) 2019-06-02 17:51:33 +01:00
Anders Jenbo
ce056b02d8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-30 14:40:33 +02:00
Anders Jenbo
565bb5aa7d Adust dFlag enums 2019-05-29 16:23:08 +01:00
Anders Jenbo
f1d54cee52 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-23 18:12:54 +02:00
galaxyhaxz
31cbaed01e fix name type 2019-05-22 08:30:59 +01:00
Anders Jenbo
73a29f0e68 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-18 16:55:20 +02:00
galaxyhaxz
6e37114459 Add defs for border pixels 2019-05-16 09:24:56 +01:00
Anders Jenbo
23e7737c75 Merge branch 'master' of github.com:diasurgical/devilution
Fixes #92
2019-05-05 00:27:08 +02:00
Anders Jenbo
d61b3e3b63 Clean up scrollrt.cpp 2019-05-02 00:16:46 +01:00
Anders Jenbo
a46ef68b2c Merge branch 'master' of github.com:diasurgical/devilution 2019-04-29 02:29:39 +02:00
galaxyhaxz
f44ef05e5e scrollrt_draw_clipped_dungeon_2 2019-04-28 15:25:56 +02:00
galaxyhaxz
2d2461cc3d scrollrt_draw_clipped_dungeon 2019-04-28 02:20:11 +02:00
Anders Jenbo
2327526a62 Merge branch 'master' of github.com:diasurgical/devilution 2019-04-26 19:22:49 +02:00
galaxyhaxz
029b15f298 Fix type for Dungeon Micros 2019-04-26 03:17:06 +02:00
Xadhoom
6856fb74e2 Merge upstream beanch 'devilution/master' 2019-04-25 20:44:01 +00:00
galaxyhaxz
792fc65bea
Add support for 32-bit colors (#1018) 2019-04-25 02:39:24 -05:00