Commit Graph

225 Commits

Author SHA1 Message Date
Anders Jenbo 3812287dd5 Clean up AllItemsList related code (#565)
* Clean up ItemMiscIdIdx

* Clean up RndItem

* Clean up RndUItem
2019-01-14 16:48:59 +01:00
JustAnotherGuid 3115077d16 Clean-up OperateSarc (#560) 2019-01-12 20:36:37 +01:00
Anders Jenbo f845392fe0 Clean up MonstCheckDoors 2019-01-06 01:43:16 +01:00
Anders Jenbo 558e5019a4 Clean up OperateL2Door and OperateL3Door 2019-01-06 01:43:16 +01:00
Anders Jenbo c4380eadc7 Clean up OperateL1Door 2019-01-06 01:43:16 +01:00
Anders Jenbo 492125a67c Clean up Obj_Trap 2019-01-06 01:43:16 +01:00
Anders Jenbo 14560aedec Clean up Obj_FlameTrap 2019-01-06 01:43:16 +01: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 2c8cec0687 Clean up AddBarrel (#535) 2018-12-31 15:12:30 +01:00
Anders Jenbo a00867949d Clean up AddSarc (#534) 2018-12-31 15:11:06 +01:00
Anders Jenbo 77849aea72 Remove unused init (#533) 2018-12-31 04:26:51 +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
Robin Eklind a94ac659a7 rename DeleteObject to DeleteObject_ to avoid collision with windows.h 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
galaxyhaxz 83e817a9bb Fix CreateMagicItem and cheat cmd (#460) 2018-11-12 15:26:36 -06:00
Anders Jenbo 507d12082f Use MAXDUR* in most instances 2018-11-04 22:27:26 +01:00
Anders Jenbo 20d8934c8f Merge branch 'nightly' into themes 2018-11-04 20:20:21 +01:00
Anders Jenbo c0fd7b65fe Correct some BOOL types 2018-11-04 20:13:51 +01:00
galaxyhaxz 4e910efd03 Cleanup OperateShrine (#449)
* Cleanup OperateShrine

Co-Authored-By: galaxyhaxz <galaxy-haxz@hotmail.com>
2018-11-04 19:56:22 +01:00
Robin Eklind 5236c196df Theme_ArmorStand bin exact 2018-10-31 19:11:59 +01:00
Robin Eklind e537868029 Theme_WeaponRack bin exact 2018-10-31 17:54:32 +01:00
Robin Eklind dff0dc4226 CreateThemeRooms bin exact 2018-10-31 17:04:19 +01:00
Anders Jenbo 04b19f604d Monster.cpp (#443)
* Clean up MAI_Golum

* Clean up MAI_Garbud

* Clean up MAI_Lachdanan

* Clean up DeleteMonsterList

* Clean up FreeMonsters

* Define enums for resistance

* Correct AddPanelString input

* Correct pinfoflag type

* Define monster_goal

* apply enum to _pIFlags

* Correct DeleteMonsterList

* Add TODO for possible bug fix.
2018-10-31 15:26:03 +01:00
Anders Jenbo 0fb5c0bf9c Additional tab indentation 2018-10-27 17:38:40 +02:00
Anders Jenbo 480bbe8c63 Apply missile_id and align spells table 2018-10-27 17:20:15 +02:00
Anders Jenbo b1f6d3698f Update style to use tabs 2018-10-25 22:53:04 +02:00
Anders Jenbo 596f244f50 Align structured data tables 2018-10-23 19:28:22 +02:00
Anders Jenbo 43a5b74c69 Format objects.cpp 2018-10-22 04:00:24 +02:00
Anders Jenbo 6576954831 Clean up types used in gamemenu.cpp 2018-10-21 03:50:52 +02:00
Anders Jenbo 5394f63dd7 Define diablo_message enum 2018-10-21 02:27:48 +02:00
Anders Jenbo f1c8439c64 Change setlvlnum to BYTE 2018-10-18 20:14:58 +02:00
Anders Jenbo 48a1035d4a Remove unused varialbes 2018-10-12 11:04:23 +02:00
Anders Jenbo 4fa5baf291 Apply enum to _pSplLvl 2018-10-11 16:08:47 +02:00
Anders Jenbo a7c9e90c3c Clean up _pMemSpells in OperateShrine 2018-10-11 16:08:46 +02:00
Anders Jenbo 51d838841f Clean up OperateBook 2018-10-11 16:05:12 +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
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 4d8ceea32d Types (#395)
* Apply plr_class

* Apply attribute_id

* NetSendCmd*(BOOL)
2018-10-08 14:17:05 +02:00
Anders Jenbo 411fa9f24a Add enumds for _pgfxnum and fully use inv_body_loc (#392)
* Add enumds for _pgfxnum and fully use inv_body_loc

* _iIdentified is BOOL

* _pgfxnum
2018-10-07 11:04:22 +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 ff2f0bf8ab Clean up ProcessPlayers (#347) 2018-09-27 16:40:07 +02:00
Anders Jenbo 9bd3b4189e Clean up CheckNewPath (#332) 2018-09-25 20:46:09 +02:00
Anders Jenbo d8c4bcab5c Clean up DropHalfPlayersGold (#330) 2018-09-24 16:50:45 +02:00
Robin Eklind 23f31ec724 Merge branch 'AJenbo-StartPlayerKill' into nightly 2018-09-24 16:14:53 +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
Anders Jenbo 081c4a3f93 Fix build 2018-09-23 19:45:51 +02:00