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

46 commits

Author SHA1 Message Date
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
b5365f53f1 Clean up DrawInvBelt (#570) 2019-01-16 02:12:46 +01:00
Anders Jenbo
57d7c99a8f Stores.cpp (#551) 
* Clean up FreeStoreMem

* Clean up AddSLine

* Clean up AddSText

* Clean up SmithSellOk
 2019-01-05 10:54:32 +01:00
Anders Jenbo
429185ef7a Apply CURSOR_FIRSTITEM (#541) 2019-01-01 14:19:06 +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
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
ab3a6208d2 Use "BOOLEAN" instead of "bool" 
bool is not defined in C
 2018-11-26 12:35:03 +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
596f244f50 Align structured data tables 2018-10-23 19:28:22 +02:00
Anders Jenbo
6aa076461e Format inv.cpp 2018-10-22 02:03:35 +02:00
Anders Jenbo
6576954831 Clean up types used in gamemenu.cpp 2018-10-21 03:50:52 +02:00
Andrew Dunstan
47244b9f3c clean all On_* functions 2018-10-20 14:42:59 +02:00
Anders Jenbo
48a1035d4a Remove unused varialbes 2018-10-12 11:04:23 +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
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
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
Anders Jenbo
d8c4bcab5c Clean up DropHalfPlayersGold (#330) 2018-09-24 16:50:45 +02:00
Anders Jenbo
5d2130e52e Confirm itemavail size via beta 2018-09-23 16:58:23 +02: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
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
Dennis Duda
0f05d32bae Added bugfix notices to RemoveInvItem and RemoveSpdBarItem 2018-09-07 18:34:50 +02:00
Dennis Duda
01fdf361da Fixed drawpanflag not being set in RemoveSpdBarItem and removed wrong cast of literal 1 to UINT64. 
Fixes #38.
 2018-09-07 13:38:17 +02:00
Dennis Duda
e8b53791d3 DrawInv is now binary exact. 2018-09-05 18:29:40 +02:00
Dennis Duda
4c79827d3c FreeInvGFX and InitInv are now binary exact. 2018-09-04 20:47:58 +02:00
Dennis Duda
91b6568ef9 Fixed CheckInvCut to be binary exact now with the new compiler version 2018-08-29 00:02:59 +02:00
Dennis Duda
0508308eba Fixed missing cast for literal 1 to UINT64 2018-08-28 22:56:36 +02:00
Dennis Duda
07b5dc3939 Cleaned up inv_update_rem_item, RemoveInvItem, RemoveSpdBarItem, CheckInvItem, CheckInvScrn, CheckItemStats 
All relatively simple and/or use code from other functions already cleaned up. Now binary exact except for the small codegen differences outlined in https://github.com/diasurgical/devil-nightly/issues/15
 2018-08-28 20:11:23 +02:00
Dennis Duda
a061f6d6f0 Cleaned up CheckInvSwap (0x3B6 → 0x390, orig: 0x373) 
Pretty close to the original binary except for the first loop, which generates differently. (TODO comment added) There are also some questionable double address calculations, which hopfully clear up when the loop is fixed as well.

Also added enums `inv_body_loc` and `inv_xy_slot` to clean up a lot of magic numbers.
 2018-08-28 16:40:49 +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
galaxyhaxz
a336c38226
 		Fix random(idx,v) calls (#157) 2018-08-10 22:45:32 -05:00
Stephan Unverwerth
c8af0523ac refactor leveltype to use macros (#103) 2018-06-29 10:40:22 -05:00
Adam Heinermann
87ca6557c3 Changed _oBreak and _oSelFlag to char (#95) 
* Changed _oBreak and _oSelFlag to char
 2018-06-28 08:53:06 -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
083833d589
 		Fix item swapping deleting the item 2018-06-15 00:47:43 -05:00
galaxyhaxz
ade35fb4a4
 		Fixed decompilation, game can now be played start to finish (#15) 
Fix Lazurus seals, dropping items, and Shrine spawning.
 2018-06-14 05:53:03 -05:00
galaxyhaxz
dde68ff89e
 		Add files via upload 2018-06-06 21:25:54 -05:00