Commit Graph
242 Commits
Author SHA1 Message Date
Anders Jenbo d2b1f0cfc8 Apply the Cel helper functions in a few more places 2019-09-30 11:50:18 +02:00
Robin Eklind d16f603537 all: remove unused storm imports
While no storm functions are called from these source files
it is determined that they included storm in the original
source files as made visible by the inclusion of infinity
in the data segments of the respective source files.

ref: diasurgical/devilution#1695.
2019-09-20 11:05:25 +02:00
Anders Jenbo 14f8c9368a Merge branch 'master' of github.com:diasurgical/devilution 2019-09-13 17:51:58 +02:00
qndel 5cd3c3e1d2 Merge pull request #1562 from AJenbo/RemovePlrMissiles
Clean up RemovePlrMissiles
2019-09-08 01:07:09 +02:00
Anders Jenbo b834c4e418 Clean up RemovePlrMissiles 2019-09-06 22:52:44 +02:00
Anders Jenbo f331d3b5a4 Backport Hellfire cleanups 2019-09-05 15:20:27 +02:00
Robin Eklind 9cde400c86 Merge pull request #1509 from AJenbo/PM_ChangeLightOff
Clean up PM_ChangeLightOff
2019-09-05 10:57:07 +02:00
Anders Jenbo 4e5b9312a6 Clean up PM_ChangeLightOff 2019-09-04 21:14:39 +02:00
Anders Jenbo a3cfdccf68 Add the e variable to AddPlrMonstExper 2019-09-04 06:31:46 +02:00
Anders Jenbo fae3c2a237 Clean up AddPlrMonstExper 2019-09-03 23:46:10 +02:00
Anders Jenbo 9daea5be8a Back port clean ups from Hellfire 2019-09-03 00:27:42 +02:00
Anders Jenbo 5169f3024c RestartTownLvl clean up 2019-08-31 07:52:23 +02:00
qndel 0a76a26b24 Clean up 2019-08-31 07:40:44 +02:00
qndel a17e34c4bf applied enums to _pmode and untangled ifs 2019-08-31 06:23:35 +02:00
qndel a521da3ccf [hellfire] PM_DoDeath bin exact 2019-08-30 15:45:15 +02:00
Anders Jenbo 346f87fba8 [spawn] make GetPlrGFXSize bin exact 2019-08-30 07:55:44 +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 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
Anders Jenbo 3bc8ba66b0 Use defines for more screen geometry values 2019-07-20 17:10:49 +02:00
Robin Eklind eaf8fbd0e7 Merge pull request #1312 from mewpull/cleanup4
Update player struct to use more booleans.
2019-07-18 02:50:53 +02:00
Robin Eklind 002ad4056c split PWVel into two global variables, PWVel and AnimLenFromClass
Background:

From the values of PWVel, I think it is
actually two global variables that have
been merged into one.

	int PWVel[4][3] = {
		 { 2048, 1024, 512 },
		 { 2048, 1024, 512 },
		 { 2048, 1024, 512 },
		 { 8, 8, 8 }
	};

I think it should be:

	int PWVel[3][3] = {
		 { 2048, 1024, 512 },
		 { 2048, 1024, 512 },
		 { 2048, 1024, 512 }
	};
	int AnimLenFromClass[3] = {
		 { 8, 8, 8 }
	};

Then, this code in PM_DoWalk would make more sense:

Before:
    vel = 8;
    if (currlevel != 0) {
        vel = PWVel[3][plr[pnum]._pClass];
    }

After:
    AnimLen = 8;
    if (currlevel != 0) {
        AnimLen = AnimLenFromClass[plr[pnum]._pClass];
    }
2019-07-17 22:36:06 +02:00
Robin Eklind b727d158ab Make _pSLvlVisited into a boolean.
_pSLvlVisited is only ever used in boolean contexts.
2019-07-17 20:36:02 +02:00
Robin Eklind 29eb52b6d0 Make _pLvlVisited into a boolean.
_pLvlVisited is only ever used in boolean contexts.
2019-07-17 20:34:45 +02:00
Robin Eklind a443e5091e Make _pInfraFlag a boolean.
_pInfraFlag is only ever used in boolean contexts.
2019-07-17 15:12:11 +02:00
Robin Eklind 983d2d6769 Make _pLvlChanging into a boolean.
_pLvlChanging is only ever used in boolean contexts.
2019-07-17 12:24:07 +02:00
Robin Eklind 8402bbaff5 player: replace WALK_NONE with -1 for lightning index 2019-07-17 00:30:27 +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 4ff5197291 merge devilution 2019-06-28 21:53:52 +02:00
galaxyhaxz 26932a843f Fix min diff in PlrHitMonst (#1281) 2019-06-28 02:41:41 +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 8cb04b0d9b Merge branch 'master' of github.com:diasurgical/devilution 2019-06-02 19:11:49 +02:00
Manuel K 896933f55e Replace magic number 352 with VIEWPORT_HEIGHT (#1232) 2019-06-02 17:51:33 +01:00
Anders Jenbo 56dcdd669b Clean up DrawChr 2019-05-31 16:03:03 +01:00
Anders Jenbo ce056b02d8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-30 14:40:33 +02:00
Anders Jenbo 565bb5aa7d Adust dFlag enums 2019-05-29 16:23:08 +01:00
Anders Jenbo 0c4b4719b8 Merge branch 'master' of github.com:diasurgical/devilution 2019-05-09 23:51:21 +02:00
Sergey Semushin 47aee25195 Make Do_Death 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 9f5af2e6df Clean up player.cpp 2019-05-02 00:16:46 +01:00
Anders Jenbo 66438890aa Clean up spells.cpp 2019-05-02 00:16:46 +01:00
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