MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
897 commits 1 branch 0 tags 51 MiB
Commit graph

89 commits

Author SHA1 Message Date
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
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
Anders Jenbo
5bc5da3597 Clean up DeltaLoadLevel 2018-12-22 13:23:59 +01:00
Anders Jenbo
b4fe143e29 Add player_weapon_type 2018-12-07 23:54:39 +01:00
Anders Jenbo
23897a640b Correct types 2018-11-26 14:14:55 +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
galaxyhaxz
86f00145f8 Remove empty_string garbage 2018-11-06 09:42:27 +01:00
Anders Jenbo
507d12082f Use MAXDUR* in most instances 2018-11-04 22:27:26 +01:00
Anders Jenbo
c0fd7b65fe Correct some BOOL types 2018-11-04 20:13:51 +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
galaxyhaxz
b4e158a29d Cleanup UseItem (#445) 2018-10-30 09:06:28 +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
0f3091efac Format items.cpp 2018-10-22 02:03:58 +02:00
Andrew Dunstan
594ef2e95b add inline assembly code for drawing semi-transparent rectangles 2018-10-21 17:22:59 +02:00
Andrew Dunstan
47244b9f3c clean all On_* functions 2018-10-20 14:42:59 +02:00
Andrew Dunstan
1430acc47f msg.cpp cleanup part #0 2018-10-18 02:37:33 +02:00
Anders Jenbo
48a1035d4a Remove unused varialbes 2018-10-12 11:04:23 +02:00
Anders Jenbo
7a5c283db2 Clean up CalcPlrStaff 2018-10-11 16:08:46 +02:00
Anders Jenbo
8ef6488acf Clean up CalcPlrScrolls 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
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
7c1d00d15c Finish cleaning player.cpp (#365) 
* clean RespawnDeadItem
clean PM_ChangeLightOffset
Clean PlrDeadItem (exact)

* fix typo in PlrDeadItem

* Fix PM_ChangeLightOff (exact)

* Fix remaning issues with RespawnDeadItem
 2018-10-05 19:42:03 +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
9bd3b4189e Clean up CheckNewPath (#332) 2018-09-25 20:46:09 +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
d8c4bcab5c Clean up DropHalfPlayersGold (#330) 2018-09-24 16:50:45 +02:00
Anders Jenbo
3ebeb2366a Clean PM_DoGotHit & ArmorDur (#316) 
* Clean PM_DoGotHit & ArmorDur

* Add DUR_INDESTRUCTIBLE define
 2018-09-24 16:24:00 +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
Anders Jenbo
5d2130e52e Confirm itemavail size via beta 2018-09-23 16:58:23 +02:00
Anders Jenbo
b5e2f74f65 Merge branch 'nightly' of github.com:diasurgical/devilution into StartPlayerKill 2018-09-23 16:47:46 +02:00
Anders Jenbo
cd79931ed4 Add iCurs enum 2018-09-23 16:46:00 +02: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
galaxyhaxz
42c9076ce5
 		Sync with nightly (#302) 2018-09-19 14:44:30 -05:00
Dennis Duda
2f7f7d055e Switched all remaining uses of UINT64 to unsigned __int64 to make it compilable on <=VC5 2018-09-18 23:30:25 +02:00
Anders Jenbo
6e50ec5337 Work on LoadPlrGFX 2018-09-12 20:28:09 +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