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

- moved some of Blood's precaching info to external data.

Browse source
This commit is contained in:
Christoph Oelckers 2023-01-02 18:22:53 +01:00
parent 52706e9afd
commit 76c0de2ef1
4 changed files with 16 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -402,7 +402,7 @@ void dbLoadMap(const char* pPath, DVector3& pos, short* pAngle, sectortype** cur
pWall->nextwall = LittleShort(load.nextwall);
pWall->nextsector = LittleShort(load.nextsector);
pWall->cstat = EWallFlags::FromInt(LittleShort(load.cstat));
pWall->setwalltexture(tileGetTextureID(LittleShort(load.picnum)));
pWall->setwalltexture(tileGetTextureID(LittleShort(load.wallpic)));
if (load.overpic == 0) load.overpic = -1;
pWall->setovertexture(tileGetTextureID(LittleShort(load.overpic)));
pWall->type = LittleShort(load.type);

2
source/games/blood/src/mapstructs.h
View file

@ -44,7 +44,7 @@ struct walltypedisk
int32_t x, y;
int16_t point2, nextwall, nextsector;
uint16_t cstat;
int16_t picnum, overpic;
int16_t wallpic, overpic;
int8_t shade;
uint8_t pal, xrepeat, yrepeat, xpanning, ypanning;
int16_t type;

52
source/games/blood/src/preload.cpp
View file

@ -69,57 +69,6 @@ void tilePrecacheTile(int nTile, int nType, int palette)
}
// To do: This needs to handle the sprite palettes as well to properly precache the needed content.
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void viewPrecacheTiles()
{
tilePrecacheTile(kArmorbox, 0, 0);
tilePrecacheTile(kStatusbar, 0, 0);
tilePrecacheTile(kFullHUD, 0, 0);
tilePrecacheTile(kBlinkIcon, 0, 0);
tilePrecacheTile(kArmor1Gauge, 0, 0);
tilePrecacheTile(kArmor2Gauge, 0, 0);
tilePrecacheTile(kArmor3Gauge, 0, 0);
tilePrecacheTile(kSBPlayerSlot, 0, 0);
tilePrecacheTile(kThrowGauge, 0, 0);
tilePrecacheTile(kPackSelect, 0, 0);
tilePrecacheTile(kHealthicon, 0, 0);
tilePrecacheTile(kArmor1Icon, 0, 0);
tilePrecacheTile(kArmor2Icon, 0, 0);
tilePrecacheTile(kArmor3Icon, 0, 0);
for (int i = 0; i < 10; i++)
{
tilePrecacheTile(kSBarHealthAmount0 + i, 0, 0);
tilePrecacheTile(kSBarAmmoAmount0 + i, 0, 0);
tilePrecacheTile(kSBarWaponNum0 + i, 0, 0);
tilePrecacheTile(kSBarPackAmount0 + i, 0, 0);
tilePrecacheTile(kSBarNumberHealth + i, 0, 0);
tilePrecacheTile(kSBarNumberAmmo + i, 0, 0);
tilePrecacheTile(kSBarNumberInv + i, 0, 0);
tilePrecacheTile(kSBarNumberArmor1_1 + i, 0, 0);
tilePrecacheTile(kSBarNumberArmor2_1 + i, 0, 0);
tilePrecacheTile(kSBarNumberArmor3_1 + i, 0, 0);
}
/*
for (int i = 0; i < 5; i++)
{
tilePrecacheTile(gPackIcons[i], 0);
tilePrecacheTile(gPackIcons2[i].nTile, 0);
}
*/
for (int i = 0; i < 6; i++)
{
tilePrecacheTile(kKeyIcon1 + i, 0, 0);
tilePrecacheTile(kHudKeyIcon1 + i, 0, 0);
}
}
//---------------------------------------------------------------------------
//
//
@ -314,7 +263,6 @@ void PreloadCache()
*/
WeaponPrecache();
viewPrecacheTiles();
fxPrecache();
gibPrecache();

14
wadsrc/static/filter/blood/engine/rmapinfo.txt
View file

@ -19,4 +19,18 @@ gameinfo
summaryscreen = BloodCutscenes.BuildSPSummary
mpsummaryscreen = BloodCutscenes.BuildMPSummary
statusbarclass = BloodStatusBar
precachetextures = "Armorbox", "Statusbar", "FullHUD", "BlinkIcon", "Armor1Gauge", "Armor2Gauge", "Armor3Gauge", "SBPlayerSlot", "ThrowGauge", "PackSelect", "Healthicon", "Armor1Icon", "Armor2Icon", "Armor3Icon",
"SBarHealthAmount0", "SBarHealthAmount1", "SBarHealthAmount2", "SBarHealthAmount3", "SBarHealthAmount4", "SBarHealthAmount5", "SBarHealthAmount6", "SBarHealthAmount7", "SBarHealthAmount8", "SBarHealthAmount9",
"SBarAmmoAmount0", "SBarAmmoAmount1", "SBarAmmoAmount2", "SBarAmmoAmount3", "SBarAmmoAmount4", "SBarAmmoAmount5", "SBarAmmoAmount6", "SBarAmmoAmount7", "SBarAmmoAmount8", "SBarAmmoAmount9",
"SBarWaponNum0", "SBarWaponNum1", "SBarWaponNum2", "SBarWaponNum3", "SBarWaponNum4", "SBarWaponNum5", "SBarWaponNum6", "SBarWaponNum7", "SBarWaponNum8", "SBarWaponNum9",
"SBarPackAmount0", "SBarPackAmount1", "SBarPackAmount2", "SBarPackAmount3", "SBarPackAmount4", "SBarPackAmount5", "SBarPackAmount6", "SBarPackAmount7", "SBarPackAmount8", "SBarPackAmount9",
"SBarNumberHealth0", "SBarNumberHealth1", "SBarNumberHealth2", "SBarNumberHealth3", "SBarNumberHealth4", "SBarNumberHealth5", "SBarNumberHealth6", "SBarNumberHealth7", "SBarNumberHealth8", "SBarNumberHealth9",
"SBarNumberAmmo0", "SBarNumberAmmo1", "SBarNumberAmmo2", "SBarNumberAmmo3", "SBarNumberAmmo4", "SBarNumberAmmo5", "SBarNumberAmmo6", "SBarNumberAmmo7", "SBarNumberAmmo8", "SBarNumberAmmo9",
"SBarNumberInv0", "SBarNumberInv1", "SBarNumberInv2", "SBarNumberInv3", "SBarNumberInv4", "SBarNumberInv5", "SBarNumberInv6", "SBarNumberInv7", "SBarNumberInv8", "SBarNumberInv9",
"SBarNumberArmor1_0", "SBarNumberArmor1_1", "SBarNumberArmor1_2", "SBarNumberArmor1_3", "SBarNumberArmor1_4", "SBarNumberArmor1_5", "SBarNumberArmor1_6", "SBarNumberArmor1_7", "SBarNumberArmor1_8", "SBarNumberArmor1_9",
"SBarNumberArmor2_0", "SBarNumberArmor2_1", "SBarNumberArmor2_2", "SBarNumberArmor2_3", "SBarNumberArmor2_4", "SBarNumberArmor2_5", "SBarNumberArmor2_6", "SBarNumberArmor2_7", "SBarNumberArmor2_8", "SBarNumberArmor2_9",
"SBarNumberArmor3_0", "SBarNumberArmor3_1", "SBarNumberArmor3_2", "SBarNumberArmor3_3", "SBarNumberArmor3_4", "SBarNumberArmor3_5", "SBarNumberArmor3_6", "SBarNumberArmor3_7", "SBarNumberArmor3_8", "SBarNumberArmor3_9",
"KeyIcon1", "KeyIcon2", "KeyIcon3", "KeyIcon4", "KeyIcon5", "KeyIcon6",
"HudKeyIcon1", "HudKeyIcon2", "HudKeyIcon3", "HudKeyIcon4", "HudKeyIcon5", "HudKeyIcon6"
}