zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 10:32:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

read packslot from the actor metadata so that gItemData can be removed.

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-03 22:45:53 +02:00
parent 64d8fd6072
commit 6eda7d930e
3 changed files with 1 additions and 458 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

444
source/games/blood/src/actor.cpp
View file

@ -658,450 +658,6 @@ const VECTORDATA gVectorData[] = {
}, },
}; };
const ITEMDATA gItemData[] = {
{
0,
2552,
-8,
0,
32,
32,
-1,
},
{
0,
2553,
-8,
0,
32,
32,
-1,
},
{
0,
2554,
-8,
0,
32,
32,
-1,
},
{
0,
2555,
-8,
0,
32,
32,
-1,
},
{
0,
2556,
-8,
0,
32,
32,
-1,
},
{
0,
2557,
-8,
0,
32,
32,
-1,
},
{
0,
2558,
-8,
0,
32,
32,
-1,
},
{
0,
519,
-8,
0,
48,
48,
0,
},
{
0,
822,
-8,
0,
40,
40,
-1,
},
{
0,
2169,
-8,
0,
40,
40,
-1,
},
{
0,
2433,
-8,
0,
40,
40,
-1,
},
{
0,
517,
-8,
0,
40,
40,
-1,
},
{
0,
783,
-8,
0,
40,
40,
-1,
},
{
0,
896,
-8,
0,
40,
40,
-1,
},
{
0,
825,
-8,
0,
40,
40,
-1,
},
{
0,
827,
-8,
0,
40,
40,
4,
},
{
0,
828,
-8,
0,
40,
40,
-1,
},
{
0,
829,
-8,
0,
40,
40,
-1,
},
{
0,
830,
-8,
0,
80,
64,
1,
},
{
0,
831,
-8,
0,
40,
40,
-1,
},
{
0,
863,
-8,
0,
40,
40,
-1,
},
{
0,
760,
-8,
0,
40,
40,
2,
},
{
0,
836,
-8,
0,
40,
40,
-1,
},
{
0,
851,
-8,
0,
40,
40,
-1,
},
{
0,
2428,
-8,
0,
40,
40,
-1,
},
{
0,
839,
-8,
0,
40,
40,
3,
},
{
0,
768,
-8,
0,
64,
64,
-1,
},
{
0,
840,
-8,
0,
48,
48,
-1,
},
{
0,
841,
-8,
0,
48,
48,
-1,
},
{
0,
842,
-8,
0,
48,
48,
-1,
},
{
0,
843,
-8,
0,
48,
48,
-1,
},
{
0,
683,
-8,
0,
40,
40,
-1,
},
{
0,
521,
-8,
0,
40,
40,
-1,
},
{
0,
604,
-8,
0,
40,
40,
-1,
},
{
0,
520,
-8,
0,
40,
40,
-1,
},
{
0,
803,
-8,
0,
40,
40,
-1,
},
{
0,
518,
-8,
0,
40,
40,
-1,
},
{
0,
522,
-8,
0,
40,
40,
-1,
},
{
0,
523,
-8,
0,
40,
40,
-1,
},
{
0,
837,
-8,
0,
80,
64,
-1,
},
{
0,
2628,
-8,
0,
64,
64,
-1,
},
{
0,
2586,
-8,
0,
64,
64,
-1,
},
{
0,
2578,
-8,
0,
64,
64,
-1,
},
{
0,
2602,
-8,
0,
64,
64,
-1,
},
{
0,
2594,
-8,
0,
64,
64,
-1,
},
{
0,
753,
-8,
0,
64,
64,
-1,
},
{
0,
753,
-8,
7,
64,
64,
-1,
},
{
0,
3558,
-128,
0,
64,
64,
-1,
},
{
0,
3558,
-128,
7,
64,
64,
-1,
}
};
const AMMOITEMDATA gAmmoItemData[] = { const AMMOITEMDATA gAmmoItemData[] = {
{ {
0, 0,

13
source/games/blood/src/actor.h
View file

@ -112,18 +112,6 @@ struct WEAPONITEMDATA
FTextureID textureID() const { return tileGetTextureID(picno); } FTextureID textureID() const { return tileGetTextureID(picno); }
}; };
struct ITEMDATA
{
int16_t __cstat_;
int16_t picno;
int8_t __shade_;
uint8_t __pal_;
uint8_t __xrepeat_;
uint8_t __yrepeat_;
int16_t packSlot;
FTextureID __textureID_() const { return tileGetTextureID(picno); }
};
struct MissileType struct MissileType
{ {
int16_t picno; int16_t picno;
@ -181,7 +169,6 @@ struct VECTORDATA {
extern const AMMOITEMDATA gAmmoItemData[]; extern const AMMOITEMDATA gAmmoItemData[];
extern const WEAPONITEMDATA gWeaponItemData[]; extern const WEAPONITEMDATA gWeaponItemData[];
extern const ITEMDATA gItemData[];
extern const MissileType missileInfo[]; extern const MissileType missileInfo[];
extern const EXPLOSION explodeInfo[]; extern const EXPLOSION explodeInfo[];
extern const THINGINFO thingInfo[]; extern const THINGINFO thingInfo[];

2
source/games/blood/src/player.cpp
View file

@ -1236,7 +1236,7 @@ bool PickupItem(DBloodPlayer* pPlayer, DBloodActor* itemactor)
case kItemJumpBoots: case kItemJumpBoots:
case kItemDivingSuit: case kItemDivingSuit:
case kItemBeastVision: case kItemBeastVision:
if (!packAddItem(pPlayer, gItemData[nType].packSlot)) return 0; if (!packAddItem(pPlayer, itemactor->IntVar("packslot"))) return 0;
break; break;
default: default:
if (!powerupActivate(pPlayer, nType)) return 0; if (!powerupActivate(pPlayer, nType)) return 0;