mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-15 17:01:51 +00:00
Define a macro LUNATIC_EXTERN that expands to 'static' in non-Lunatic builds.
git-svn-id: https://svn.eduke32.com/eduke32@3645 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
203bd1e9e9
commit
edcef5c3ec
5 changed files with 10 additions and 11 deletions
|
@ -599,8 +599,7 @@ void A_DoGutsDir(int32_t sp, int32_t gtype, int32_t n)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOTE: external linkage for Lunatic
|
LUNATIC_EXTERN int32_t G_ToggleWallInterpolation(int32_t w, int32_t doset)
|
||||||
int32_t G_ToggleWallInterpolation(int32_t w, int32_t doset)
|
|
||||||
{
|
{
|
||||||
if (doset)
|
if (doset)
|
||||||
{
|
{
|
||||||
|
|
|
@ -134,6 +134,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#ifdef LUNATIC
|
#ifdef LUNATIC
|
||||||
# include "lunatic_game.h"
|
# include "lunatic_game.h"
|
||||||
|
# define LUNATIC_EXTERN
|
||||||
|
#else
|
||||||
|
# define LUNATIC_EXTERN static
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static inline int32_t G_HaveEvent(int32_t iEventID)
|
static inline int32_t G_HaveEvent(int32_t iEventID)
|
||||||
|
|
|
@ -716,9 +716,9 @@ int32_t A_CheckInventorySprite(spritetype *s)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MYOS* CON commands. NOTE: external linkage for Lunatic.
|
// MYOS* CON commands.
|
||||||
void G_DrawTileGeneric(int32_t x, int32_t y, int32_t zoom, int32_t tilenum,
|
LUNATIC_EXTERN 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 shade, int32_t orientation, int32_t p)
|
||||||
{
|
{
|
||||||
int32_t a = 0;
|
int32_t a = 0;
|
||||||
|
|
||||||
|
|
|
@ -2215,8 +2215,7 @@ void C_DefineGameFuncName(int32_t idx, const char *name)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// NOTE: external linkage for Lunatic
|
LUNATIC_EXTERN int32_t C_SetDefName(const char *name)
|
||||||
int32_t C_SetDefName(const char *name)
|
|
||||||
{
|
{
|
||||||
clearDefNamePtr();
|
clearDefNamePtr();
|
||||||
g_defNamePtr = dup_filename(name);
|
g_defNamePtr = dup_filename(name);
|
||||||
|
@ -2225,8 +2224,7 @@ int32_t C_SetDefName(const char *name)
|
||||||
return (g_defNamePtr==NULL);
|
return (g_defNamePtr==NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOTE: external linkage for Lunatic
|
LUNATIC_EXTERN void C_DefineProjectile(int32_t j, int32_t what, int32_t val)
|
||||||
void C_DefineProjectile(int32_t j, int32_t what, int32_t val)
|
|
||||||
{
|
{
|
||||||
switch (what)
|
switch (what)
|
||||||
{
|
{
|
||||||
|
|
|
@ -43,8 +43,7 @@ struct dynitem
|
||||||
const int16_t staticval;
|
const int16_t staticval;
|
||||||
};
|
};
|
||||||
|
|
||||||
// NOTE: external linkage for Lunatic
|
LUNATIC_EXTERN struct dynitem g_dynTileList[] =
|
||||||
struct dynitem g_dynTileList[] =
|
|
||||||
{
|
{
|
||||||
{ "SECTOREFFECTOR", DVPTR(SECTOREFFECTOR), SECTOREFFECTOR__STATIC },
|
{ "SECTOREFFECTOR", DVPTR(SECTOREFFECTOR), SECTOREFFECTOR__STATIC },
|
||||||
{ "ACTIVATOR", DVPTR(ACTIVATOR), ACTIVATOR__STATIC },
|
{ "ACTIVATOR", DVPTR(ACTIVATOR), ACTIVATOR__STATIC },
|
||||||
|
|
Loading…
Reference in a new issue