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

70 commits

Author SHA1 Message Date
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
Dennis Duda
4183da03ee Merge commit '7e50e6f1d5' 
Fix invalid "unusable" spells
(https://github.com/diasurgical/devilution/pull/198)

Switched types to UINT64 and removed the remaining cleaned
up casts.
 2018-09-09 14:51:14 +02:00
galaxyhaxz
6d07e15f4e
 		Fix itemhold and add pfile def (#199) 2018-09-08 17:17:00 -05:00
Dennis Duda
e8b53791d3 DrawInv is now binary exact. 2018-09-05 18:29:40 +02:00
Anders Jenbo
f3e3f38730 Light clean up of UseItem 2018-09-05 12:48:03 +02:00
Andrew Dunstan
e0fab6a6d1 fix type definition of itemhold, avoids overrun into Item2Frm (crashes when byte_641234[] is stripped by compiler due to being unreferenced) 2018-09-01 20:46:22 +02:00
Dennis Duda
2f2d519ec7 Added missing enum values, removed codegen TODOs (fixed with new compiler) - now binary exact! 2018-08-28 23:33:34 +02:00
Dennis Duda
0ba52840b4 Use UINT64 instead of unsigned __int64, more in line with uses of DWORD 2018-08-28 23:05:23 +02:00
Dennis Duda
22718733d0 Fixed nasty bug in CalcPlrItemVals, now binary exact! 2018-08-28 22:45:48 +02:00
Dennis Duda
2f25466ed6 Cleaned up CheckInvSwap 
Now binary exact except for the usual `xor; inc` vs `push 1; pop` switch.
Updated the type of `_iIdentified` to `BOOL` as well (since every write to it actually is 0 or 1).
 2018-08-28 16:40:49 +02:00
Dennis Duda
3577cfe747 Reordered switches to normal order 2018-08-27 18:10:26 +02:00
Dennis Duda
5d1dd0e934 Added enum value for _iCurs assignement 2018-08-27 18:10:26 +02:00
Dennis Duda
45303c98b1 Updated cleanup of CreatePlrItems: 
- Now 99% accurate (can't get the last `GetPlrHandSeed` call in the switch to optimize the way it is in the binary, TODO for that added)
- Switched `_ui_classes` enum members out with `plr_classes` ones
- Added TODO tags for missing debug logic from the 1.00 build
 2018-08-27 18:10:26 +02:00
Dennis Duda
84617bc1cc Cleaned up CreatePlrItems. 2018-08-27 18:10:26 +02:00
Dennis Duda
c056e67de7 Some minor adjustments from more asm comparison work 2018-08-24 13:34:18 +02:00
Dennis Duda
93ee15d70f Removed ptrplr since that was only used in the PSX version. 2018-08-24 13:34:18 +02:00
Dennis Duda
258b6fe7ec Reverted the Str/Mag/Dex/Vit checks back to plr[myplr] 2018-08-24 13:34:18 +02:00
Dennis Duda
dbd4b11821 Further cleanup of CalcPlrItemVals 
The stack var setup is now 100% correct, and the function is only 5 bytes larger than the original now.

Some minor differences remain, but it's very close now!
 2018-08-24 13:34:18 +02:00
Dennis Duda
634ae12ede Updated CalcPlrItemVals with the new player class enum vals 
and completed docs.
 2018-08-24 13:34:18 +02:00
Dennis Duda
5eae298035 Cleaned up CalcPlrItemVals 2018-08-24 13:34:18 +02:00