OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'gz-zscript'

Browse source
This commit is contained in:
Christoph Oelckers 2016-12-06 22:47:37 +01:00
commit c3fb43db3a
701 changed files with 75672 additions and 59327 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/gl/data/gl_data.cpp
View file

@ -93,29 +93,30 @@ void gl_CreateSections();
void AdjustSpriteOffsets()
{
static bool done=false;
char name[30];
if (done) return;
done=true;
mysnprintf(name, countof(name), "sprofs/%s.sprofs", GameNames[gameinfo.gametype]);
int lump = Wads.CheckNumForFullName(name);
if (lump>=0)
int lump, lastlump = 0;
while ((lump = Wads.FindLump("SPROFS", &lastlump, false)) != -1)
{
FScanner sc;
sc.OpenLumpNum(lump);
sc.SetCMode(true);
GLRenderer->FlushTextures();
int ofslumpno = Wads.GetLumpFile(lump);
while (sc.GetString())
{
int x,y;
bool iwadonly = false;
FTextureID texno = TexMan.CheckForTexture(sc.String, FTexture::TEX_Sprite);
sc.GetNumber();
sc.MustGetStringName(",");
sc.MustGetNumber();
x=sc.Number;
sc.GetNumber();
sc.MustGetStringName(",");
sc.MustGetNumber();
y=sc.Number;
if (sc.CheckString(","))
{
sc.MustGetString();
if (sc.Compare("iwad")) iwadonly = true;
}
if (texno.isValid())
{
FTexture * tex = TexMan[texno];
@ -125,7 +126,7 @@ void AdjustSpriteOffsets()
if (lumpnum >= 0 && lumpnum < Wads.GetNumLumps())
{
int wadno = Wads.GetLumpFile(lumpnum);
if (wadno==FWadCollection::IWAD_FILENUM || wadno == ofslumpno)
if ((iwadonly && wadno==FWadCollection::IWAD_FILENUM) || (!iwadonly && wadno == ofslumpno))
{
tex->LeftOffset=x;
tex->TopOffset=y;