Anders Jenbo
2327526a62
Merge branch 'master' of github.com:diasurgical/devilution
2019-04-26 19:22:49 +02:00
Robin Eklind
bfe060f173
Merge pull request #1037 from AJenbo/count
...
Correct count
2019-04-26 18:55:59 +09:00
galaxyhaxz
029b15f298
Fix type for Dungeon Micros
2019-04-26 03:17:06 +02:00
Anders Jenbo
512f858e67
Correct count
2019-04-26 02:34:19 +02:00
Xadhoom
6856fb74e2
Merge upstream beanch 'devilution/master'
2019-04-25 20:44:01 +00:00
Anders Jenbo
65b9fb87a8
Merge branch 'TownDead'
2019-04-24 14:08:25 +02:00
Anders Jenbo
55a0396f8f
Clean up mem_free_dbg style
2019-04-22 13:22:57 +02:00
galaxyhaxz
540892ff9d
Preliminary support for fixed header files
2019-04-21 17:20:38 +02:00
galaxyhaxz
4e01e03711
Cleanup default calling conventions
2019-04-09 12:04:00 +02:00
galaxyhaxz
7b687413b2
Rename InitPlayerLoc
2019-04-07 23:24:08 +02:00
Anders Jenbo
a907a4d49b
Merge branch 'master' of github.com:diasurgical/devilution
2019-04-05 15:21:53 +02:00
galaxyhaxz
d879a325e1
Fix dTransVal and pLightTbl ( #825 )
2019-04-02 14:19:28 -05:00
galaxyhaxz
5238265702
Implement assert support ( #791 )
2019-03-29 21:26:37 -05:00
galaxyhaxz
a29c75a3a2
Fix a few func/var names ( #731 )
2019-03-24 05:54:44 -05:00
Xadhoom
ecb242ae62
Merge branch 'master'
2019-03-12 09:36:42 +02:00
Anders Jenbo
3d0cd681df
Merge branch 'master' of github.com:diasurgical/devilution
2019-03-12 02:01:16 +01:00
Anders Jenbo
9358465bb5
AddMissile bin exact ( #621 )
...
* AddMissile bin exact
* Clean up bools
2019-03-11 23:59:26 +01:00
Xadhoom
5283a9ffd1
Put everything into namespace dvl
2019-03-11 20:10:23 +00:00
Anders Jenbo
f17e923ab8
Merge branch 'master' of github.com:diasurgical/devilution
2019-03-08 03:12:02 +01:00
Max Desiatov
269aa345bd
Fix downstream 64-bit builds
2019-03-08 03:07:21 +01:00
Xadhoom
6bb95a040e
Merge upstream branch 'devilution/master'
2019-03-02 16:01:07 +00:00
Anders Jenbo
bc015e9af1
Make _miDelFlag bool
2019-03-02 16:12:03 +01:00
Xadhoom
0210e2ff74
Small fix
2019-02-25 16:38:47 +01:00
Anders Jenbo
e7848c8192
Make debug less spammy
2019-02-24 17:29:37 +01:00
Xadhoom
216f91bf90
Merge upstream branch 'devilution/master'
2019-02-21 10:31:26 +00:00
Anders Jenbo
b5c7026b15
Not all animation combinations exists for player animations
...
This issue causes the game to look for 126 non existing animations
- Player always drops weapons when dying
- Player can only block if using a shield
2019-02-20 22:40:03 +01:00
Xadhoom
0ed4423be9
Possible engine bugfix
2019-02-02 11:09:19 +00:00
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
9b7da61dcf
Auto format src
2019-01-13 18:55:59 +01:00
Anders Jenbo
6d5c9619a7
Clean up town_draw_town_all ( #544 )
...
* Clean up town_draw_town_all
* Clean up town_draw_e_flag
* Clean up InitPlayerLoc
* Fix VS 2015 builds
* Clean up gendung_get_dpiece_num_from_coord
* Clean up town_draw_clipped_e_flag
* Clean up town_draw_clipped_e_flag_2
* Remove HIDWORD() as it is now unused
2019-01-06 01:36:59 +01:00
Anders Jenbo
fd2a45ff9a
Engine.cpp ( #548 )
...
* Clean up DiabloAllocPtr
* Clean up mem_free_dbg
* Clean up GetDirection
* Clean up PlayInGameMovie
* 18 directions
2019-01-03 02:29:31 +01:00
Anders Jenbo
efec32bcd5
Compile files as C ( #527 )
...
* Compile files as C
* Provide fallback for qmemcpy
Enable C compilation for:
Source/gendung.cpp
Source/inv.cpp
Source/minitext.cpp
Source/pack.cpp
2018-12-30 13:16:11 +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
f1c2d3ddb6
Clean up PlrDeadItem
2018-12-20 18:13:37 +01:00
Anders Jenbo
7dee72d446
C declaration ( #498 )
...
* Convert player.cpp functions to C
* Convert capture.cpp functions to C
2018-12-14 01:53:22 +01:00
Anders Jenbo
b4fe143e29
Add player_weapon_type
2018-12-07 23:54:39 +01:00
Anders Jenbo
ef28a74db5
Correct var names in StartPlrHit ( #484 )
...
* Correct var names in StartPlrHit
* Clean up RespawnDeadItem
* Update Source/player.cpp
Co-Authored-By: AJenbo <[email protected] >
2018-11-28 16:36:01 +01:00
Anders Jenbo
9edeecb3bb
Consisten use of structs
2018-11-26 14:19:27 +01:00
Anders Jenbo
d69ed419db
Correct style
2018-11-26 14:14:55 +01:00
Anders Jenbo
f31942d801
Level 16 message bug
2018-11-08 20:58:31 +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
e340ce2241
Monster.cpp ( #442 )
...
* Clean M_UpdateLeader
* Clean up M_DoRSpAttack
* Add definition for mFlags
Fixes #416
2018-10-27 20:47:43 +02:00
Anders Jenbo
b1f6d3698f
Update style to use tabs
2018-10-25 22:53:04 +02:00
Anders Jenbo
6576954831
Clean up types used in gamemenu.cpp
2018-10-21 03:50:52 +02:00
Anders Jenbo
c24569205d
Format compleated files
2018-10-19 03:02:43 +02:00
Anders Jenbo
f1c8439c64
Change setlvlnum to BYTE
2018-10-18 20:14:58 +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