1
0
Fork 0
Commit Graph

113 Commits (bb5976838a4570505610ff2e879600ed2ff73026)

Author SHA1 Message Date
galaxyhaxz e4a5b1df75
Fix incorrect decompilation of dwFlags 2018-06-09 04:38:42 -05:00
galaxyhaxz 94a5f173d3
Fix for linux 2018-06-09 04:37:48 -05:00
galaxyhaxz 09824edff2
Update README.md 2018-06-09 03:27:13 -05:00
galaxyhaxz 51b6c0230b
Fix incorrectly decompiled code 2018-06-09 03:22:38 -05:00
galaxyhaxz 4482de4f90
Merge pull request #6 from mewpull/install
Add extended installation instructions for Linux and Windows
2018-06-09 03:16:52 -05:00
galaxyhaxz 4d5e0cc7d5
Merge pull request #8 from galaxyhaxz/work
Linux compiling almost there
2018-06-09 03:15:38 -05:00
galaxyhaxz 0dac197965
Update player.cpp 2018-06-08 22:12:26 -05:00
galaxyhaxz a07a6210fa
Update objects.cpp 2018-06-08 22:11:45 -05:00
galaxyhaxz e0a27589c9
Update missiles.cpp 2018-06-08 22:11:13 -05:00
galaxyhaxz 931e537efc
Update items.cpp 2018-06-08 22:10:25 -05:00
galaxyhaxz b204238a49
Update debug.cpp 2018-06-08 22:09:49 -05:00
galaxyhaxz 654472738d
Update control.cpp 2018-06-08 22:09:16 -05:00
galaxyhaxz 8ab44ba18e
Revert EOL for windows 2018-06-08 21:30:50 -05:00
galaxyhaxz 53da0929d3
Delete storm.def 2018-06-08 21:30:29 -05:00
galaxyhaxz a7fe3b95c0
Revert EOL for windows 2018-06-08 21:29:59 -05:00
galaxyhaxz 4b73a1dd52
Delete diabloui.def 2018-06-08 21:29:34 -05:00
galaxyhaxz a2e61bfb07
Revert flag fix, but still need to fix gmenu.cpp 2018-06-08 21:18:39 -05:00
galaxyhaxz e6ffff51bc
Fix EOL 2018-06-08 21:17:20 -05:00
galaxyhaxz 1e20ab18ed
Fix compatibility with GNU/MSVC 2018-06-08 21:16:12 -05:00
galaxyhaxz e8bc617743
Fix compatibility with GNU/MSVC 2018-06-08 21:14:44 -05:00
galaxyhaxz 0e81dfa087
Fix EOL 2018-06-08 21:12:27 -05:00
galaxyhaxz 84e734e55b
Make compatible with both GNU/MSVC 2018-06-08 21:09:45 -05:00
galaxyhaxz b2f9ed8781
Temporary sign change, fix in future 2018-06-08 21:04:49 -05:00
galaxyhaxz 10a479e36c
Merge pull request #7 from mewpull/dev
Linux compile Take 2 temp
2018-06-08 19:33:19 -05:00
mewmew 445520a31d Copy storm.def and diabloui.def to work with VS and GCC
Updates #5.
2018-06-09 00:16:26 +02:00
mewmew e12630c089 install: add note that pacman is for Arch Linux 2018-06-08 20:19:45 +02:00
mewmew 1a70a033b8 Update name of executable to devilution.exe
This lets it live alongside diablo.exe in the game directory.
2018-06-08 20:01:04 +02:00
mewmew 05577684c4 Add extended installation instructions for Linux and Windows 2018-06-08 19:59:40 +02:00
mewmew 19f78a991a readme: fix screenshots 2018-06-08 12:47:50 +02:00
mewmew 4a866b32db Fix build issue in debug.cpp
Source/debug.cpp:124:41: error: unable to find numeric literal operator ‘operator""i64’
    *(_QWORD *)plr[myplr]._pMemSpells |= 1i64 << (i - 1);
2018-06-08 11:42:23 +02:00
mewmew f5f76f8b8a Fix build on Linux 2018-06-08 11:23:30 +02:00
galaxyhaxz 0da84fd997
Merge pull request #4 from galaxyhaxz/revert-2-master
Revert "Add preliminary support for compiling on Linux"
2018-06-07 22:01:58 -05:00
galaxyhaxz b1ee40f6e7
Revert "Add preliminary support for compiling on Linux" 2018-06-07 22:00:35 -05:00
galaxyhaxz b4765fc121
Merge pull request #3 from mewpull/readme
readme: make screenshot visible in readme
2018-06-07 20:15:39 -05:00
galaxyhaxz 4910d30287
Merge pull request #2 from mewpull/master
Add preliminary support for compiling on Linux
2018-06-07 20:15:16 -05:00
mewmew 3ab25aca73 readme: make screenshot visible in readme 2018-06-08 01:55:30 +02:00
mewmew 1836399875 Fix linking against storm.dll and diabloui.dll
* add aliases for storm exports to handle __stdcall calling convention on Linux
* mark external functions as extern "C"
2018-06-08 01:28:20 +02:00
mewmew bd12b61831 Merge branch 'master' of https://github.com/galaxyhaxz/devilution 2018-06-07 22:45:03 +02: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 48a871c010
Merge pull request #1 from mewpull/master
readme: update credits to authors of sanctuary
2018-06-07 03:23:02 -05:00
mewmew b88586b810 readme: update credits to authors of sanctuary 2018-06-07 09:32:22 +02:00
galaxyhaxz 2d80291dd3
Update README.md 2018-06-06 22:23:54 -05:00
galaxyhaxz 752846b979
Update README.md 2018-06-06 22:08:45 -05:00
galaxyhaxz 2cb648773c
Update README.md 2018-06-06 22:07:53 -05:00
galaxyhaxz a775fe4fd5
Delete .gitignore 2018-06-06 21:30:07 -05:00
galaxyhaxz f1af151393
Delete .gitignore 2018-06-06 21:29:57 -05:00
galaxyhaxz b1612bbde9
Delete .gitignore 2018-06-06 21:29:47 -05:00
galaxyhaxz 9a22e43958
Delete .gitignore 2018-06-06 21:29:34 -05:00
galaxyhaxz d6191fc9fc
Delete .gitignore 2018-06-06 21:29:22 -05:00
galaxyhaxz bcb3abe96b
Add files via upload 2018-06-06 21:27:39 -05:00