Merge remote-tracking branch 'Public/next' into public_next
This commit is contained in:
commit
8618589acc
124
src/am_map.c
124
src/am_map.c
|
@ -160,6 +160,7 @@ static boolean am_stopped = true;
|
||||||
static INT32 f_x, f_y; // location of window on screen (always zero for both)
|
static INT32 f_x, f_y; // location of window on screen (always zero for both)
|
||||||
static INT32 f_w, f_h; // size of window on screen (always the screen width and height respectively)
|
static INT32 f_w, f_h; // size of window on screen (always the screen width and height respectively)
|
||||||
|
|
||||||
|
static boolean m_keydown[4]; // which window panning keys are being pressed down?
|
||||||
static mpoint_t m_paninc; // how far the window pans each tic (map coords)
|
static mpoint_t m_paninc; // how far the window pans each tic (map coords)
|
||||||
static fixed_t mtof_zoommul; // how far the window zooms in each tic (map coords)
|
static fixed_t mtof_zoommul; // how far the window zooms in each tic (map coords)
|
||||||
static fixed_t ftom_zoommul; // how far the window zooms in each tic (fb coords)
|
static fixed_t ftom_zoommul; // how far the window zooms in each tic (fb coords)
|
||||||
|
@ -205,6 +206,7 @@ static boolean followplayer = true; // specifies whether to follow the player ar
|
||||||
typedef void (*AMDRAWFLINEFUNC) (const fline_t *fl, INT32 color);
|
typedef void (*AMDRAWFLINEFUNC) (const fline_t *fl, INT32 color);
|
||||||
static AMDRAWFLINEFUNC AM_drawFline;
|
static AMDRAWFLINEFUNC AM_drawFline;
|
||||||
|
|
||||||
|
static void AM_drawPixel(INT32 xx, INT32 yy, INT32 cc);
|
||||||
static void AM_drawFline_soft(const fline_t *fl, INT32 color);
|
static void AM_drawFline_soft(const fline_t *fl, INT32 color);
|
||||||
|
|
||||||
static void AM_activateNewScale(void)
|
static void AM_activateNewScale(void)
|
||||||
|
@ -344,22 +346,22 @@ static void AM_initVariables(void)
|
||||||
old_m_h = m_h;
|
old_m_h = m_h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// Called when the screen size changes.
|
||||||
|
//
|
||||||
|
static void AM_FrameBufferInit(void)
|
||||||
|
{
|
||||||
|
f_x = f_y = 0;
|
||||||
|
f_w = vid.width;
|
||||||
|
f_h = vid.height;
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// should be called at the start of every level
|
// should be called at the start of every level
|
||||||
// right now, i figure it out myself
|
// right now, i figure it out myself
|
||||||
//
|
//
|
||||||
static void AM_LevelInit(void)
|
static void AM_LevelInit(void)
|
||||||
{
|
{
|
||||||
f_x = f_y = 0;
|
|
||||||
f_w = vid.width;
|
|
||||||
f_h = vid.height;
|
|
||||||
|
|
||||||
AM_drawFline = AM_drawFline_soft;
|
|
||||||
#ifdef HWRENDER
|
|
||||||
if (rendermode == render_opengl)
|
|
||||||
AM_drawFline = HWR_drawAMline;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
AM_findMinMaxBoundaries();
|
AM_findMinMaxBoundaries();
|
||||||
scale_mtof = FixedDiv(min_scale_mtof*10, 7*FRACUNIT);
|
scale_mtof = FixedDiv(min_scale_mtof*10, 7*FRACUNIT);
|
||||||
if (scale_mtof > max_scale_mtof)
|
if (scale_mtof > max_scale_mtof)
|
||||||
|
@ -381,7 +383,7 @@ void AM_Stop(void)
|
||||||
*
|
*
|
||||||
* \sa AM_Stop
|
* \sa AM_Stop
|
||||||
*/
|
*/
|
||||||
static inline void AM_Start(void)
|
void AM_Start(void)
|
||||||
{
|
{
|
||||||
static INT32 lastlevel = -1;
|
static INT32 lastlevel = -1;
|
||||||
|
|
||||||
|
@ -390,8 +392,12 @@ static inline void AM_Start(void)
|
||||||
am_stopped = false;
|
am_stopped = false;
|
||||||
if (lastlevel != gamemap || am_recalc) // screen size changed
|
if (lastlevel != gamemap || am_recalc) // screen size changed
|
||||||
{
|
{
|
||||||
AM_LevelInit();
|
AM_FrameBufferInit();
|
||||||
lastlevel = gamemap;
|
if (lastlevel != gamemap)
|
||||||
|
{
|
||||||
|
AM_LevelInit();
|
||||||
|
lastlevel = gamemap;
|
||||||
|
}
|
||||||
am_recalc = false;
|
am_recalc = false;
|
||||||
}
|
}
|
||||||
AM_initVariables();
|
AM_initVariables();
|
||||||
|
@ -417,6 +423,28 @@ static void AM_maxOutWindowScale(void)
|
||||||
AM_activateNewScale();
|
AM_activateNewScale();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// set window panning
|
||||||
|
//
|
||||||
|
static void AM_setWindowPanning(void)
|
||||||
|
{
|
||||||
|
// up and down
|
||||||
|
if (m_keydown[2]) // pan up
|
||||||
|
m_paninc.y = FTOM(F_PANINC);
|
||||||
|
else if (m_keydown[3]) // pan down
|
||||||
|
m_paninc.y = -FTOM(F_PANINC);
|
||||||
|
else
|
||||||
|
m_paninc.y = 0;
|
||||||
|
|
||||||
|
// left and right
|
||||||
|
if (m_keydown[0]) // pan right
|
||||||
|
m_paninc.x = FTOM(F_PANINC);
|
||||||
|
else if (m_keydown[1]) // pan left
|
||||||
|
m_paninc.x = -FTOM(F_PANINC);
|
||||||
|
else
|
||||||
|
m_paninc.x = 0;
|
||||||
|
}
|
||||||
|
|
||||||
/** Responds to user inputs in automap mode.
|
/** Responds to user inputs in automap mode.
|
||||||
*
|
*
|
||||||
* \param ev Event to possibly respond to.
|
* \param ev Event to possibly respond to.
|
||||||
|
@ -449,35 +477,49 @@ boolean AM_Responder(event_t *ev)
|
||||||
{
|
{
|
||||||
case AM_PANRIGHTKEY: // pan right
|
case AM_PANRIGHTKEY: // pan right
|
||||||
if (!followplayer)
|
if (!followplayer)
|
||||||
m_paninc.x = FTOM(F_PANINC);
|
{
|
||||||
|
m_keydown[0] = true;
|
||||||
|
AM_setWindowPanning();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
rc = false;
|
rc = false;
|
||||||
break;
|
break;
|
||||||
case AM_PANLEFTKEY: // pan left
|
case AM_PANLEFTKEY: // pan left
|
||||||
if (!followplayer)
|
if (!followplayer)
|
||||||
m_paninc.x = -FTOM(F_PANINC);
|
{
|
||||||
|
m_keydown[1] = true;
|
||||||
|
AM_setWindowPanning();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
rc = false;
|
rc = false;
|
||||||
break;
|
break;
|
||||||
case AM_PANUPKEY: // pan up
|
case AM_PANUPKEY: // pan up
|
||||||
if (!followplayer)
|
if (!followplayer)
|
||||||
m_paninc.y = FTOM(F_PANINC);
|
{
|
||||||
|
m_keydown[2] = true;
|
||||||
|
AM_setWindowPanning();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
rc = false;
|
rc = false;
|
||||||
break;
|
break;
|
||||||
case AM_PANDOWNKEY: // pan down
|
case AM_PANDOWNKEY: // pan down
|
||||||
if (!followplayer)
|
if (!followplayer)
|
||||||
m_paninc.y = -FTOM(F_PANINC);
|
{
|
||||||
|
m_keydown[3] = true;
|
||||||
|
AM_setWindowPanning();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
rc = false;
|
rc = false;
|
||||||
break;
|
break;
|
||||||
case AM_ZOOMOUTKEY: // zoom out
|
case AM_ZOOMOUTKEY: // zoom out
|
||||||
mtof_zoommul = M_ZOOMOUT;
|
mtof_zoommul = M_ZOOMOUT;
|
||||||
ftom_zoommul = M_ZOOMIN;
|
ftom_zoommul = M_ZOOMIN;
|
||||||
|
AM_setWindowPanning();
|
||||||
break;
|
break;
|
||||||
case AM_ZOOMINKEY: // zoom in
|
case AM_ZOOMINKEY: // zoom in
|
||||||
mtof_zoommul = M_ZOOMIN;
|
mtof_zoommul = M_ZOOMIN;
|
||||||
ftom_zoommul = M_ZOOMOUT;
|
ftom_zoommul = M_ZOOMOUT;
|
||||||
|
AM_setWindowPanning();
|
||||||
break;
|
break;
|
||||||
case AM_TOGGLEKEY:
|
case AM_TOGGLEKEY:
|
||||||
AM_Stop();
|
AM_Stop();
|
||||||
|
@ -491,6 +533,7 @@ boolean AM_Responder(event_t *ev)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
AM_restoreScaleAndLoc();
|
AM_restoreScaleAndLoc();
|
||||||
|
AM_setWindowPanning();
|
||||||
break;
|
break;
|
||||||
case AM_FOLLOWKEY:
|
case AM_FOLLOWKEY:
|
||||||
followplayer = !followplayer;
|
followplayer = !followplayer;
|
||||||
|
@ -510,14 +553,32 @@ boolean AM_Responder(event_t *ev)
|
||||||
switch (ev->data1)
|
switch (ev->data1)
|
||||||
{
|
{
|
||||||
case AM_PANRIGHTKEY:
|
case AM_PANRIGHTKEY:
|
||||||
|
if (!followplayer)
|
||||||
|
{
|
||||||
|
m_keydown[0] = false;
|
||||||
|
AM_setWindowPanning();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case AM_PANLEFTKEY:
|
case AM_PANLEFTKEY:
|
||||||
if (!followplayer)
|
if (!followplayer)
|
||||||
m_paninc.x = 0;
|
{
|
||||||
|
m_keydown[1] = false;
|
||||||
|
AM_setWindowPanning();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case AM_PANUPKEY:
|
case AM_PANUPKEY:
|
||||||
|
if (!followplayer)
|
||||||
|
{
|
||||||
|
m_keydown[2] = false;
|
||||||
|
AM_setWindowPanning();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case AM_PANDOWNKEY:
|
case AM_PANDOWNKEY:
|
||||||
if (!followplayer)
|
if (!followplayer)
|
||||||
m_paninc.y = 0;
|
{
|
||||||
|
m_keydown[3] = false;
|
||||||
|
AM_setWindowPanning();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case AM_ZOOMOUTKEY:
|
case AM_ZOOMOUTKEY:
|
||||||
case AM_ZOOMINKEY:
|
case AM_ZOOMINKEY:
|
||||||
|
@ -718,6 +779,17 @@ static boolean AM_clipMline(const mline_t *ml, fline_t *fl)
|
||||||
}
|
}
|
||||||
#undef DOOUTCODE
|
#undef DOOUTCODE
|
||||||
|
|
||||||
|
//
|
||||||
|
// Draws a pixel.
|
||||||
|
//
|
||||||
|
static void AM_drawPixel(INT32 xx, INT32 yy, INT32 cc)
|
||||||
|
{
|
||||||
|
UINT8 *dest = screens[0];
|
||||||
|
if (xx < 0 || yy < 0 || xx >= vid.width || yy >= vid.height)
|
||||||
|
return; // off the screen
|
||||||
|
dest[(yy*vid.width) + xx] = cc;
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// Classic Bresenham w/ whatever optimizations needed for speed
|
// Classic Bresenham w/ whatever optimizations needed for speed
|
||||||
//
|
//
|
||||||
|
@ -739,8 +811,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PUTDOT(xx,yy,cc) V_DrawFill(xx,yy,1,1,cc|V_NOSCALESTART);
|
|
||||||
|
|
||||||
dx = fl->b.x - fl->a.x;
|
dx = fl->b.x - fl->a.x;
|
||||||
ax = 2 * (dx < 0 ? -dx : dx);
|
ax = 2 * (dx < 0 ? -dx : dx);
|
||||||
sx = dx < 0 ? -1 : 1;
|
sx = dx < 0 ? -1 : 1;
|
||||||
|
@ -757,7 +827,7 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
|
||||||
d = ay - ax/2;
|
d = ay - ax/2;
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
PUTDOT(x, y, color)
|
AM_drawPixel(x, y, color);
|
||||||
if (x == fl->b.x)
|
if (x == fl->b.x)
|
||||||
return;
|
return;
|
||||||
if (d >= 0)
|
if (d >= 0)
|
||||||
|
@ -774,7 +844,7 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
|
||||||
d = ax - ay/2;
|
d = ax - ay/2;
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
PUTDOT(x, y, color)
|
AM_drawPixel(x, y, color);
|
||||||
if (y == fl->b.y)
|
if (y == fl->b.y)
|
||||||
return;
|
return;
|
||||||
if (d >= 0)
|
if (d >= 0)
|
||||||
|
@ -786,8 +856,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
|
||||||
d += ax;
|
d += ax;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef PUTDOT
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -1100,6 +1168,12 @@ void AM_Drawer(void)
|
||||||
if (!automapactive)
|
if (!automapactive)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
AM_drawFline = AM_drawFline_soft;
|
||||||
|
#ifdef HWRENDER
|
||||||
|
if (rendermode == render_opengl)
|
||||||
|
AM_drawFline = HWR_drawAMline;
|
||||||
|
#endif
|
||||||
|
|
||||||
AM_clearFB(BACKGROUND);
|
AM_clearFB(BACKGROUND);
|
||||||
if (draw_grid) AM_drawGrid(GRIDCOLORS);
|
if (draw_grid) AM_drawGrid(GRIDCOLORS);
|
||||||
AM_drawWalls();
|
AM_drawWalls();
|
||||||
|
|
|
@ -38,6 +38,9 @@ void AM_Ticker(void);
|
||||||
// Called by main loop, instead of view drawer if automap is active.
|
// Called by main loop, instead of view drawer if automap is active.
|
||||||
void AM_Drawer(void);
|
void AM_Drawer(void);
|
||||||
|
|
||||||
|
// Enables the automap.
|
||||||
|
void AM_Start(void);
|
||||||
|
|
||||||
// Called to force the automap to quit if the level is completed while it is up.
|
// Called to force the automap to quit if the level is completed while it is up.
|
||||||
void AM_Stop(void);
|
void AM_Stop(void);
|
||||||
|
|
||||||
|
|
|
@ -769,7 +769,7 @@ boolean CON_Responder(event_t *ev)
|
||||||
// check for console toggle key
|
// check for console toggle key
|
||||||
if (ev->type != ev_console)
|
if (ev->type != ev_console)
|
||||||
{
|
{
|
||||||
if (modeattacking || metalrecording || menuactive)
|
if (modeattacking || metalrecording)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (key == gamecontrol[gc_console][0] || key == gamecontrol[gc_console][1])
|
if (key == gamecontrol[gc_console][0] || key == gamecontrol[gc_console][1])
|
||||||
|
|
|
@ -1278,8 +1278,14 @@ static boolean CL_SendJoin(void)
|
||||||
netbuffer->u.clientcfg.subversion = SUBVERSION;
|
netbuffer->u.clientcfg.subversion = SUBVERSION;
|
||||||
strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION,
|
strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION,
|
||||||
sizeof netbuffer->u.clientcfg.application);
|
sizeof netbuffer->u.clientcfg.application);
|
||||||
|
|
||||||
|
CleanupPlayerName(consoleplayer, cv_playername.zstring);
|
||||||
|
if (splitscreen)
|
||||||
|
CleanupPlayerName(1, cv_playername2.zstring);/* 1 is a HACK? oh no */
|
||||||
|
|
||||||
strncpy(netbuffer->u.clientcfg.names[0], cv_playername.zstring, MAXPLAYERNAME);
|
strncpy(netbuffer->u.clientcfg.names[0], cv_playername.zstring, MAXPLAYERNAME);
|
||||||
strncpy(netbuffer->u.clientcfg.names[1], cv_playername2.zstring, MAXPLAYERNAME);
|
strncpy(netbuffer->u.clientcfg.names[1], cv_playername2.zstring, MAXPLAYERNAME);
|
||||||
|
|
||||||
return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
|
return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4678,6 +4684,7 @@ static void Local_Maketic(INT32 realtics)
|
||||||
G_BuildTiccmd(&localcmds2, realtics, 2);
|
G_BuildTiccmd(&localcmds2, realtics, 2);
|
||||||
|
|
||||||
localcmds.angleturn |= TICCMD_RECEIVED;
|
localcmds.angleturn |= TICCMD_RECEIVED;
|
||||||
|
localcmds2.angleturn |= TICCMD_RECEIVED;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This function is utter bullshit and is responsible for
|
// This function is utter bullshit and is responsible for
|
||||||
|
|
|
@ -632,7 +632,7 @@ void D_RegisterClientCommands(void)
|
||||||
// Set default player names
|
// Set default player names
|
||||||
// Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well
|
// Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
sprintf(player_names[i], "Player %d", i);
|
sprintf(player_names[i], "Player %d", 1 + i);
|
||||||
|
|
||||||
if (dedicated)
|
if (dedicated)
|
||||||
return;
|
return;
|
||||||
|
@ -1008,7 +1008,7 @@ boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
|
||||||
* SetPlayerName
|
* SetPlayerName
|
||||||
* \author Graue <graue@oceanbase.org>
|
* \author Graue <graue@oceanbase.org>
|
||||||
*/
|
*/
|
||||||
static void CleanupPlayerName(INT32 playernum, const char *newname)
|
void CleanupPlayerName(INT32 playernum, const char *newname)
|
||||||
{
|
{
|
||||||
char *buf;
|
char *buf;
|
||||||
char *p;
|
char *p;
|
||||||
|
@ -1036,6 +1036,17 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
|
||||||
|
|
||||||
tmpname = p;
|
tmpname = p;
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
/* from EnsurePlayerNameIsGood */
|
||||||
|
if (!isprint(*p) || *p == ';' || (UINT8)*p >= 0x80)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
while (*++p) ;
|
||||||
|
|
||||||
|
if (*p)/* bad char found */
|
||||||
|
break;
|
||||||
|
|
||||||
// Remove trailing spaces.
|
// Remove trailing spaces.
|
||||||
p = &tmpname[strlen(tmpname)-1]; // last character
|
p = &tmpname[strlen(tmpname)-1]; // last character
|
||||||
while (*p == ' ' && p >= tmpname)
|
while (*p == ' ' && p >= tmpname)
|
||||||
|
|
|
@ -194,6 +194,7 @@ typedef union {
|
||||||
// add game commands, needs cleanup
|
// add game commands, needs cleanup
|
||||||
void D_RegisterServerCommands(void);
|
void D_RegisterServerCommands(void);
|
||||||
void D_RegisterClientCommands(void);
|
void D_RegisterClientCommands(void);
|
||||||
|
void CleanupPlayerName(INT32 playernum, const char *newname);
|
||||||
boolean EnsurePlayerNameIsGood(char *name, INT32 playernum);
|
boolean EnsurePlayerNameIsGood(char *name, INT32 playernum);
|
||||||
void D_SendPlayerConfig(void);
|
void D_SendPlayerConfig(void);
|
||||||
void Command_ExitGame_f(void);
|
void Command_ExitGame_f(void);
|
||||||
|
|
|
@ -1120,6 +1120,9 @@ static const char *credits[] = {
|
||||||
"\1Sonic Robo Blast II",
|
"\1Sonic Robo Blast II",
|
||||||
"\1Credits",
|
"\1Credits",
|
||||||
"",
|
"",
|
||||||
|
"\1Producer",
|
||||||
|
"Rob Tisdell",
|
||||||
|
"",
|
||||||
"\1Game Design",
|
"\1Game Design",
|
||||||
"Ben \"Mystic\" Geyer",
|
"Ben \"Mystic\" Geyer",
|
||||||
"\"SSNTails\"",
|
"\"SSNTails\"",
|
||||||
|
@ -1234,7 +1237,7 @@ static const char *credits[] = {
|
||||||
"Thomas \"Shadow Hog\" Igoe",
|
"Thomas \"Shadow Hog\" Igoe",
|
||||||
"Alexander \"DrTapeworm\" Moench-Ford",
|
"Alexander \"DrTapeworm\" Moench-Ford",
|
||||||
"\"Kaito Sinclaire\"",
|
"\"Kaito Sinclaire\"",
|
||||||
"\"QueenDelta\"",
|
"Anna \"QueenDelta\" Sandlin",
|
||||||
"Wessel \"sphere\" Smit",
|
"Wessel \"sphere\" Smit",
|
||||||
"\"Spazzo\"",
|
"\"Spazzo\"",
|
||||||
"\"SSNTails\"",
|
"\"SSNTails\"",
|
||||||
|
|
|
@ -3256,8 +3256,8 @@ void G_AddGametypeConstant(INT16 gtype, const char *newgtconst)
|
||||||
{
|
{
|
||||||
size_t r = 0; // read
|
size_t r = 0; // read
|
||||||
size_t w = 0; // write
|
size_t w = 0; // write
|
||||||
char *gtconst = Z_Calloc(strlen(newgtconst) + 3, PU_STATIC, NULL);
|
char *gtconst = Z_Calloc(strlen(newgtconst) + 4, PU_STATIC, NULL);
|
||||||
char *tmpconst = Z_Calloc(strlen(newgtconst), PU_STATIC, NULL);
|
char *tmpconst = Z_Calloc(strlen(newgtconst) + 1, PU_STATIC, NULL);
|
||||||
|
|
||||||
// Copy the gametype name.
|
// Copy the gametype name.
|
||||||
strcpy(tmpconst, newgtconst);
|
strcpy(tmpconst, newgtconst);
|
||||||
|
|
13
src/info.c
13
src/info.c
|
@ -2343,12 +2343,13 @@ state_t states[NUMSTATES] =
|
||||||
|
|
||||||
// TNT barrel
|
// TNT barrel
|
||||||
{SPR_BARR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_TNTBARREL_STND1
|
{SPR_BARR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_TNTBARREL_STND1
|
||||||
{SPR_BARX, 0|FF_FULLBRIGHT, 3, {A_SetObjectFlags}, MF_NOCLIP|MF_NOGRAVITY|MF_NOBLOCKMAP, 0, S_TNTBARREL_EXPL2}, // S_TNTBARREL_EXPL1
|
{SPR_BARX, 0, 0, {A_RollAngle}, 0, 1, S_TNTBARREL_EXPL2}, // S_TNTBARREL_EXPL1
|
||||||
{SPR_BARX, 1|FF_FULLBRIGHT, 2, {A_TNTExplode}, MT_TNTDUST, 0, S_TNTBARREL_EXPL3}, // S_TNTBARREL_EXPL2
|
{SPR_BARX, 0|FF_FULLBRIGHT, 3, {A_SetObjectFlags}, MF_NOCLIP|MF_NOGRAVITY|MF_NOBLOCKMAP, 0, S_TNTBARREL_EXPL3}, // S_TNTBARREL_EXPL2
|
||||||
{SPR_BARX, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_TNTBARREL_EXPL4}, // S_TNTBARREL_EXPL3
|
{SPR_BARX, 1|FF_FULLBRIGHT, 2, {A_TNTExplode}, MT_TNTDUST, 0, S_TNTBARREL_EXPL4}, // S_TNTBARREL_EXPL3
|
||||||
{SPR_BARX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL5}, // S_TNTBARREL_EXPL4
|
{SPR_BARX, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_TNTBARREL_EXPL5}, // S_TNTBARREL_EXPL4
|
||||||
{SPR_BARX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL6}, // S_TNTBARREL_EXPL5
|
{SPR_BARX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL6}, // S_TNTBARREL_EXPL5
|
||||||
{SPR_NULL, 0, 35, {NULL}, 0, 0, S_NULL}, // S_TNTBARREL_EXPL6
|
{SPR_BARX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL7}, // S_TNTBARREL_EXPL6
|
||||||
|
{SPR_NULL, 0, 35, {NULL}, 0, 0, S_NULL}, // S_TNTBARREL_EXPL7
|
||||||
#ifndef ROTSPRITE
|
#ifndef ROTSPRITE
|
||||||
{SPR_BARR, 1|FF_ANIMATE, -1, {NULL}, 7, 2, S_NULL}, // S_TNTBARREL_FLYING
|
{SPR_BARR, 1|FF_ANIMATE, -1, {NULL}, 7, 2, S_NULL}, // S_TNTBARREL_FLYING
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -2503,6 +2503,7 @@ typedef enum state
|
||||||
S_TNTBARREL_EXPL4,
|
S_TNTBARREL_EXPL4,
|
||||||
S_TNTBARREL_EXPL5,
|
S_TNTBARREL_EXPL5,
|
||||||
S_TNTBARREL_EXPL6,
|
S_TNTBARREL_EXPL6,
|
||||||
|
S_TNTBARREL_EXPL7,
|
||||||
S_TNTBARREL_FLYING,
|
S_TNTBARREL_FLYING,
|
||||||
|
|
||||||
// TNT proximity shell
|
// TNT proximity shell
|
||||||
|
|
|
@ -624,14 +624,6 @@ static void GIF_framewrite(void)
|
||||||
//
|
//
|
||||||
INT32 GIF_open(const char *filename)
|
INT32 GIF_open(const char *filename)
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
if (rendermode != render_soft)
|
|
||||||
{
|
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("GIFs cannot be taken in non-software modes!\n"));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
gif_out = fopen(filename, "wb");
|
gif_out = fopen(filename, "wb");
|
||||||
if (!gif_out)
|
if (!gif_out)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -640,13 +632,13 @@ INT32 GIF_open(const char *filename)
|
||||||
gif_downscale = (!!cv_gif_downscale.value);
|
gif_downscale = (!!cv_gif_downscale.value);
|
||||||
|
|
||||||
// GIF color table
|
// GIF color table
|
||||||
// In hardware mode, uses the master palette
|
// In hardware mode, forces the local palette
|
||||||
gif_palette = ((cv_screenshot_colorprofile.value
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
&& (rendermode == render_soft)
|
if (rendermode == render_opengl)
|
||||||
|
gif_palette = pLocalPalette;
|
||||||
|
else
|
||||||
#endif
|
#endif
|
||||||
) ? pLocalPalette
|
gif_palette = ((cv_screenshot_colorprofile.value) ? pLocalPalette : pMasterPalette);
|
||||||
: pMasterPalette);
|
|
||||||
|
|
||||||
GIF_headwrite();
|
GIF_headwrite();
|
||||||
gif_frames = 0;
|
gif_frames = 0;
|
||||||
|
|
199
src/p_inter.c
199
src/p_inter.c
|
@ -1428,98 +1428,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
||||||
// Misc touchables //
|
// Misc touchables //
|
||||||
// *************** //
|
// *************** //
|
||||||
case MT_STARPOST:
|
case MT_STARPOST:
|
||||||
if (player->bot)
|
P_TouchStarPost(special, player, special->spawnpoint && (special->spawnpoint->options & MTF_OBJECTSPECIAL));
|
||||||
return;
|
|
||||||
// In circuit, player must have touched all previous starposts
|
|
||||||
if (circuitmap
|
|
||||||
&& special->health - player->starpostnum > 1)
|
|
||||||
{
|
|
||||||
// blatant reuse of a variable that's normally unused in circuit
|
|
||||||
if (!player->tossdelay)
|
|
||||||
S_StartSound(toucher, sfx_lose);
|
|
||||||
player->tossdelay = 3;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// We could technically have 91.1 Star Posts. 90 is cleaner.
|
|
||||||
if (special->health > 90)
|
|
||||||
{
|
|
||||||
CONS_Debug(DBG_GAMELOGIC, "Bad Starpost Number!\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (player->starpostnum >= special->health)
|
|
||||||
return; // Already hit this post
|
|
||||||
|
|
||||||
if (cv_coopstarposts.value && G_GametypeUsesCoopStarposts() && (netgame || multiplayer))
|
|
||||||
{
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
|
||||||
{
|
|
||||||
if (playeringame[i])
|
|
||||||
{
|
|
||||||
if (players[i].bot) // ignore dumb, stupid tails
|
|
||||||
continue;
|
|
||||||
|
|
||||||
players[i].starposttime = leveltime;
|
|
||||||
players[i].starpostx = player->mo->x>>FRACBITS;
|
|
||||||
players[i].starposty = player->mo->y>>FRACBITS;
|
|
||||||
players[i].starpostz = special->z>>FRACBITS;
|
|
||||||
players[i].starpostangle = special->angle;
|
|
||||||
players[i].starpostscale = player->mo->destscale;
|
|
||||||
if (special->flags2 & MF2_OBJECTFLIP)
|
|
||||||
{
|
|
||||||
players[i].starpostscale *= -1;
|
|
||||||
players[i].starpostz += special->height>>FRACBITS;
|
|
||||||
}
|
|
||||||
players[i].starpostnum = special->health;
|
|
||||||
|
|
||||||
if (cv_coopstarposts.value == 2 && (players[i].playerstate == PST_DEAD || players[i].spectator) && P_GetLives(&players[i]))
|
|
||||||
P_SpectatorJoinGame(&players[i]); //players[i].playerstate = PST_REBORN;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
S_StartSound(NULL, special->info->painsound);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Save the player's time and position.
|
|
||||||
player->starposttime = leveltime;
|
|
||||||
player->starpostx = toucher->x>>FRACBITS;
|
|
||||||
player->starposty = toucher->y>>FRACBITS;
|
|
||||||
player->starpostz = special->z>>FRACBITS;
|
|
||||||
player->starpostangle = special->angle;
|
|
||||||
player->starpostscale = player->mo->destscale;
|
|
||||||
if (special->flags2 & MF2_OBJECTFLIP)
|
|
||||||
{
|
|
||||||
player->starpostscale *= -1;
|
|
||||||
player->starpostz += special->height>>FRACBITS;
|
|
||||||
}
|
|
||||||
player->starpostnum = special->health;
|
|
||||||
S_StartSound(toucher, special->info->painsound);
|
|
||||||
}
|
|
||||||
|
|
||||||
P_ClearStarPost(special->health);
|
|
||||||
|
|
||||||
// Find all starposts in the level with this value - INCLUDING this one!
|
|
||||||
if (!(netgame && circuitmap && player != &players[consoleplayer]))
|
|
||||||
{
|
|
||||||
thinker_t *th;
|
|
||||||
mobj_t *mo2;
|
|
||||||
|
|
||||||
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
|
|
||||||
{
|
|
||||||
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
mo2 = (mobj_t *)th;
|
|
||||||
|
|
||||||
if (mo2->type != MT_STARPOST)
|
|
||||||
continue;
|
|
||||||
if (mo2->health != special->health)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
P_SetMobjState(mo2, mo2->info->painstate);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case MT_FAKEMOBILE:
|
case MT_FAKEMOBILE:
|
||||||
|
@ -1872,6 +1781,112 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
||||||
special->shadowscale = 0;
|
special->shadowscale = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Saves a player's level progress at a star post
|
||||||
|
*
|
||||||
|
* \param post The star post to trigger
|
||||||
|
* \param player The player that should receive the checkpoint
|
||||||
|
* \param snaptopost If true, the respawn point will use the star post's position, otherwise player x/y and star post z
|
||||||
|
*/
|
||||||
|
void P_TouchStarPost(mobj_t *post, player_t *player, boolean snaptopost)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
mobj_t *toucher = player->mo;
|
||||||
|
mobj_t *checkbase = snaptopost ? post : toucher;
|
||||||
|
|
||||||
|
if (player->bot)
|
||||||
|
return;
|
||||||
|
// In circuit, player must have touched all previous starposts
|
||||||
|
if (circuitmap
|
||||||
|
&& post->health - player->starpostnum > 1)
|
||||||
|
{
|
||||||
|
// blatant reuse of a variable that's normally unused in circuit
|
||||||
|
if (!player->tossdelay)
|
||||||
|
S_StartSound(toucher, sfx_lose);
|
||||||
|
player->tossdelay = 3;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// With the parameter + angle setup, we can go up to 1365 star posts. Who needs that many?
|
||||||
|
if (post->health > 1365)
|
||||||
|
{
|
||||||
|
CONS_Debug(DBG_GAMELOGIC, "Bad Starpost Number!\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (player->starpostnum >= post->health)
|
||||||
|
return; // Already hit this post
|
||||||
|
|
||||||
|
if (cv_coopstarposts.value && G_GametypeUsesCoopStarposts() && (netgame || multiplayer))
|
||||||
|
{
|
||||||
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
|
{
|
||||||
|
if (playeringame[i])
|
||||||
|
{
|
||||||
|
if (players[i].bot) // ignore dumb, stupid tails
|
||||||
|
continue;
|
||||||
|
|
||||||
|
players[i].starposttime = leveltime;
|
||||||
|
players[i].starpostx = checkbase->x>>FRACBITS;
|
||||||
|
players[i].starposty = checkbase->y>>FRACBITS;
|
||||||
|
players[i].starpostz = post->z>>FRACBITS;
|
||||||
|
players[i].starpostangle = post->angle;
|
||||||
|
players[i].starpostscale = player->mo->destscale;
|
||||||
|
if (post->flags2 & MF2_OBJECTFLIP)
|
||||||
|
{
|
||||||
|
players[i].starpostscale *= -1;
|
||||||
|
players[i].starpostz += post->height>>FRACBITS;
|
||||||
|
}
|
||||||
|
players[i].starpostnum = post->health;
|
||||||
|
|
||||||
|
if (cv_coopstarposts.value == 2 && (players[i].playerstate == PST_DEAD || players[i].spectator) && P_GetLives(&players[i]))
|
||||||
|
P_SpectatorJoinGame(&players[i]); //players[i].playerstate = PST_REBORN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
S_StartSound(NULL, post->info->painsound);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Save the player's time and position.
|
||||||
|
player->starposttime = leveltime;
|
||||||
|
player->starpostx = checkbase->x>>FRACBITS;
|
||||||
|
player->starposty = checkbase->y>>FRACBITS;
|
||||||
|
player->starpostz = post->z>>FRACBITS;
|
||||||
|
player->starpostangle = post->angle;
|
||||||
|
player->starpostscale = player->mo->destscale;
|
||||||
|
if (post->flags2 & MF2_OBJECTFLIP)
|
||||||
|
{
|
||||||
|
player->starpostscale *= -1;
|
||||||
|
player->starpostz += post->height>>FRACBITS;
|
||||||
|
}
|
||||||
|
player->starpostnum = post->health;
|
||||||
|
S_StartSound(toucher, post->info->painsound);
|
||||||
|
}
|
||||||
|
|
||||||
|
P_ClearStarPost(post->health);
|
||||||
|
|
||||||
|
// Find all starposts in the level with this value - INCLUDING this one!
|
||||||
|
if (!(netgame && circuitmap && player != &players[consoleplayer]))
|
||||||
|
{
|
||||||
|
thinker_t *th;
|
||||||
|
mobj_t *mo2;
|
||||||
|
|
||||||
|
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
|
||||||
|
{
|
||||||
|
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
mo2 = (mobj_t *)th;
|
||||||
|
|
||||||
|
if (mo2->type != MT_STARPOST)
|
||||||
|
continue;
|
||||||
|
if (mo2->health != post->health)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
P_SetMobjState(mo2, mo2->info->painstate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Prints death messages relating to a dying or hit player.
|
/** Prints death messages relating to a dying or hit player.
|
||||||
*
|
*
|
||||||
* \param player Affected player.
|
* \param player Affected player.
|
||||||
|
|
|
@ -486,6 +486,7 @@ void P_PlayerWeaponPanelOrAmmoBurst(player_t *player);
|
||||||
void P_PlayerEmeraldBurst(player_t *player, boolean toss);
|
void P_PlayerEmeraldBurst(player_t *player, boolean toss);
|
||||||
|
|
||||||
void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck);
|
void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck);
|
||||||
|
void P_TouchStarPost(mobj_t *starpost, player_t *player, boolean snaptopost);
|
||||||
void P_PlayerFlagBurst(player_t *player, boolean toss);
|
void P_PlayerFlagBurst(player_t *player, boolean toss);
|
||||||
void P_CheckTimeLimit(void);
|
void P_CheckTimeLimit(void);
|
||||||
void P_CheckPointLimit(void);
|
void P_CheckPointLimit(void);
|
||||||
|
|
15
src/p_mobj.c
15
src/p_mobj.c
|
@ -2350,6 +2350,7 @@ static void P_RingZMovement(mobj_t *mo)
|
||||||
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
||||||
{
|
{
|
||||||
mo->momz += mo->pmomz;
|
mo->momz += mo->pmomz;
|
||||||
|
mo->pmomz = 0;
|
||||||
mo->eflags &= ~MFE_APPLYPMOMZ;
|
mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
}
|
}
|
||||||
mo->z += mo->momz;
|
mo->z += mo->momz;
|
||||||
|
@ -2419,6 +2420,7 @@ static boolean P_ZMovement(mobj_t *mo)
|
||||||
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
||||||
{
|
{
|
||||||
mo->momz += mo->pmomz;
|
mo->momz += mo->pmomz;
|
||||||
|
mo->pmomz = 0;
|
||||||
mo->eflags &= ~MFE_APPLYPMOMZ;
|
mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
}
|
}
|
||||||
mo->z += mo->momz;
|
mo->z += mo->momz;
|
||||||
|
@ -2907,6 +2909,7 @@ static void P_PlayerZMovement(mobj_t *mo)
|
||||||
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
||||||
{
|
{
|
||||||
mo->momz += mo->pmomz;
|
mo->momz += mo->pmomz;
|
||||||
|
mo->pmomz = 0;
|
||||||
mo->eflags &= ~MFE_APPLYPMOMZ;
|
mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3157,6 +3160,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
|
||||||
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
|
||||||
{
|
{
|
||||||
mo->momz += mo->pmomz;
|
mo->momz += mo->pmomz;
|
||||||
|
mo->pmomz = 0;
|
||||||
mo->eflags &= ~MFE_APPLYPMOMZ;
|
mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
}
|
}
|
||||||
mo->z += mo->momz;
|
mo->z += mo->momz;
|
||||||
|
@ -12931,7 +12935,16 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
|
||||||
thinker_t* th;
|
thinker_t* th;
|
||||||
mobj_t* mo2;
|
mobj_t* mo2;
|
||||||
boolean foundanother = false;
|
boolean foundanother = false;
|
||||||
mobj->health = (mthing->angle/360) + 1;
|
|
||||||
|
if (mthing->extrainfo)
|
||||||
|
// Allow thing Parameter to define star post num too!
|
||||||
|
// For starposts above param 15 (the 16th), add 360 to the angle like before and start parameter from 1 (NOT 0)!
|
||||||
|
// So the 16th starpost is angle=0 param=15, the 17th would be angle=360 param=1.
|
||||||
|
// This seems more intuitive for mappers to use until UDMF is ready, since most SP maps won't have over 16 consecutive star posts.
|
||||||
|
mobj->health = mthing->extrainfo + (mthing->angle/360)*15 + 1;
|
||||||
|
else
|
||||||
|
// Old behavior if Parameter is 0; add 360 to the angle for each consecutive star post.
|
||||||
|
mobj->health = (mthing->angle/360) + 1;
|
||||||
|
|
||||||
// See if other starposts exist in this level that have the same value.
|
// See if other starposts exist in this level that have the same value.
|
||||||
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
|
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
|
||||||
|
|
|
@ -4692,7 +4692,7 @@ DoneSection2:
|
||||||
if (!post)
|
if (!post)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
P_TouchSpecialThing(post, player->mo, false);
|
P_TouchStarPost(post, player, false);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
17
src/p_user.c
17
src/p_user.c
|
@ -2380,6 +2380,8 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (player->charability == CA_GLIDEANDCLIMB && (player->mo->state-states == S_PLAY_GLIDE_LANDING))
|
||||||
|
;
|
||||||
else if (player->charability2 == CA2_GUNSLINGER && player->panim == PA_ABILITY2)
|
else if (player->charability2 == CA2_GUNSLINGER && player->panim == PA_ABILITY2)
|
||||||
;
|
;
|
||||||
else if (player->panim != PA_IDLE && player->panim != PA_WALK && player->panim != PA_RUN && player->panim != PA_DASH)
|
else if (player->panim != PA_IDLE && player->panim != PA_WALK && player->panim != PA_RUN && player->panim != PA_DASH)
|
||||||
|
@ -4537,16 +4539,14 @@ void P_DoJump(player_t *player, boolean soundandstate)
|
||||||
player->mo->z--;
|
player->mo->z--;
|
||||||
if (player->mo->pmomz < 0)
|
if (player->mo->pmomz < 0)
|
||||||
player->mo->momz += player->mo->pmomz; // Add the platform's momentum to your jump.
|
player->mo->momz += player->mo->pmomz; // Add the platform's momentum to your jump.
|
||||||
else
|
player->mo->pmomz = 0;
|
||||||
player->mo->pmomz = 0;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
player->mo->z++;
|
player->mo->z++;
|
||||||
if (player->mo->pmomz > 0)
|
if (player->mo->pmomz > 0)
|
||||||
player->mo->momz += player->mo->pmomz; // Add the platform's momentum to your jump.
|
player->mo->momz += player->mo->pmomz; // Add the platform's momentum to your jump.
|
||||||
else
|
player->mo->pmomz = 0;
|
||||||
player->mo->pmomz = 0;
|
|
||||||
}
|
}
|
||||||
player->mo->eflags &= ~MFE_APPLYPMOMZ;
|
player->mo->eflags &= ~MFE_APPLYPMOMZ;
|
||||||
|
|
||||||
|
@ -5503,10 +5503,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
|
||||||
; // Can't do anything if you're a fish out of water!
|
; // Can't do anything if you're a fish out of water!
|
||||||
else if (player->powers[pw_tailsfly]) // If currently flying, give an ascend boost.
|
else if (player->powers[pw_tailsfly]) // If currently flying, give an ascend boost.
|
||||||
{
|
{
|
||||||
if (!player->fly1)
|
player->fly1 = 20;
|
||||||
player->fly1 = 20;
|
|
||||||
else
|
|
||||||
player->fly1 = 2;
|
|
||||||
|
|
||||||
if (player->charability == CA_SWIM)
|
if (player->charability == CA_SWIM)
|
||||||
player->fly1 /= 2;
|
player->fly1 /= 2;
|
||||||
|
@ -8487,7 +8484,11 @@ static void P_MovePlayer(player_t *player)
|
||||||
// Descend
|
// Descend
|
||||||
if (cmd->buttons & BT_USE && !(player->pflags & PF_STASIS) && !player->exiting && !(player->mo->eflags & MFE_GOOWATER))
|
if (cmd->buttons & BT_USE && !(player->pflags & PF_STASIS) && !player->exiting && !(player->mo->eflags & MFE_GOOWATER))
|
||||||
if (P_MobjFlip(player->mo)*player->mo->momz > -FixedMul(5*actionspd, player->mo->scale))
|
if (P_MobjFlip(player->mo)*player->mo->momz > -FixedMul(5*actionspd, player->mo->scale))
|
||||||
|
{
|
||||||
|
if (player->fly1 > 2)
|
||||||
|
player->fly1 = 2;
|
||||||
P_SetObjectMomZ(player->mo, -actionspd/2, true);
|
P_SetObjectMomZ(player->mo, -actionspd/2, true);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
12
src/r_data.c
12
src/r_data.c
|
@ -2465,16 +2465,20 @@ extracolormap_t *R_AddColormaps(extracolormap_t *exc_augend, extracolormap_t *ex
|
||||||
|
|
||||||
// Thanks to quake2 source!
|
// Thanks to quake2 source!
|
||||||
// utils3/qdata/images.c
|
// utils3/qdata/images.c
|
||||||
UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b)
|
UINT8 NearestPaletteColor(UINT8 r, UINT8 g, UINT8 b, RGBA_t *palette)
|
||||||
{
|
{
|
||||||
int dr, dg, db;
|
int dr, dg, db;
|
||||||
int distortion, bestdistortion = 256 * 256 * 4, bestcolor = 0, i;
|
int distortion, bestdistortion = 256 * 256 * 4, bestcolor = 0, i;
|
||||||
|
|
||||||
|
// Use master palette if none specified
|
||||||
|
if (palette == NULL)
|
||||||
|
palette = pMasterPalette;
|
||||||
|
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
{
|
{
|
||||||
dr = r - pMasterPalette[i].s.red;
|
dr = r - palette[i].s.red;
|
||||||
dg = g - pMasterPalette[i].s.green;
|
dg = g - palette[i].s.green;
|
||||||
db = b - pMasterPalette[i].s.blue;
|
db = b - palette[i].s.blue;
|
||||||
distortion = dr*dr + dg*dg + db*db;
|
distortion = dr*dr + dg*dg + db*db;
|
||||||
if (distortion < bestdistortion)
|
if (distortion < bestdistortion)
|
||||||
{
|
{
|
||||||
|
|
|
@ -171,7 +171,8 @@ const char *R_NameForColormap(extracolormap_t *extra_colormap);
|
||||||
#define R_PutRgbaRGB(r, g, b) (R_PutRgbaR(r) + R_PutRgbaG(g) + R_PutRgbaB(b))
|
#define R_PutRgbaRGB(r, g, b) (R_PutRgbaR(r) + R_PutRgbaG(g) + R_PutRgbaB(b))
|
||||||
#define R_PutRgbaRGBA(r, g, b, a) (R_PutRgbaRGB(r, g, b) + R_PutRgbaA(a))
|
#define R_PutRgbaRGBA(r, g, b, a) (R_PutRgbaRGB(r, g, b) + R_PutRgbaA(a))
|
||||||
|
|
||||||
UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
|
UINT8 NearestPaletteColor(UINT8 r, UINT8 g, UINT8 b, RGBA_t *palette);
|
||||||
|
#define NearestColor(r, g, b) NearestPaletteColor(r, g, b, NULL)
|
||||||
|
|
||||||
extern INT32 numtextures;
|
extern INT32 numtextures;
|
||||||
|
|
||||||
|
|
|
@ -1196,7 +1196,7 @@ void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, sp
|
||||||
INT32 angle;
|
INT32 angle;
|
||||||
patch_t *patch;
|
patch_t *patch;
|
||||||
patch_t *newpatch;
|
patch_t *newpatch;
|
||||||
UINT16 *rawsrc, *rawdst;
|
UINT16 *rawdst;
|
||||||
size_t size;
|
size_t size;
|
||||||
INT32 bflip = (flip != 0x00);
|
INT32 bflip = (flip != 0x00);
|
||||||
|
|
||||||
|
@ -1242,16 +1242,6 @@ void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, sp
|
||||||
leftoffset = width - leftoffset;
|
leftoffset = width - leftoffset;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw the sprite to a temporary buffer.
|
|
||||||
size = (width*height);
|
|
||||||
rawsrc = Z_Malloc(size * sizeof(UINT16), PU_STATIC, NULL);
|
|
||||||
|
|
||||||
// can't memset here
|
|
||||||
for (i = 0; i < size; i++)
|
|
||||||
rawsrc[i] = 0xFF00;
|
|
||||||
|
|
||||||
R_PatchToMaskedFlat(patch, rawsrc, bflip);
|
|
||||||
|
|
||||||
// Don't cache angle = 0
|
// Don't cache angle = 0
|
||||||
for (angle = 1; angle < ROTANGLES; angle++)
|
for (angle = 1; angle < ROTANGLES; angle++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -360,10 +360,13 @@ void SCR_Recalc(void)
|
||||||
vid.fsmalldupy = vid.smalldupy*FRACUNIT;
|
vid.fsmalldupy = vid.smalldupy*FRACUNIT;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// toggle off automap because some screensize-dependent values will
|
// toggle off (then back on) the automap because some screensize-dependent values will
|
||||||
// be calculated next time the automap is activated.
|
// be calculated next time the automap is activated.
|
||||||
if (automapactive)
|
if (automapactive)
|
||||||
AM_Stop();
|
{
|
||||||
|
am_recalc = true;
|
||||||
|
AM_Start();
|
||||||
|
}
|
||||||
|
|
||||||
// set the screen[x] ptrs on the new vidbuffers
|
// set the screen[x] ptrs on the new vidbuffers
|
||||||
V_Init();
|
V_Init();
|
||||||
|
|
|
@ -3244,7 +3244,6 @@ Unoptimized version
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Taken from my videos-in-SRB2 project
|
|
||||||
// Generates a color look-up table
|
// Generates a color look-up table
|
||||||
// which has up to 64 colors at each channel
|
// which has up to 64 colors at each channel
|
||||||
// (see the defines in v_video.h)
|
// (see the defines in v_video.h)
|
||||||
|
@ -3261,7 +3260,7 @@ void InitColorLUT(RGBA_t *palette)
|
||||||
for (r = 0; r < CLUTSIZE; r++)
|
for (r = 0; r < CLUTSIZE; r++)
|
||||||
for (g = 0; g < CLUTSIZE; g++)
|
for (g = 0; g < CLUTSIZE; g++)
|
||||||
for (b = 0; b < CLUTSIZE; b++)
|
for (b = 0; b < CLUTSIZE; b++)
|
||||||
colorlookup[r][g][b] = NearestColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS);
|
colorlookup[r][g][b] = NearestPaletteColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS, palette);
|
||||||
clutinit = true;
|
clutinit = true;
|
||||||
lastpalette = palette;
|
lastpalette = palette;
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,10 +37,7 @@ cv_allcaps;
|
||||||
// Allocates buffer screens, call before R_Init.
|
// Allocates buffer screens, call before R_Init.
|
||||||
void V_Init(void);
|
void V_Init(void);
|
||||||
|
|
||||||
// Taken from my videos-in-SRB2 project
|
// Color look-up table
|
||||||
// Generates a color look-up table
|
|
||||||
// which has up to 64 colors at each channel
|
|
||||||
|
|
||||||
#define COLORBITS 6
|
#define COLORBITS 6
|
||||||
#define SHIFTCOLORBITS (8-COLORBITS)
|
#define SHIFTCOLORBITS (8-COLORBITS)
|
||||||
#define CLUTSIZE (1<<COLORBITS)
|
#define CLUTSIZE (1<<COLORBITS)
|
||||||
|
|
16
src/w_wad.c
16
src/w_wad.c
|
@ -822,13 +822,11 @@ UINT16 W_InitFile(const char *filename, boolean mainfile)
|
||||||
* backwards, so a later file overrides all earlier ones.
|
* backwards, so a later file overrides all earlier ones.
|
||||||
*
|
*
|
||||||
* \param filenames A null-terminated list of files to use.
|
* \param filenames A null-terminated list of files to use.
|
||||||
* \return 1 if all files were loaded, 0 if at least one was missing or
|
* \return 1 if base files were loaded, 0 if at least one was missing or
|
||||||
* invalid.
|
* invalid.
|
||||||
*/
|
*/
|
||||||
INT32 W_InitMultipleFiles(char **filenames, UINT16 mainfiles)
|
INT32 W_InitMultipleFiles(char **filenames, UINT16 mainfiles)
|
||||||
{
|
{
|
||||||
INT32 rc = 1;
|
|
||||||
|
|
||||||
// open all the files, load headers, and count lumps
|
// open all the files, load headers, and count lumps
|
||||||
numwadfiles = 0;
|
numwadfiles = 0;
|
||||||
|
|
||||||
|
@ -836,13 +834,15 @@ INT32 W_InitMultipleFiles(char **filenames, UINT16 mainfiles)
|
||||||
for (; *filenames; filenames++)
|
for (; *filenames; filenames++)
|
||||||
{
|
{
|
||||||
//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
|
//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
|
||||||
rc &= (W_InitFile(*filenames, numwadfiles < mainfiles) != INT16_MAX) ? 1 : 0;
|
if (W_InitFile(*filenames, numwadfiles < mainfiles) == INT16_MAX)
|
||||||
|
{
|
||||||
|
CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), *filenames);
|
||||||
|
if (numwadfiles < mainfiles)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!numwadfiles)
|
return 1;
|
||||||
I_Error("W_InitMultipleFiles: no files found");
|
|
||||||
|
|
||||||
return rc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Make sure a lump number is valid.
|
/** Make sure a lump number is valid.
|
||||||
|
|
19
src/z_zone.c
19
src/z_zone.c
|
@ -232,12 +232,12 @@ void Z_Free(void *ptr)
|
||||||
|
|
||||||
// Free the memory and get rid of the block.
|
// Free the memory and get rid of the block.
|
||||||
free(block->real);
|
free(block->real);
|
||||||
block->prev->next = block->next;
|
|
||||||
block->next->prev = block->prev;
|
|
||||||
free(block);
|
|
||||||
#ifdef VALGRIND_DESTROY_MEMPOOL
|
#ifdef VALGRIND_DESTROY_MEMPOOL
|
||||||
VALGRIND_DESTROY_MEMPOOL(block);
|
VALGRIND_DESTROY_MEMPOOL(block);
|
||||||
#endif
|
#endif
|
||||||
|
block->prev->next = block->next;
|
||||||
|
block->next->prev = block->prev;
|
||||||
|
free(block);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** malloc() that doesn't accept failure.
|
/** malloc() that doesn't accept failure.
|
||||||
|
@ -317,13 +317,9 @@ void *Z_MallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits)
|
||||||
// The mem header lives 'sizeof (memhdr_t)' bytes before given.
|
// The mem header lives 'sizeof (memhdr_t)' bytes before given.
|
||||||
hdr = (memhdr_t *)((UINT8 *)given - sizeof *hdr);
|
hdr = (memhdr_t *)((UINT8 *)given - sizeof *hdr);
|
||||||
|
|
||||||
#ifdef VALGRIND_CREATE_MEMPOOL
|
#ifdef HAVE_VALGRIND
|
||||||
VALGRIND_CREATE_MEMPOOL(block, padsize, Z_calloc);
|
|
||||||
Z_calloc = false;
|
Z_calloc = false;
|
||||||
#endif
|
#endif
|
||||||
#ifdef VALGRIND_MEMPOOL_ALLOC
|
|
||||||
VALGRIND_MEMPOOL_ALLOC(block, hdr, size + sizeof *hdr);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
block->next = head.next;
|
block->next = head.next;
|
||||||
block->prev = &head;
|
block->prev = &head;
|
||||||
|
@ -341,6 +337,13 @@ void *Z_MallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits)
|
||||||
block->size = blocksize;
|
block->size = blocksize;
|
||||||
block->realsize = size;
|
block->realsize = size;
|
||||||
|
|
||||||
|
#ifdef VALGRIND_CREATE_MEMPOOL
|
||||||
|
VALGRIND_CREATE_MEMPOOL(block, padsize, Z_calloc);
|
||||||
|
#endif
|
||||||
|
//#ifdef VALGRIND_MEMPOOL_ALLOC
|
||||||
|
// VALGRIND_MEMPOOL_ALLOC(block, hdr, size + sizeof *hdr);
|
||||||
|
//#endif
|
||||||
|
|
||||||
hdr->id = ZONEID;
|
hdr->id = ZONEID;
|
||||||
hdr->block = block;
|
hdr->block = block;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue