zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-19 07:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added fullbright flags where appropriate

Browse source
This commit is contained in:
Christoph Oelckers 2022-12-19 22:24:12 +01:00
parent f4c176988a
commit 672374c5f4
9 changed files with 21 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/core/thingdef_data.cpp
View file

@ -178,8 +178,8 @@ static FFlagDef DukeActorFlagDefs[] =
static const struct FFlagList { const PClass * const *Type; FFlagDef *Defs; int NumDefs; int Use; } FlagLists[] =
{
{ &RUNTIME_CLASS_CASTLESS(DCoreActor), ActorFlagDefs, countof(ActorFlagDefs), 3 },
{ &RUNTIME_CLASS_CASTLESS(DCoreActor), InternalActorFlagDefs, countof(InternalActorFlagDefs), 2 },
{ &RUNTIME_CLASS_CASTLESS(DDukeActor), DukeActorFlagDefs, countof(DukeActorFlagDefs), 3 },
{ &RUNTIME_CLASS_CASTLESS(DCoreActor), InternalActorFlagDefs, countof(InternalActorFlagDefs), 2 },
};
#define NUM_FLAG_LISTS (countof(FlagLists))
@ -267,7 +267,7 @@ FFlagDef *FindFlag (const PClass *type, const char *part1, const char *part2, bo
if (part2 == NULL)
{ // Search all lists
int max = strict ? 1 : NUM_FLAG_LISTS;
int max = strict ? 2 : NUM_FLAG_LISTS;
for (int i = 0; i < max; ++i)
{
if ((FlagLists[i].Use & 1) && type->IsDescendantOf (*FlagLists[i].Type))

4
wadsrc/static/zscript/games/duke/actors/atomichealth.zs
View file

@ -3,6 +3,7 @@ class DukeAtomicHealth : DukeItemBase
default
{
pic "ATOMICHEALTH";
+FULLBRIGHT;
}
override void Initialize()
@ -14,7 +15,6 @@ class DukeAtomicHealth : DukeItemBase
override bool animate(tspritetype t)
{
t.pos.Z -= 4;
t.shade = -127;
return false;
}
}
@ -24,6 +24,7 @@ class RedneckGoogooCluster : DukeItemBase
default
{
pic "ATOMICHEALTH";
+FULLBRIGHT;
}
override void Initialize()
@ -35,7 +36,6 @@ class RedneckGoogooCluster : DukeItemBase
override bool animate(tspritetype t)
{
t.pos.Z -= 4;
t.shade = -127;
return false;
}

11
wadsrc/static/zscript/games/duke/actors/burning.zs
View file

@ -4,6 +4,7 @@ class DukeFloorFlame : DukeActor
default
{
pic "FLOORFLAME";
+FULLBRIGHT;
}
override void Initialize()
@ -11,12 +12,6 @@ class DukeFloorFlame : DukeActor
self.shade = -127;
self.ChangeStat(STAT_STANDABLE);
}
override bool animate(tspritetype t)
{
t.shade = -127;
return false;
}
}
class DukeBurning : DukeActor
@ -24,6 +19,7 @@ class DukeBurning : DukeActor
default
{
pic "BURNING";
+FULLBRIGHT;
}
override void Initialize()
@ -58,7 +54,6 @@ class DukeBurning : DukeActor
double d;
if (!OwnerAc || !OwnerAc.actorflag1(SFLAG_NOFLOORFIRE))
[d, t.pos.Z] = t.sector.getSlopes(t.pos.XY);
t.shade = -127;
return false;
}
}
@ -76,6 +71,7 @@ class RedneckFire : DukeActor
default
{
pic "FIRE";
+FULLBRIGHT;
}
override bool animate(tspritetype t)
@ -84,7 +80,6 @@ class RedneckFire : DukeActor
double d;
if (!OwnerAc || !OwnerAc.actorflag1(SFLAG_NOFLOORFIRE))
[d, t.pos.Z] = t.sector.getSlopes(t.pos.XY);
t.shade = -127;
return false;
}
}

2
wadsrc/static/zscript/games/duke/actors/dukeitems.zs
View file

@ -267,12 +267,12 @@ class DukeGrowSpark : DukeActor
default
{
spriteset "GROWSPARK", "GROWSPARK1", "GROWSPARK2", "GROWSPARK3";
+FULLBRIGHT;
}
override bool animate(tspritetype t)
{
t.setSpritePic(self, (PlayClock >> 4) & 3);
t.shade = -127;
return true;
}
}

9
wadsrc/static/zscript/games/duke/actors/explosion2.zs
View file

@ -3,13 +3,13 @@ class DukeExplosion2 : DukeActor
default
{
pic "EXPLOSION2";
+FULLBRIGHT;
}
override bool animate(tspritetype t)
{
Duke.GetViewPlayer().visibility = -127;
Duke.setlastvisinc(32);
t.shade = -127;
return false;
}
@ -38,12 +38,7 @@ class DukeExplosion2Bot : DukeExplosion2
default
{
pic "EXPLOSION2BOT";
}
override bool animate(tspritetype t)
{
t.shade = -127;
return false;
+FULLBRIGHT;
}
}

7
wadsrc/static/zscript/games/duke/actors/naturallightning.zs
View file

@ -3,6 +3,7 @@ class DukeNaturalLightning : DukeActor
default
{
pic "NATURALLIGHTNING";
+FULLBRIGHT;
}
override void Initialize()
@ -10,10 +11,4 @@ class DukeNaturalLightning : DukeActor
self.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
self.cstat |= CSTAT_SPRITE_INVISIBLE;
}
override bool Animate(tspritetype t)
{
t.shade = -127;
return true;
}
}

39
wadsrc/static/zscript/games/duke/actors/projectiles.zs
View file

@ -200,6 +200,7 @@ class DukeFirelaser : DukeProjectile // Liztrooper shot
default
{
spriteset "FIRELASER", "FIRELASER2", "FIRELASER3", "FIRELASER4", "FIRELASER5", "FIRELASER6";
+FULLBRIGHT;
}
override bool postmoveeffect(CollisionData coll)
{
@ -222,7 +223,6 @@ class DukeFirelaser : DukeProjectile // Liztrooper shot
override bool animate(tspritetype tspr)
{
if (Raze.isRR()) tspr.setSpritePic(self, ((PlayClock >> 2) % 6));
tspr.shade = -127;
return true;
}
@ -233,6 +233,7 @@ class DukeFirelaserTrail : DukeActor
default
{
spriteset "FIRELASER", "FIRELASER2", "FIRELASER3", "FIRELASER4", "FIRELASER5", "FIRELASER6";
+FULLBRIGHT;
}
override void Tick()
@ -247,7 +248,6 @@ class DukeFirelaserTrail : DukeActor
{
self.extra = 999;
if (Raze.isRR()) tspr.setSpritePic(self, ((PlayClock >> 2) % 6));
tspr.shade = -127;
return true;
}
@ -264,6 +264,7 @@ class DukeShrinkSpark : DukeProjectile
default
{
spriteset "SHRINKSPARK", "SHRINKSPARK1", "SHRINKSPARK2", "SHRINKSPARK3";
+FULLBRIGHT;
}
override void posthiteffect(CollisionData coll)
@ -277,7 +278,6 @@ class DukeShrinkSpark : DukeProjectile
override bool animate(tspritetype tspr)
{
tspr.setSpritePic(self, (PlayClock >> 4) & 3);
tspr.shade = -127;
return true;
}
@ -289,12 +289,7 @@ class DukeShrinkerExplosion : DukeActor
default
{
spriteset "SHRINKEREXPLOSION";
}
override bool animate(tspritetype tspr)
{
tspr.shade = -127;
return false;
+FULLBRIGHT;
}
override void Initialize()
@ -326,6 +321,7 @@ class DukeRPG : DukeProjectile
default
{
pic "RPG";
+FULLBRIGHT;
}
override void Initialize()
@ -399,13 +395,6 @@ class DukeRPG : DukeProjectile
self.spawn('DukeWaterBubble');
}
override bool animate(tspritetype tspr)
{
tspr.shade = -127;
return true;
}
}
@ -420,6 +409,7 @@ class DukeFreezeBlast : DukeProjectile
default
{
pic "FREEZEBLAST";
+FULLBRIGHT;
}
override bool postmoveeffect(CollisionData coll)
@ -477,13 +467,6 @@ class DukeFreezeBlast : DukeProjectile
self.yint--;
return true;
}
override bool animate(tspritetype tspr)
{
tspr.shade = -127;
return true;
}
}
//---------------------------------------------------------------------------
@ -548,6 +531,7 @@ class DukeCoolExplosion1 : DukeProjectile // octabrain shot.
"COOLEXPLOSION6", "COOLEXPLOSION7", "COOLEXPLOSION8", "COOLEXPLOSION9", "COOLEXPLOSION10",
"COOLEXPLOSION11", "COOLEXPLOSION12", "COOLEXPLOSION13", "COOLEXPLOSION14", "COOLEXPLOSION15",
"COOLEXPLOSION16", "COOLEXPLOSION17", "COOLEXPLOSION18", "COOLEXPLOSION19", "COOLEXPLOSION20";
+FULLBRIGHT;
}
override void Initialize()
@ -608,7 +592,6 @@ class DukeCoolExplosion1 : DukeProjectile // octabrain shot.
override bool animate(tspritetype tspr)
{
tspr.setSpritePic(self, clamp((self.shade >> 1), 0, 19));
tspr.shade = -127;
return true;
}
@ -748,14 +731,8 @@ class RedneckUWhip : DukeProjectile
default
{
pic "UWHIP";
+FULLBRIGHT;
}
override bool animate(tspritetype tspr)
{
tspr.shade = -127;
return true;
}
}
class RedneckOWhip : RedneckUWhip

7
wadsrc/static/zscript/games/duke/actors/redneckenemies.zs
View file

@ -247,6 +247,7 @@ class RedneckShitBoss : DukeActor
default
{
pic "SBMOVE";
+FULLBRIGHT;
}
override void Initialize()
@ -254,12 +255,6 @@ class RedneckShitBoss : DukeActor
self.scale = (0.75, 0.75);
self.setClipDistFromTile();
}
override bool animate(tspritetype t)
{
t.shade = -127;
return false;
}
}
class RedneckBubbaStand : DukeActor

2
wadsrc/static/zscript/games/duke/actors/tripbomb.zs
View file

@ -225,6 +225,7 @@ class DukeLaserLine : DukeActor
default
{
pic "LASERLINE";
+FULLBRIGHT;
}
override void Initialize()
@ -253,7 +254,6 @@ class DukeLaserLine : DukeActor
t.pos.Z = OwnerAc.pos.Z - 3;
if (gs.lasermode == 2 && Duke.GetViewPlayer().heat_on == 0)
t.scale.Y = 0;
t.shade = -127;
return true;
}