Commit graph

110 commits

Author SHA1 Message Date
Anders Jenbo
762c49ea2e Remove some left over asm 2019-08-26 15:08:13 +02:00
Anders Jenbo
1ebf8fe27d Remove unused fallbacks 2019-08-26 14:05:04 +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
Robin Eklind
2508690d9c engine: rename rand_increment and rand_multiplier to RndInc and RndMult
Rationale described in a479cc56b8
as included below:

Note, neither rand_increment nor rand_multiplier are
present in the PSX debug info. To keep the names for
these variables consistent with the naming convention
used for sglGameSeed, SeedCount, SetRndSeed and
GetRndSeed (which are part of the PSX debug info), we
rename them to RndInc and RndMult, respectively.
2019-08-18 07:44:39 +02:00
Alex Yatskov
f1da6e6a38 Fix invalid file and line constants (#222)
* Fix invalid file and line constants

* add macros

* remove ASSERT_FAIL macro
2019-08-07 15:49:20 +02:00
Anders Jenbo
60ee365dff Merge branch 'master' of github.com:diasurgical/devilution 2019-07-20 19:52:50 +02:00
Anders Jenbo
3bc8ba66b0 Use defines for more screen geometry values 2019-07-20 17:10:49 +02:00
Xadhoom
148a7be44d Merge upstream branch 'devilution/master' 2019-07-10 17:04:38 +00:00
Anders Jenbo
55b5ce883d Clean up unformatted files 2019-07-08 04:28:31 +02:00
Anders Jenbo
7883043adc Clean up files with dirty headers 2019-07-08 04:28:31 +02: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
Anders Jenbo
f31cac0ee0 Clean up Cl2DecodeFrm3, Cl2DecodeFrm5, Cl2DecodeLightTbl & Cl2DecodeFrm6 2019-06-13 21:55:18 +01:00
Sergey Semushin
2b816ff9a8 Make CelDrawHdrLightRed bin exact. 2019-06-13 11:57:03 +01:00
Anders Jenbo
0397dbe9e3 Allign similar code in engine.cpp 2019-06-11 11:08:50 +02:00
Anders Jenbo
85651c015a Consistent var naming in engine.cpp 2019-06-10 23:23:30 +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
Manuel K
df1d049ae3 Use SCREEN_Y 2019-06-02 18:08:09 +01:00
Manuel K
896933f55e Replace magic number 352 with VIEWPORT_HEIGHT (#1232) 2019-06-02 17:51:33 +01:00
Anders Jenbo
0c4b4719b8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-09 23:51:21 +02:00
Sergey Semushin
a87f1450e7 Add algorithm description comment for DrawLine. 2019-05-06 02:04:07 +01:00
Sergey Semushin
b971d8a2cb Make DrawLine bin exact by copying from its original source. 2019-05-05 21:12:07 +01:00
Anders Jenbo
23e7737c75 Merge branch 'master' of github.com:diasurgical/devilution
Fixes #92
2019-05-05 00:27:08 +02:00
galaxyhaxz
5e10dcb912 diablo_reload_proc & Xiaolin Wu ref 2019-05-04 17:29:21 +01:00
Anders Jenbo
35b6b738af Merge branch 'master' of github.com:diasurgical/devilution 2019-05-01 15:17:36 +02:00
galaxyhaxz
75a150d142
DrawLine (#1084) 2019-05-01 05:32:05 -05:00
galaxyhaxz
5d4918eea0 LoadWithMem 2019-04-30 22:47:53 -05: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
3a636fdcc6
Add missing functions for MI_Dummy (#1004) 2019-04-22 20:21:52 -05:00
galaxyhaxz
777c517b8e Change ASM macro 2019-04-22 02:23:12 -05: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
Robin Eklind
aefddd13d1
Merge pull request #866 from AJenbo/CelDecodeHdrLightTrans
Clean up CelDrawHdrLightRed
2019-04-16 01:42:51 +09:00
galaxyhaxz
cef65ea0b6 Implement Critical section constructor 2019-04-15 01:16:43 +02:00
Anders Jenbo
a592838d42 Clean up CelDecodeHdrLightTrans 2019-04-09 13:51:19 +02:00
galaxyhaxz
4e01e03711 Cleanup default calling conventions 2019-04-09 12:04:00 +02:00
galaxyhaxz
63b0a9fb04 Cel2DrawHdrLightRed 2019-04-08 18:56:23 +02:00
Anders Jenbo
8387d0fb97 Align code style in engine.cpp 2019-04-08 03:42:50 +02:00
Anders Jenbo
53cd38a8e8 Clean up Cel2DecodeHdrLight 2019-04-08 03:42:34 +02:00
Anders Jenbo
eb90aa182a Clean up CelDecodeHdrLightTrans 2019-04-08 00:56:33 +02:00
Anders Jenbo
46f83455be Clean up variable naming in engine.cpp 2019-04-08 00:32:33 +02:00
Anders Jenbo
1af8fc330f Clean up Cel2DecodeLightTrans 2019-04-08 00:10:07 +02:00
Anders Jenbo
4d6d0d8592 Clean up CelDecodeHdrLightOnly 2019-04-08 00:00:09 +02:00
Anders Jenbo
e7d5aac5dc Clean up engine and scrollrt attribute naming 2019-04-07 21:17:59 +02:00
Anders Jenbo
d8bb37349e Merge branch 'master' of github.com:diasurgical/devilution 2019-04-06 04:34:49 +02:00
Anders Jenbo
d2174e3454 Apply code style 2019-04-05 21:54:45 +02:00
Anders Jenbo
a907a4d49b Merge branch 'master' of github.com:diasurgical/devilution 2019-04-05 15:21:53 +02:00