Commit Graph
179 Commits
Author SHA1 Message Date
Anders Jenbo fae2be813a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-28 04:31:04 +02:00
qndel 0704393bc3 StoreAutoPlace cleanup 2019-09-26 01:13:58 +02:00
qndel d3389f3f7c DrawSLine cleanup 2019-09-25 22:53:16 +02:00
qndel ddec3ce5bb PrintStoreItem cleanup 2019-09-25 22:06:05 +02:00
Anders Jenbo c5a9917aee Merge branch 'master' of github.com:diasurgical/devilution 2019-09-17 03:29:59 +02:00
Anders Jenbo 1c9801986c Fix S_StartTalk 2019-09-17 03:25:23 +02:00
Anders Jenbo f605138c79 Strip ASM code 2019-08-26 13:33:03 +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 9d3ce818f0 Correct BOOLS 2019-07-21 19:11:11 +02:00
Anders Jenbo 6fba17eec5 Correct GLOBAL types based on PSX SYM 3 2019-07-21 04:10:31 +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 32a51d17ca Align function signatures with PSX symbols
Using
https://github.com/diasurgical/scalpel/tree/master/psx/_dump_/3/_dump_c_src_/diabpsx/source
as a reference
2019-07-08 04:12:12 +02:00
Anders Jenbo e6f4e21631 Merge branch 'master' of github.com:diasurgical/devilution 2019-06-16 19:18:19 +02:00
Duarte Alvim 6a4142fb08 Add gold constants 2019-06-16 02:24:09 +02:00
Anders Jenbo 3b879cc373 Fix CheckStoreBtn 2019-06-15 11:18:36 +02:00
Anders Jenbo 0022702c38 Clean up CalcPlrInv calls 2019-06-09 19:42:10 +02:00
Manuel K 97c1edd3a0 Use BUFFER_WIDTH 2019-06-05 20:13:34 +02:00
Anders Jenbo 8cb04b0d9b Merge branch 'master' of github.com:diasurgical/devilution 2019-06-02 19:11:49 +02:00
Sergey Semushin 0f2140da4b Make S_BBuyEnter bin exact. 2019-05-31 20:18:12 +01:00
Anders Jenbo c20cf78333 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-26 19:12:41 +02:00
Anders Jenbo efc4be344c Fix S_BBuyEnter 2019-05-26 18:12:04 +01:00
Anders Jenbo f1d54cee52 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-23 18:12:54 +02:00
Anders Jenbo 5c43ecbb24 Clean up PrintSString 2019-05-21 00:31:38 +01:00
Anders Jenbo c4dd7d374e Clean up stores.cpp 2019-05-21 00:31:38 +01:00
Anders Jenbo c494d938e7 Clean up PrintSString 2019-05-21 00:31:38 +01:00
Anders Jenbo 0c4b4719b8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-09 23:51:21 +02:00
Anders Jenbo aa2752839a Clean up switch style 2019-05-07 00:50:07 +02: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
Anders Jenbo 35b6b738af Merge branch 'master' of github.com:diasurgical/devilution 2019-05-01 15:17:36 +02:00
Anders Jenbo a46ef68b2c Merge branch 'master' of github.com:diasurgical/devilution 2019-04-29 02:29:39 +02:00
Anders Jenbo dce5f70485 Clean up quests.cpp 2019-04-28 22:25:19 +02:00
Anders Jenbo 9b3eb784d5 Clean up S_ScrollSPBuy 2019-04-28 21:47:09 +02:00
Anders Jenbo ed98e5f71d Clean up S_TalkEnter 2019-04-28 21:47:09 +02:00
Anders Jenbo ffc2e05bf2 Clean up stores.cpp 2019-04-28 21:47:09 +02:00
Anders Jenbo ee6c92c9f8 Clean up S_StartWBuy 2019-04-28 21:47:09 +02:00
Anders Jenbo 07e1482740 Clean up S_StartTalk 2019-04-28 21:47:09 +02:00
Anders Jenbo a8dcef4bdb Clean up STextESC 2019-04-28 21:47:09 +02:00
Anders Jenbo 774ec172e1 Clean up STextUp 2019-04-28 21:47:09 +02:00
Anders Jenbo 141fe62666 Clean up STextDown 2019-04-28 21:47:09 +02:00
Anders Jenbo d6d64b4f78 Clean up STextPrior 2019-04-28 21:47:09 +02:00
Anders Jenbo 9b077ac24f Clean up S_SmithEnter 2019-04-28 21:47:09 +02:00
Anders Jenbo 1e37dbe89e Clean up TakePlrsMoney 2019-04-28 21:47:09 +02:00
Anders Jenbo 6dcf737c17 Clean up CheckStoreBtn 2019-04-28 21:47:09 +02:00
Anders Jenbo f4707e114f Clean up STextEnter 2019-04-28 21:47:09 +02:00
Anders Jenbo 8be94afcfd Clean up SmithRepairItem 2019-04-28 21:47:09 +02:00