Commit Graph

57 Commits

Author SHA1 Message Date
qndel ade4d1fb64 codefix in resurrect 2021-04-18 20:50:13 +02:00
qndel 7f7ae623df Goe (#2163)
* proper random_ comparisons
* proper mienemy comparisons
* add mienemy/micaster enum
* GOE enum
2020-12-04 19:16:58 +01:00
Anders Jenbo 7e04c63977 Merge branch 'hellfire' of github.com:diasurgical/devilution 2020-10-11 23:53:07 +02:00
Anders Jenbo 1ba96a6777 Add doxygen description to remaining engine files 2020-07-06 05:43:25 +02:00
Anders Jenbo e6e0ebe15a Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-07 03:46:20 +02:00
Anders Jenbo f1c216e688 Make player struct x/y fields match monster struct 2020-04-07 03:26:38 +02:00
Anders Jenbo 3f11876aba Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-06 10:48:11 +02:00
qndel 5191237f42 enums and stuff (#2024) 2020-04-06 08:04:14 +02:00
Anders Jenbo b040c04a18 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2020-04-04 07:56:06 +02: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 5fa0c5781b Backport cleanups from Hellfire branch 2019-12-15 06:14:57 +01:00
Anders Jenbo 85ab626437 Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-12-15 02:22:17 +01:00
galaxyhaxz 3bd28cc0c1 Fix function order [spells+pack.cpp] 2019-11-03 14:45:32 +01:00
Robin Eklind e155a9423e rename random to random_ to avoid collision with random in stdlib.h
Fixes #1813.
2019-10-21 09:56:36 +02:00
qndel 13eb926575 [hellfire] GetManaAmount bin exact 2019-10-08 00:05:56 +02:00
Robin Eklind f4034b5023 Merge pull request #1735 from qndel/DoHealOther2
[hellfire] DoHealOther bin exact
2019-10-07 22:49:40 +02:00
qndel 25cb639e17 [hellfire] CastSpell bin exact 2019-09-27 03:42:57 +02:00
qndel 1516ad57ac GetManaAmount cleanup (#1737) 2019-09-27 03:16:26 +02:00
Anders Jenbo 3f037ce76c Merge branch 'master' of github.com:diasurgical/devilution into hellfire 2019-09-27 03:11:18 +02:00
qndel 449b9fd2dc CastSpell cleanup 2019-09-27 02:46:00 +02:00
qndel f7c90653bd [hellfire] DoHealOther bin exact 2019-09-27 02:34:21 +02:00
qndel 07233d060d [hellfire] DoResurrect bin exact (#1629)
* [hellfire] DoResurrect bin exact

* split into two ifndefs
2019-09-15 22:20:44 +02:00
qndel 7ab48ad756 UseMana clean up 2019-08-31 07:46:40 +02:00
qndel a17e34c4bf applied enums to _pmode and untangled ifs 2019-08-31 06:23:35 +02:00
Robin Eklind f59439a8ff Make _pInvincible into a boolean.
_pInvincible is only ever used in boolean contexts.
2019-07-17 12:14:16 +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 66438890aa Clean up spells.cpp 2019-05-02 00:16:46 +01:00
galaxyhaxz 610580625e Split data from files 2019-04-29 01:40:44 +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 429ececce0 Fix debug build as C (#566)
* Clean up todo

* Fix debug build
2019-01-14 18:54:12 +01:00
Anders Jenbo 024d99fc9e C compatability from s (#521) 2018-12-29 21:15:33 +01:00
Anders Jenbo 0fb5c0bf9c Additional tab indentation 2018-10-27 17:38:40 +02:00
Anders Jenbo b1f6d3698f Update style to use tabs 2018-10-25 22:53:04 +02:00
Anders Jenbo f1d4e707f7 Auto format 2018-10-19 02:39:19 +02:00
Anders Jenbo 4708345d31 Align spelldata data table 2018-10-18 02:43:18 +02:00
Robin Eklind 7515655efb Run format.sh 2018-10-06 22:52:58 +02:00
Anders Jenbo 744e225618 Clean up player.cpp (#387) 2018-10-06 00:33:58 +02:00
Andrew Dunstan 344d259066 make DoHealOther bin exact 2018-09-29 00:58:59 +10:00
squidcc 4ed6d83265 fix regression in DrawSpellList() that caused only the first 1/4 spells to be drawn (#355)
fix places where sTownSpell was still being cast to DWORD
change SpellData::sTargeted to BOOL, fix spelldata[] definition to use TRUE/FALSE
2018-09-28 10:46:36 +02:00
Anders Jenbo b7dfcf5ed5 Clean up CheckPlrSpell (#339) 2018-09-28 01:49:17 +02:00
Andrew Dunstan 71cae5f8c2 add enums for known actions (to be performed in response to commands) 2018-09-25 10:14:12 +10:00
Anders Jenbo db77557dce ValidatePlayer (#318)
* ValidatePlayer

* Add MAX_SPELLS define
2018-09-23 09:40:05 +02:00
Anders Jenbo e05679b1c9 Clean up ProcessPlayers (#319)
* Clean up ProcessPlayers

* Change drawhpflag and drawmanaflag to BOOL
2018-09-23 09:38:34 +02:00
Dennis Duda b23f92805c DoHealOther is now almost binary exact, except for the flipped usage of esi and edi. 2018-09-02 21:19:06 +02:00
Dennis Duda 855bb4a42a PlacePlayer is now binary exact 2018-09-02 20:41:10 +02:00
Dennis Duda 8adb2b83c8 DoResurrect is now binary exact 2018-09-02 20:27:30 +02:00
Dennis Duda 84120afd83 Cleaned up CheckSpell and CastSpell, now both binary exact! 2018-09-02 20:07:02 +02:00
Dennis Duda 6776b568c0 GetManaAmount is now binary exact 2018-09-02 19:32:42 +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