Commit graph

53 commits

Author SHA1 Message Date
Xadhoom
148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo
7c071924ad Format recently cleaned code 2019-07-06 05:13:01 +02:00
Anders Jenbo
4ff5197291 merge devilution 2019-06-28 21:53:52 +02:00
galaxyhaxz
24595d3565 dx_init bin exact (proper fix) 2019-06-25 13:39:13 +02:00
Anders Jenbo
73a29f0e68 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-18 16:55:20 +02:00
Robin Eklind
894566e5a7
Merge pull request #1019 from diasurgical/UiProgressDialog
Correct types based on DevilutionX
2019-05-12 12:38:50 +09:00
Anders Jenbo
228dbf4897 Cast pointer to a CPU appropriate size 2019-04-30 15:36:32 +02:00
Anders Jenbo
2327526a62 Merge branch 'master' of github.com:diasurgical/devilution 2019-04-26 19:22:49 +02:00
Robin Eklind
307a169ac8
Merge pull request #970 from diasurgical/dx.cpp
Clean up dx.cpp
2019-04-26 18:56:09 +09: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
Anders Jenbo
65b9fb87a8 Merge branch 'TownDead' 2019-04-24 14:08:25 +02:00
galaxyhaxz
b76156e206 Implement breakpoint handler 2019-04-22 21:13:34 -05:00
galaxyhaxz
3a636fdcc6
Add missing functions for MI_Dummy (#1004) 2019-04-22 20:21:52 -05:00
galaxyhaxz
55793ef55f
dx_init and windowed mode (#967) 2019-04-21 19:51:42 -05:00
galaxyhaxz
540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02:00
Anders Jenbo
826b7fd696 Clean up dx.cpp 2019-04-18 03:29:13 +02:00
Robin Eklind
9fabd3dc8f
Merge pull request #966 from galaxyhaxz/LockBuffer
Rename lock_buf
2019-04-17 11:21:04 +09:00
galaxyhaxz
fd53ad06ba Rename lock_buf 2019-04-16 20:16:35 -05:00
galaxyhaxz
3446e3c9a9 Add defs for screen resolution 2019-04-16 19:43:50 -05:00
galaxyhaxz
cef65ea0b6 Implement Critical section constructor 2019-04-15 01:16:43 +02:00
galaxyhaxz
b228d6e00a Palette fix for newer Windows 2019-04-12 22:42:39 -05:00
galaxyhaxz
4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
Anders Jenbo
a907a4d49b Merge branch 'master' of github.com:diasurgical/devilution 2019-04-05 15:21:53 +02:00
galaxyhaxz
5238265702
Implement assert support (#791) 2019-03-29 21:26:37 -05:00
Anders Jenbo
bc26a2f730 Merge branch 'master' of github.com:diasurgical/devilution 2019-03-18 21:52:35 +01:00
galaxyhaxz
befd52c003 Fix type for 'gpBuffer' (#672) 2019-03-18 22:28:38 +09:00
Xadhoom
5283a9ffd1 Put everything into namespace dvl 2019-03-11 20:10:23 +00:00
Anders Jenbo
9b7da61dcf Auto format src 2019-01-13 18:55:59 +01:00
Anders Jenbo
54247a076c C init (#549)
* Make initializers C compatible

* Compile more files as C

dthread.cpp dx.cpp init logging.cpp fault.cpp msgcmd.cpp nthread.cpp

* Update defs.h
2019-01-10 21:39:28 +01:00
Anders Jenbo
e795b6116a Make use of atexit() C compatible (#537) 2019-01-01 03:05:29 +01:00
Anders Jenbo
86018b174b Make DirecX usage C compatible 2018-12-31 03:17:08 +01:00
Anders Jenbo
47bf82b059 C compatability from a-d (#518) 2018-12-29 15:12:19 +01:00
Anders Jenbo
b1f6d3698f Update style to use tabs 2018-10-25 22:53:04 +02:00
Anders Jenbo
553086dca7 Format graphics related files 2018-10-22 01:35:07 +02:00
Anders Jenbo
b1b80c957a Clean up dx_create_back_buffer 2018-10-21 16:13:29 +02:00
Anders Jenbo
7d27f1985b Correct type for fullscreen 2018-10-21 16:13:29 +02:00
Anders Jenbo
2c923f9183 Clean up dx_create_primary_surface 2018-10-21 16:13:29 +02:00
Anders Jenbo
c5fa8a1a94 Clean up lock_buf_priv 2018-10-21 16:13:29 +02:00
Anders Jenbo
16b8b32cf1 Clean up dx_reinit 2018-10-21 16:13:29 +02:00
Anders Jenbo
0c896852de Clean up unlock_buf_priv 2018-10-21 16:13:29 +02:00
Anders Jenbo
a39453dfeb Clean up dx_DirectDrawCreate 2018-10-21 16:13:29 +02:00
Robin Eklind
9772cd0743 Add definition of j_lock_buf_priv and j_unlock_buf_priv for debug release.
Also add a debug target for MakefileVC.
2018-10-06 14:44:37 +02:00
Robin Eklind
3103da7f1d
Add missing arg to j_lock_buf_priv and j_unlock_buf_priv (#374) 2018-10-06 14:42:52 +02:00
nomdenom
4bb6bde99b Use sizeof() for memset()
I checked that the sizes do match. (+1 squashed commits)
2018-09-27 19:23:21 -07:00
Andrew Dunstan
aedf7555d1 Remove A suffix from all string-related win32 API function names 2018-09-16 02:52:51 +10:00
galaxyhaxz
d991f63b16
Fix type of screen_buf_end (#184) 2018-08-27 22:16:26 -05:00
galaxyhaxz
5ff8756116
Fix junk (#174) 2018-08-21 23:58:17 -05:00
galaxyhaxz
775ae59e18
Fix function signatures and others (#158)
Fix InitObjects, themes.cpp, names
2018-08-12 18:32:48 -05:00
galaxyhaxz
49a6f4f9fc
Add include guards, prepare for XRef (#28)
Add definitions, other junk.
2018-06-20 05:17:44 -05:00