zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 17:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON myosx*: move masking orientation with user-bits-mask to G_DrawTileGeneric().

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3479 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-02-11 17:16:54 +00:00
parent 200cd75275
commit cba053bbcf
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/eduke32/source/game.c
View file

@ -695,18 +695,21 @@ int32_t A_CheckInventorySprite(spritetype *s)
}
}
static void G_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum,
// MYOS* CON commands. NOTE: external linkage for Lunatic.
void G_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum,
int32_t shade, int32_t orientation, int32_t p)
{
int32_t a = 0;
orientation &= (ROTATESPRITE_MAX-1);
if (orientation&4)
a = 1024;
rotatesprite_win((orientation&ROTATESPRITE_MAX)?x:(x<<16),(orientation&ROTATESPRITE_MAX)?y:(y<<16),
zoom,a,tilenum,shade,p,2|orientation);
rotatesprite_win(x<<16, y<<16, zoom,a,tilenum,shade,p,2|orientation);
}
#if !defined LUNATIC
void G_DrawTile(int32_t x, int32_t y, int32_t tilenum, int32_t shade, int32_t orientation)
{
DukePlayer_t *ps = g_player[screenpeek].ps;
@ -732,6 +735,7 @@ void G_DrawTilePalSmall(int32_t x, int32_t y, int32_t tilenum, int32_t shade, in
{
G_DrawTileGeneric(x,y,32768, tilenum,shade,orientation, p);
}
#endif
#define POLYMOSTTRANS (1)
#define POLYMOSTTRANS2 (1|32)

2
polymer/eduke32/source/game.h
View file

@ -297,10 +297,12 @@ void G_DrawFrags(void);
void G_HandleMirror(int32_t x, int32_t y, int32_t z, int32_t a, int32_t horiz, int32_t smoothratio);
void G_DrawRooms(int32_t snum,int32_t smoothratio);
void G_DrawTXDigiNumZ(int32_t starttile,int32_t x,int32_t y,int32_t n,int32_t s,int32_t pal,int32_t cs,int32_t x1,int32_t y1,int32_t x2,int32_t y2,int32_t z);
#if !defined LUNATIC
void G_DrawTile(int32_t x,int32_t y,int32_t tilenum,int32_t shade,int32_t orientation);
void G_DrawTilePal(int32_t x,int32_t y,int32_t tilenum,int32_t shade,int32_t orientation,int32_t p);
void G_DrawTilePalSmall(int32_t x,int32_t y,int32_t tilenum,int32_t shade,int32_t orientation,int32_t p);
void G_DrawTileSmall(int32_t x,int32_t y,int32_t tilenum,int32_t shade,int32_t orientation);
#endif
void G_FadePalette(int32_t r,int32_t g,int32_t b,int32_t e);
void G_GameExit(const char *t) ATTRIBUTE((noreturn));
void G_GameQuit(void);

2
polymer/eduke32/source/gameexec.c
View file

@ -2057,8 +2057,6 @@ nullquote:
int32_t x=Gv_GetVarX(*insptr++), y=Gv_GetVarX(*insptr++), tilenum=Gv_GetVarX(*insptr++);
int32_t shade=Gv_GetVarX(*insptr++), orientation=Gv_GetVarX(*insptr++);
orientation &= (ROTATESPRITE_MAX-1);
switch (tw)
{
case CON_MYOS: