zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- reinstated RR code after seeing that the weapon array can be shared without problems.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-05 18:47:07 +02:00
parent 7493956613
commit 294a7e4c9c
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/games/duke/src/actors.cpp
View file

@ -65,10 +65,14 @@ bool ceilingspace(int sectnum)
{
case MOONSKY1:
case BIGORBIT1:
return true;
return !(g_gameType & GAMEFLAG_RRALL);
case RR_MOONSKY1:
case RR_BIGORBIT1:
return !!(g_gameType & GAMEFLAG_RRALL);
}
}
return false;
return 0;
}
//---------------------------------------------------------------------------
@ -85,12 +89,22 @@ bool floorspace(int sectnum)
{
case MOONSKY1:
case BIGORBIT1:
return true;
return !(g_gameType & GAMEFLAG_RRALL);
case RR_MOONSKY1:
case RR_BIGORBIT1:
return !!(g_gameType & GAMEFLAG_RRALL);
}
}
return false;
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void addammo(short weapon, struct player_struct* p, short amount)
{
p->ammo_amount[weapon] += amount;
@ -182,6 +196,8 @@ void addweapon(struct player_struct* p, short weapon)
bool ifsquished(int i, int p)
{
if (g_gameType & GAMEFLAG_RRALL) return false; // this function is a no-op in RR's source.
bool squishme = false;
if (sprite[i].picnum == TILE_APLAYER && ud.clipping)
return false;

19
source/games/duke/src/namesdyn.h
View file

@ -3592,6 +3592,25 @@ enum dukeweapon_t_alt
CHICKEN_WEAPON,
};
enum redneck_weapon_t
{
// RR names from RedneckGDX. The reconstructed source uses the Duke names.
RIFLEGUN_WEAPON = 3,
DYNAMITE_WEAPON = 4,
CROSSBOW_WEAPON = 5,
THROWSAW_WEAPON = 6,
ALIENBLASTER_WEAPON = 7,
POWDERKEG_WEAPON = 8,
TIT_WEAPON = 9,
//HANDREMOTE_WEAPON = 10;
BUZSAW_WEAPON = 11,
BOWLING_WEAPON = 12,
MOTO_WEAPON = 13,
//BOAT_WEAPON = 14,
RATE_WEAPON = 15,
CHICKENBOW_WEAPON = 16
};
#define DYNAMICWEAPONMAP(Weaponnum) Weaponnum
END_DUKE_NS