Anders Jenbo
c5a9917aee
Merge branch 'master' of github.com:diasurgical/devilution
2019-09-17 03:29:59 +02:00
Anders Jenbo
b22e2451e3
Merge pull request #1618 from qndel/SetReturnLvlPos
...
SetReturnLvlPos cleanup
2019-09-15 15:42:53 +02:00
qndel
eab02de82f
ResyncQuests cleanup
2019-09-15 12:48:41 +02:00
qndel
72883c0621
SetReturnLvlPos cleanup
2019-09-15 12:11:54 +02:00
Anders Jenbo
14f8c9368a
Merge branch 'master' of github.com:diasurgical/devilution
2019-09-13 17:51:58 +02:00
Anders Jenbo
1f715f86f6
Clean up
2019-08-27 17:06:54 +02:00
Anders Jenbo
98ab9b9600
Merge branch 'master' of github.com:diasurgical/devilution
2019-08-18 08:07:33 +02:00
Anders Jenbo
68d51e7d27
Implementing Spawned Shareware version
2019-08-12 16:04:20 +02:00
Anders Jenbo
2fcf8dab70
Merge branch 'master' of github.com:diasurgical/devilution
2019-07-21 19:39:17 +02:00
Anders Jenbo
b023104434
Remove u from values
2019-07-21 00:57:53 +02:00
Anders Jenbo
60ee365dff
Merge branch 'master' of github.com:diasurgical/devilution
2019-07-20 19:52:50 +02:00
Robin Eklind
4cbf8c9ec3
Rename global pCelBuff to pSPentSpn2Cels
...
This is to avoid confusion, as pCelBuff is also
commonly used as a parameter name.
The naming follows the convention used by
TextBox2.CEL and TextSlid.CEL, as seen in
stores.cpp
pSTextBoxCels = LoadFileInMem("Data\\TextBox2.CEL", NULL);
pSPentSpn2Cels = LoadFileInMem("Data\\PentSpn2.CEL", NULL);
pSTextSlidCels = LoadFileInMem("Data\\TextSlid.CEL", NULL);
2019-07-16 02:13:16 +02:00
Xadhoom
148a7be44d
Merge upstream branch 'devilution/master'
2019-07-10 17:04:38 +00:00
Anders Jenbo
7c071924ad
Format recently cleaned code
2019-07-06 05:13:01 +02:00
Anders Jenbo
4ff5197291
merge devilution
2019-06-28 21:53:52 +02:00
Joan Karadimov
f16bc267fc
Use the dungeon_type enum for ReturnLvlT
2019-06-28 11:59:11 +03:00
Anders Jenbo
e6f4e21631
Merge branch 'master' of github.com:diasurgical/devilution
2019-06-16 19:18:19 +02:00
Sergey Semushin
81ec719e1b
Fix min diff in ResyncQuests.
2019-06-15 01:10:17 +02:00
Anders Jenbo
64e5fa2f05
Apply enums to NetSendCmdQuest
2019-06-07 00:28:10 +02:00
Anders Jenbo
635deebbd4
Apply enums to SpawnQuestItem
2019-06-05 03:15:23 +02:00
Anders Jenbo
0c4b4719b8
Merge branch 'master' of github.com:diasurgical/devilution
2019-05-09 23:51:21 +02:00
galaxyhaxz
82e8d6ed60
Fix trigflag, trigs.cpp bin exact
2019-05-06 23:07:59 +01:00
Sergey Semushin
02acf7629b
Make ResyncQuests bin exact.
2019-05-06 23:03:54 +01:00
Anders Jenbo
23e7737c75
Merge branch 'master' of github.com:diasurgical/devilution
...
Fixes #92
2019-05-05 00:27:08 +02:00
Anders Jenbo
ba38357e21
Clean up control.cpp pointer types
2019-05-04 12:07:08 +01:00
galaxyhaxz
8db166bac8
CheckQuests
2019-05-01 19:54:00 -05:00
Anders Jenbo
35b6b738af
Merge branch 'master' of github.com:diasurgical/devilution
2019-05-01 15:17:36 +02:00
Sergey Semushin
8bc995e681
Add _uniq_monsterid enum for indexes in UniqMonst for special unique monsters.
...
Apply it where necessary.
2019-05-01 13:45:14 +01:00
Robin Eklind
4e2ff01beb
Merge pull request #1077 from AJenbo/PrintQLString
...
Clean up PrintQLString
2019-04-30 14:17:29 +09:00
Anders Jenbo
569bd0053f
Clean up PrintQLString
2019-04-30 00:48:04 +02:00
Anders Jenbo
1526e1f3b7
Clean up CheckQuestKill
2019-04-29 01:37:24 +02:00
Anders Jenbo
7ca66a149d
Clean up DrawButcher
2019-04-29 00:40:48 +02:00
Anders Jenbo
996d8ca21f
Clean up ResyncQuests
2019-04-29 00:27:30 +02:00
Anders Jenbo
dce5f70485
Clean up quests.cpp
2019-04-28 22:25: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
galaxyhaxz
540892ff9d
Preliminary support for fixed header files
2019-04-21 17:20:38 +02:00
galaxyhaxz
740e91e881
rename screen_y_times_768
2019-04-19 04:05:55 +02:00
JustAnotherGuid
192e9a93d1
Split up Trigflag array into separate vars
2019-04-13 17:23:41 +02:00
Robin Eklind
6d49faba3e
StartQuestlog bin exact. Also, fix type of questlog
2019-04-13 14:21:04 +02:00
Robin Eklind
3be37f668b
DrawBlind bin exact
2019-04-13 14:20:02 +02:00
Robin Eklind
b9f4288277
DrawLTBanner bin exact
...
Note, here we use i=0 in the for loop, the
same simplification can be applied to
DrawWarLord and DrawSChamber.
The initial value of the i and j loop variables were
inferred from DrawLTBanner in the beta release.
2019-04-13 14:18:46 +02:00
Robin Eklind
dd52c11257
DrawBlood bin exact
2019-04-13 14:16:08 +02:00
Robin Eklind
9b8263b4fe
DrawSChamber bin exact
2019-04-13 13:35:59 +02:00
Robin Eklind
1991c06220
DrawWarLord bin exact
2019-04-13 13:09:14 +02:00
Anders Jenbo
9ad9389115
Clean up SetReturnLvlPos
2019-04-09 21:53:30 +02:00
galaxyhaxz
4e01e03711
Cleanup default calling conventions
2019-04-09 12:04:00 +02:00
JustAnotherGuid
e289c2c679
ForceQuests [bin exact] ( #838 )
2019-04-06 19:57:02 +02:00
Anders Jenbo
d8bb37349e
Merge branch 'master' of github.com:diasurgical/devilution
2019-04-06 04:34:49 +02:00
galaxyhaxz
b4460ae55b
Clean DRLG_L3.cpp spawn
2019-04-06 04:21:26 +02:00
Anders Jenbo