Commit graph

58 commits

Author SHA1 Message Date
Anders Jenbo
60ee365dff Merge branch 'master' of github.com:diasurgical/devilution 2019-07-20 19:52:50 +02:00
Anders Jenbo
3bc8ba66b0 Use defines for more screen geometry values 2019-07-20 17:10:49 +02:00
Xadhoom
148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo
7883043adc Clean up files with dirty headers 2019-07-08 04:28:31 +02:00
Anders Jenbo
32a51d17ca Align function signatures with PSX symbols
Using
https://github.com/diasurgical/scalpel/tree/master/psx/_dump_/3/_dump_c_src_/diabpsx/source
as a reference
2019-07-08 04:12:12 +02:00
Anders Jenbo
d82ff771f4 Fix checking cursor target
This causes a crashes when compiled a debug build with Clang
2019-06-29 14:30:53 +02:00
Anders Jenbo
f187fe7d3a Merge branch 'master' of github.com:diasurgical/devilution 2019-06-22 18:14:48 +02:00
Anders Jenbo
a7788ccddf Format bin exact code 2019-06-17 04:55:41 +02:00
Anders Jenbo
e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Anders Jenbo
334c06c6d3 Correct type in calls to AddPanelString 2019-06-08 13:06:26 +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
0c4b4719b8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-09 23:51:21 +02:00
Anders Jenbo
0dd98cab27 Clean up trigs 2019-05-07 00:28:49 +02:00
galaxyhaxz
82e8d6ed60 Fix trigflag, trigs.cpp bin exact 2019-05-06 23:07:59 +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
07893a535a Clean up cursor.cpp 2019-05-02 00:16:46 +01:00
Xadhoom
6856fb74e2 Merge upstream beanch 'devilution/master' 2019-04-25 20:44:01 +00:00
Anders Jenbo
65b9fb87a8 Merge branch 'TownDead' 2019-04-24 14:08:25 +02:00
Anders Jenbo
55a0396f8f Clean up mem_free_dbg style 2019-04-22 13:22:57 +02:00
galaxyhaxz
540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02:00
galaxyhaxz
00e8417f98 CheckCursMove bin exact (#961) 2019-04-16 04:08:37 +02:00
Anders Jenbo
c0531bfc4c Some booleans 2019-04-16 02:30:48 +02:00
JustAnotherGuid
192e9a93d1 Split up Trigflag array into separate vars 2019-04-13 17:23:41 +02:00
Robin Eklind
6d49faba3e StartQuestlog bin exact. Also, fix type of questlog 2019-04-13 14:21:04 +02:00
galaxyhaxz
4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
Anders Jenbo
3f9691bf2c
Enable building with MSVC 2017 (#75) 2019-04-06 15:08:20 +02:00
Xadhoom
5283a9ffd1 Put everything into namespace dvl 2019-03-11 20:10:23 +00:00
Xadhoom
0ad1c713e4 fix possible, but not certain, upstream bugs 2019-01-26 20:44:50 +01:00
Xadhoom
52a5e1923a Bugfixes 2019-01-23 00:35:42 +01:00
Anders Jenbo
50186331f4 Apply enum and style to cursor.cpp 2019-01-12 18:05:51 +01:00
galaxyhaxz
3308bbf3eb Cleanup CheckCursMove [WIP] 2019-01-12 17:55:20 +01:00
galaxyhaxz
c3e8ff1c18 Add Assertion 2019-01-02 06:26:40 +01:00
galaxyhaxz
5bab5d12f7 cursor.cpp 2019-01-02 06:26:40 +01:00
Robin Eklind
e915623726 rename SetCursor to SetCursor_ to avoid collision with windows.h
Translation done automatically using:
	$ find . -type f -name '*.h' | xargs -I '{}' sar -i "([ \t])(SetCursor)[(]" '${1}${2}_(' '{}'
	$ find . -type f -name '*.h' | xargs -I '{}' sar -i "([ \t])(SetCursor)[(]" '${1}${2}_(' '{}'
2018-12-30 03:19:10 +01:00
Anders Jenbo
4a62a7c678 Code style 2018-12-29 02:15:20 +01:00
Anders Jenbo
ab3a6208d2 Use "BOOLEAN" instead of "bool"
bool is not defined in C
2018-11-26 12:35:03 +01:00
Anders Jenbo
507d12082f Use MAXDUR* in most instances 2018-11-04 22:27:26 +01:00
Anders Jenbo
e340ce2241 Monster.cpp (#442)
* Clean M_UpdateLeader

* Clean up M_DoRSpAttack

* Add definition for mFlags

Fixes #416
2018-10-27 20:47:43 +02:00
Anders Jenbo
b1f6d3698f Update style to use tabs 2018-10-25 22:53:04 +02:00
Anders Jenbo
27b23b4186 Format ingame UI 2018-10-22 01:31:21 +02:00
Anders Jenbo
6576954831 Clean up types used in gamemenu.cpp 2018-10-21 03:50:52 +02:00
Anders Jenbo
8f3d59e513 Monster.cpp (#400)
* Clean up hp and mana checks

* Clean up PrepDoEnding
2018-10-10 09:55:57 +02:00
Anders Jenbo
7da6f4d08a Clean up PM_DoDeath (#317)
* Clean up PM_DoDeath

* Add enum for dFlags
2018-09-24 08:13:48 +02:00
Dennis Duda
6792078180 Merge remote-tracking branch 'devilution/master' 2018-09-10 20:44:41 +02:00
galaxyhaxz
38b498ac4b
Add 'const' to data to match original binary (#200) 2018-09-09 15:40:23 -05:00
Dennis Duda
e8b53791d3 DrawInv is now binary exact. 2018-09-05 18:29:40 +02:00
Dennis Duda
b6baa965bb Revert "Switched back NewCursor to the original name j_SetCursor"
This reverts commit 4c93cca082.
NewCursor was the actual name, j_<function> are just remaining
reversing names
2018-08-28 00:00:25 +02:00