mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Minor tweaks
# Conflicts: # source/blood/src/m32common.cpp # source/blood/src/mapedit.cpp
This commit is contained in:
parent
db5c628b34
commit
140174d1ee
3 changed files with 9 additions and 1 deletions
|
@ -256,6 +256,7 @@ void qinitspritelists(void) // Replace
|
|||
InsertSpriteStat(i, kMaxStatus);
|
||||
}
|
||||
memset(gStatCount, 0, sizeof(gStatCount));
|
||||
Numsprites = 0;
|
||||
}
|
||||
|
||||
int InsertSprite(int nSector, int nStat)
|
||||
|
@ -279,6 +280,8 @@ int InsertSprite(int nSector, int nStat)
|
|||
pSprite->index = nSprite;
|
||||
xvel[nSprite] = yvel[nSprite] = zvel[nSprite] = 0;
|
||||
|
||||
Numsprites++;
|
||||
|
||||
return nSprite;
|
||||
}
|
||||
|
||||
|
@ -299,6 +302,8 @@ int DeleteSprite(int nSprite)
|
|||
RemoveSpriteSect(nSprite);
|
||||
InsertSpriteStat(nSprite, kMaxStatus);
|
||||
|
||||
Numsprites--;
|
||||
|
||||
return nSprite;
|
||||
}
|
||||
|
||||
|
@ -1079,6 +1084,7 @@ int dbLoadMap(const char *pPath, int *pX, int *pY, int *pZ, short *pAngle, short
|
|||
}
|
||||
InsertSpriteSect(i, sprite[i].sectnum);
|
||||
InsertSpriteStat(i, sprite[i].statnum);
|
||||
Numsprites++;
|
||||
sprite[i].index = i;
|
||||
qsprite_filler[i] = pSprite->blend;
|
||||
pSprite->blend = 0;
|
||||
|
|
|
@ -128,6 +128,8 @@ glblend_t const bloodglblend =
|
|||
|
||||
void scrLoadPalette(void)
|
||||
{
|
||||
initfastcolorlookup_scale(30, 59, 11);
|
||||
initfastcolorlookup_gridvectors();
|
||||
paletteloaded = 0;
|
||||
initprintf("Loading palettes\n");
|
||||
for (int i = 0; i < 5; i++)
|
||||
|
|
|
@ -389,7 +389,7 @@ void palettePostLoadTables(void)
|
|||
for (size_t i = 0; i<16; i++)
|
||||
{
|
||||
palette_t *edcol = (palette_t *) &vgapal16[4*i];
|
||||
editorcolors[i] = getclosestcol_lim(edcol->b, edcol->g, edcol->r, 239);
|
||||
editorcolors[i] = getclosestcol_lim(edcol->b, edcol->g, edcol->r, bloodhack ? 254 : 239);
|
||||
}
|
||||
|
||||
// Bmemset(PaletteIndexFullbrights, 0, sizeof(PaletteIndexFullbrights));
|
||||
|
|
Loading…
Reference in a new issue