zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed setuptile DEF command due to the hacky implementation and general uselessness of what can be done with it.

Browse source
This commit is contained in:
Christoph Oelckers 2020-07-14 17:47:11 +02:00
parent fedeec73c7
commit f9c03760a3
4 changed files with 1 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/blood/src/view.cpp
View file

@ -3598,11 +3598,7 @@ char pzLoadingScreenText1[256], pzLoadingScreenText2[256], pzLoadingScreenText3[
void viewLoadingScreenWide(void)
{
#ifdef USE_OPENGL
if ((blood_globalflags&BLOOD_FORCE_WIDELOADSCREEN) || (bLoadScreenCrcMatch && !(hw_hightile && h_xsize[kLoadScreen])))
#else
if ((blood_globalflags&BLOOD_FORCE_WIDELOADSCREEN) || bLoadScreenCrcMatch)
#endif
if ((blood_globalflags&BLOOD_FORCE_WIDELOADSCREEN) || (bLoadScreenCrcMatch))
{
if (yxaspect >= 65536)
{

2
source/build/include/build.h
View file

@ -499,8 +499,6 @@ extern char g_haveVoxels;
extern int32_t rendmode;
#endif
extern uint8_t globalr, globalg, globalb;
EXTERN uint16_t h_xsize[MAXTILES], h_ysize[MAXTILES];
EXTERN int8_t h_xoffs[MAXTILES], h_yoffs[MAXTILES];
enum {
GLOBAL_NO_GL_TILESHADES = 1<<0,

41
source/build/src/defs.cpp
View file

@ -600,47 +600,6 @@ static int32_t defsparser(scriptfile *script)
TileFiles.LoadArtFile(fn, nullptr, tile);
}
break;
case T_SETUPTILE:
{
int32_t tile, tmp;
if (scriptfile_getsymbol(script,&tile)) break;
if (check_tile("setuptile", tile, script, cmdtokptr))
break;
if (scriptfile_getsymbol(script,&tmp)) break; // XXX
h_xsize[tile] = tmp;
if (scriptfile_getsymbol(script,&tmp)) break;
h_ysize[tile] = tmp;
if (scriptfile_getsymbol(script,&tmp)) break;
h_xoffs[tile]=tmp;
if (scriptfile_getsymbol(script,&tmp)) break;
h_yoffs[tile]=tmp;
break;
}
case T_SETUPTILERANGE:
{
int32_t tile1,tile2,xsiz,ysiz,xoffs,yoffs,i;
if (scriptfile_getsymbol(script,&tile1)) break;
if (scriptfile_getsymbol(script,&tile2)) break;
if (scriptfile_getnumber(script,&xsiz)) break;
if (scriptfile_getnumber(script,&ysiz)) break;
if (scriptfile_getsymbol(script,&xoffs)) break;
if (scriptfile_getsymbol(script,&yoffs)) break;
if (check_tile_range("setuptilerange", &tile1, &tile2, script, cmdtokptr))
break;
for (i=tile1; i<=tile2; i++)
{
h_xsize[i] = xsiz;
h_ysize[i] = ysiz;
h_xoffs[i] = xoffs;
h_yoffs[i] = yoffs;
}
break;
}
case T_ANIMTILERANGE:
{
int32_t tile1, tile2, spd, type;

10
source/build/src/polymost.cpp
View file

@ -3041,13 +3041,6 @@ void polymost_drawsprite(int32_t snum)
vec2_t off = { 0, 0 };
if ((globalorientation & 48) != 48) // only non-voxel sprites should do this
{
int const flag = hw_hightile && h_xsize[globalpicnum];
off = { (int32_t)tspr->xoffset + (flag ? h_xoffs[globalpicnum] : tileLeftOffset(globalpicnum)),
(int32_t)tspr->yoffset + (flag ? h_yoffs[globalpicnum] : tileTopOffset(globalpicnum)) };
}
int32_t method = DAMETH_MASK | DAMETH_CLAMPED;
if (tspr->cstat & 2)
@ -3104,9 +3097,6 @@ void polymost_drawsprite(int32_t snum)
vec2_16_t const oldsiz = tilesiz[globalpicnum];
vec2_t tsiz = { oldsiz.x, oldsiz.y };
if (hw_hightile && h_xsize[globalpicnum])
tsiz = { h_xsize[globalpicnum], h_ysize[globalpicnum] };
if (tsiz.x <= 0 || tsiz.y <= 0)
return;