Commit Graph
38 Commits
Author SHA1 Message Date
Anders Jenbo 189ce6ec2f Merge branch 'master' of github.com:diasurgical/devilution 2019-03-20 00:00:39 +01:00
galaxyhaxz 9afd45cbea Fix crash in draw town (#692) 2019-03-20 00:48:36 +09:00
Anders Jenbo bc26a2f730 Merge branch 'master' of github.com:diasurgical/devilution 2019-03-18 21:52:35 +01:00
galaxyhaxz 1f809e5b31 Cleanup T_Fill Tile/Sector (#673) 2019-03-18 22:29:49 +09:00
galaxyhaxz befd52c003 Fix type for 'gpBuffer' (#672) 2019-03-18 22:28:38 +09:00
galaxyhaxz 068f19d523 Cleanup town_clear_x_buf (#669) 2019-03-17 20:56:38 -05:00
Anders Jenbo d5a06dcbc1 Merge branch 'master' of github.com:diasurgical/devilution into working
Fixes #38
2019-03-18 00:16:01 +01:00
galaxyhaxz 0bb9f666b3 Clean remaining .CEL functions (#657) 2019-03-17 15:56:53 -05:00
Xadhoom 83d902c4a4 Merge branch 'master' 2019-03-16 12:37:02 +00:00
Anders Jenbo f4ca51f684 Merge branch 'master' of github.com:diasurgical/devilution 2019-03-16 04:21:50 +01:00
galaxyhaxz 9e4885a955 Cleanup CL2 functions (#656) 2019-03-15 21:56:04 -05:00
galaxyhaxz 81f3f5daa2 Cleaning Engine CEL functions (#652)
* Cleaning Engine CEL functions

* Fix C functions
2019-03-14 10:47:39 +09:00
Xadhoom ecb242ae62 Merge branch 'master' 2019-03-12 09:36:42 +02:00
Anders Jenbo 3d0cd681df Merge branch 'master' of github.com:diasurgical/devilution 2019-03-12 02:01:16 +01:00
Anders Jenbo 9358465bb5 AddMissile bin exact (#621)
* AddMissile bin exact

* Clean up bools
2019-03-11 23:59:26 +01:00
Xadhoom 5283a9ffd1 Put everything into namespace dvl 2019-03-11 20:10:23 +00:00
Xadhoom 15341fdae3 More temporary 64 bit fixes; we can walk in town 2019-01-27 20:45:27 +00:00
Xadhoom fa90e6720a Revert random_ to random and remove extern "C" linkage 2019-01-21 20:39:55 +00:00
Xadhoom 3dd6cf1671 First try, merge compiles, but immediate crash 2019-01-21 09:48:53 +00:00
Anders Jenbo 6d5c9619a7 Clean up town_draw_town_all (#544)
* Clean up town_draw_town_all

* Clean up town_draw_e_flag

* Clean up InitPlayerLoc

* Fix VS 2015 builds

* Clean up gendung_get_dpiece_num_from_coord

* Clean up town_draw_clipped_e_flag

* Clean up town_draw_clipped_e_flag_2

* Remove HIDWORD() as it is now unused
2019-01-06 01:36:59 +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 b1f6d3698f Update style to use tabs 2018-10-25 22:53:04 +02:00
Anders Jenbo ec2f95bdf2 Format town files 2018-10-22 02:02:52 +02:00
Anders Jenbo f80de53b14 _iMagical enum (#393)
* _iMagical enum

* Color enum
2018-10-11 08:39:17 +02:00
Anders Jenbo 96ab38730f Control.cpp (#396)
* Clean up ToggleSpell

* Clean up DrawLifeFlask and UpdateLifeFlask

* Clean up DrawManaFlaskm, control_update_life_mana and UpdateManaFlask

* Clean up CheckSBook

* Clean up DoSpeedBook

* Decompose magic numbers

* Clean up GetSBookTrans

* Apply spell_type

* Slight clean up of DrawSpellList

This improves the bin diff a little bit but more importantly gets rid of
_p*Spells[] usage in control.cpp
2018-10-11 08:37:14 +02:00
squidcc 51bfa2353b Use quest enum values (#362)
* add/assign enums related to Black Mushroom quests

* plug in more quest enum values
2018-09-29 11:37:54 +02:00
Anders Jenbo 837119d581 Merge branch 'master' of github.com:diasurgical/devilution into nightly 2018-09-28 23:16:16 +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
Anders Jenbo 7da6f4d08a Clean up PM_DoDeath (#317)
* Clean up PM_DoDeath

* Add enum for dFlags
2018-09-24 08:13:48 +02:00
galaxyhaxz d991f63b16 Fix type of screen_buf_end (#184) 2018-08-27 22:16:26 -05:00
galaxyhaxz 472de22f81 Annotated and fixed World.cpp (#129) 2018-07-07 22:55:56 -05:00
galaxyhaxz 7d06ca540c Fix dpiece_defs, clean up LoadLvlGFX (#105)
Thanks to @MadHed, implements #102
2018-06-29 11:43:32 -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 7651c4775a Update town.cpp 2018-06-10 18:12:15 -05:00
galaxyhaxz bcb3abe96b Add files via upload 2018-06-06 21:27:39 -05:00