Commit Graph
50 Commits
Author SHA1 Message Date
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 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 0c90ad0527 Set bool values TRUE/FALSE 2019-12-22 23:57:10 +01:00
Anders Jenbo 9a704ff2f0 Merge branch 'master' of github.com:diasurgical/devilution 2019-12-19 01:05:01 +01:00
Anders Jenbo 5fa0c5781b Backport cleanups from Hellfire branch 2019-12-15 06:14:57 +01:00
Anders Jenbo 4cc4cd011c Merge branch 'master' of github.com:diasurgical/devilution 2019-10-28 21:57:36 +01:00
Anders Jenbo 195ac2a4a7 Apply music enums 2019-10-28 21:42:33 +01:00
Anders Jenbo 98ab9b9600 Merge branch 'master' of github.com:diasurgical/devilution 2019-08-18 08:07:33 +02:00
Anders Jenbo 68d51e7d27 Implementing Spawned Shareware version 2019-08-12 16:04:20 +02:00
galaxyhaxz 905ad6efcd Fix version string 2019-07-24 10:12:11 +02:00
galaxyhaxz 484b17d259 Add Select Hero enum (#1330) 2019-07-23 20:41:32 -05:00
Xadhoom 148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00: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 0483a923c3 Add enum for dlgresults 2019-07-06 05:23:37 +02:00
Anders Jenbo 0c4b4719b8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-09 23:51:21 +02:00
Sergey Semushin 5f0fb73b8c Make mainmenu_create_hero bin exact (4 unused arguments added) 2019-05-05 23:33:28 +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 c8301280c5 Clean up mainmenu.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
galaxyhaxz 540892ff9d Preliminary support for fixed header files 2019-04-21 17:20:38 +02: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
Xadhoom 5283a9ffd1 Put everything into namespace dvl 2019-03-11 20:10:23 +00:00
Anders Jenbo 0e0d41376f Enum for dlgresult 2019-02-01 22:43:08 +01:00
Anders Jenbo 199fd17e2e Remove mouse from credit page 2019-02-01 09:19:28 +01:00
Anders Jenbo 0cbf4b6065 Resolve argument nam for UiSelHeroMultDialog 2019-01-27 02:55:18 +01:00
Anders Jenbo 74e1d42f1c Clarify some variable names 2019-01-23 14:19:55 +01:00
Anders Jenbo 841f5af199 Compile effects.cpp and wave.cpp as C (#530)
* Correct SFileReadFile signature

* Compile as C

Source/effects.cpp
Source/wave.cpp

* Make diabloui.h C frindly
2018-12-30 19:22:40 +01:00
Anders Jenbo b5f69dccdc C compatability from d-p (#519) 2018-12-29 17:54:22 +01:00
Anders Jenbo 4a62a7c678 Code style 2018-12-29 02:15:20 +01:00
galaxyhaxz c302881060 Fix gszHero 2018-12-18 09:37:37 +01:00
Robin Eklind 4ee363b124 mainmenu_loop bin exact (#481)
* mainmenu_loop bin exact

Fixes #254.

* simplify mainmenu_loop, @galaxyhaxz cracked it
2018-11-27 09:33:46 +01:00
Anders Jenbo 9edeecb3bb Consisten use of structs 2018-11-26 14:19:27 +01:00
galaxyhaxz c4c6572f06 Correct name diablo_init_menu 2018-11-10 01:39:28 +01:00
Anders Jenbo b1f6d3698f Update style to use tabs 2018-10-25 22:53:04 +02:00
Anders Jenbo 87ef2f91e7 Format mostly cleaned files 2018-10-22 01:56:10 +02:00
Anders Jenbo 6c92a6ae94 Merge branch 'nightly' of github.com:diasurgical/devilution into gamemenu.cpp 2018-10-21 16:36:42 +02:00
Dennis Duda bff845feb0 Updated _SNETUIDATA.selectnamecallback declaration
Updated _SNETUIDATA.selectnamecallback declaration for #329.
2018-10-21 13:13:15 +02:00
Anders Jenbo cf4c110f41 Clean up mainmenu.cpp 2018-10-21 06:47:57 +02:00
galaxyhaxz d7b008f585 mainmenu fix (#217) 2018-09-18 21:26:15 +02:00
Anders Jenbo 6de288a011 Set max players via const 2018-09-13 00:23:11 +02:00
galaxyhaxz 38b498ac4b Add 'const' to data to match original binary (#200) 2018-09-09 15:40:23 -05:00
galaxyhaxz 503e5c1440 Names from DX SDK (#197) 2018-09-08 10:15:26 -05:00
galaxyhaxz 49a6f4f9fc Add include guards, prepare for XRef (#28)
Add definitions, other junk.
2018-06-20 05:17:44 -05:00
galaxyhaxz bb01c6f084 Remove the "fear factor" (#21)
Snakes, spiders, Demons, what scares you?
2018-06-18 19:16:32 -05:00
galaxyhaxz dde68ff89e Add files via upload 2018-06-06 21:25:54 -05:00