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

49 commits

Author SHA1 Message Date
Xadhoom
15341fdae3 More temporary 64 bit fixes; we can walk in town 2019-01-27 20:45:27 +00:00
Anders Jenbo
ca64011eb9
 		Replace __ROR4__ stdlib, make _ROR2__ C frindly (#540) 
* Use stdlib _rotr instead of inline asm
* Compile control.cpp as C
This also makes qmemcpy avalible to the C compiler
 2019-01-06 03:23:43 +01:00
Anders Jenbo
82d1f6c8e0 Clean up CheckChrBtns 2019-01-01 03:15:04 +01:00
Anders Jenbo
30a394798b Clean up control_set_gold_curs 2018-12-31 21:12:58 +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
47bf82b059 C compatability from a-d (#518) 2018-12-29 15:12:19 +01:00
Anders Jenbo
4a62a7c678 Code style 2018-12-29 02:15:20 +01:00
galaxyhaxz
eceb1c3b5b Fix tempstr length, add array 2018-12-18 09:37:37 +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
d9a285327f
 		StartGame and PressEscKey (#461) 2018-11-12 15:27:43 -06:00
galaxyhaxz
86f00145f8 Remove empty_string garbage 2018-11-06 09:42:27 +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
b1f6d3698f Update style to use tabs 2018-10-25 22:53:04 +02:00
Anders Jenbo
27b23b4186 Format ingame UI 2018-10-22 01:31:21 +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
35e8aa42c5 Fix lightning resistance on char screen 2018-10-20 13:39:14 +02:00
Andrew Dunstan
674407cb73 clean SetSpellTrans 2018-10-18 23:03:20 +02:00
Andrew Dunstan
053bcdb6b2 make the mana flask use the correct background 2018-10-13 23:46:15 +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
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
3561450624 clean plrmsg.cpp (#386) 2018-10-06 14:00:37 +02:00
Anders Jenbo
744e225618 Clean up player.cpp (#387) 2018-10-06 00:33:58 +02:00
Anders Jenbo
837119d581 Merge branch 'master' of github.com:diasurgical/devilution into nightly 2018-09-28 23:16:16 +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
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
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
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
34938876e0
 		A few name corrections (#203) 2018-09-14 23:47:22 -05:00
galaxyhaxz
38b498ac4b
 		Add 'const' to data to match original binary (#200) 2018-09-09 15:40:23 -05:00
galaxyhaxz
7e50e6f1d5
 		Fix invalid "unusable" spells (#198) 2018-09-08 14:42:36 -05:00
galaxyhaxz
13126a90d6
 		Fix garbage structs, data in setmaps (#189) 2018-09-04 11:16:14 -05:00
Stephan Unverwerth
c8af0523ac refactor leveltype to use macros (#103) 2018-06-29 10:40:22 -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
51b6c0230b
 		Fix incorrectly decompiled code 2018-06-09 03:22:38 -05:00
galaxyhaxz
654472738d
 		Update control.cpp 2018-06-08 22:09:16 -05:00
mewmew
f5f76f8b8a Fix build on Linux 2018-06-08 11:23:30 +02:00
galaxyhaxz
b1ee40f6e7
 		Revert "Add preliminary support for compiling on Linux" 2018-06-07 22:00:35 -05:00
mewmew
20fdbf8aa2 Fix compile errors on Linux 
Source/../types.h:35:10: fatal error: DiabloUI/_diabloui.h: No such file or directory
 #include "DiabloUI/_diabloui.h"

---

Source/../Source/init.h:43:109: error: fastcall and stdcall attributes are not compatible
 LRESULT (__stdcall *__fastcall SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);

---

Source/missiles.cpp:915:27: error: unable to find numeric literal operator ‘operator""i64’
  *(_QWORD *)&Dirs[0][2] = 0i64;

---

Source/world.cpp:38:1: error: narrowing conversion of ‘3937053354’ from ‘unsigned int’ to ‘int’ inside { } [-Wnarrowing]

---

Source/lighting.cpp:429:1: error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned char’ inside { } [-Wnarrowing]

---

Source/objects.cpp:5459:62: error: unable to find numeric literal operator ‘operator""i64’
      while ( !(plr[v53]._pMemSpells[1] & ((unsigned __int64)(1i64 << v60) >> 32) | plr[v53]._pMemSpells[0] & (unsigned int)(1i64 << v60)) );

---

Source/control.cpp:488:9: error: unable to find numeric literal operator ‘operator""i64’
   v26 = 1i64;

---

Source/objects.cpp:243:1: error: narrowing conversion of ‘255’ from ‘int’ to ‘char’ inside { } [-Wnarrowing]

---

Source/gamemenu.cpp:22:1: error: narrowing conversion of ‘2147483648’ from ‘unsigned int’ to ‘int’ inside { } [-Wnarrowing]

---

Source/sound.cpp:41:88: error: narrowing conversion of ‘240’ from ‘unsigned int’ to ‘char’ inside { } [-Wnarrowing]

---

Source/quests.cpp:46:1: error: narrowing conversion of ‘255’ from ‘int’ to ‘char’ inside { } [-Wnarrowing]

---

Source/player.cpp:4666:8: error: unable to find numeric literal operator ‘operator""i64’
  v14 = 0i64;

---

Source/init.cpp:546:109: error: fastcall and stdcall attributes are not compatible
 LRESULT (__stdcall *__fastcall SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)

---

Source/items.cpp:114:1: error: narrowing conversion of ‘(item_effect_type)255’ from ‘unsigned int’ to ‘char’ inside { } [-Wnarrowing]

---

Source/items.cpp:307:1: error: narrowing conversion of ‘(unique_base_item)255’ from ‘unsigned int’ to ‘char’ inside { } [-Wnarrowing]

---

Source/items.cpp:854:8: error: unable to find numeric literal operator ‘operator""i64’
  v37 = 0i64;

---

Source/items.cpp:471:1: error: narrowing conversion of ‘(item_equip_type)255’ from ‘unsigned int’ to ‘char’ inside { } [-Wnarrowing]
 2018-06-07 22:44:03 +02:00
galaxyhaxz
dde68ff89e
 		Add files via upload 2018-06-06 21:25:54 -05:00