zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 21:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use static instead of LUNATIC_EXTERN

Browse source 
# Conflicts:
#	source/build/include/build.h
#	source/duke3d/src/gamedef.cpp
This commit is contained in:
NY00123 2020-05-17 21:51:20 +03:00 committed by Christoph Oelckers
parent 6a70389f1d
commit ec11d22caf
6 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,6 @@ enum rendmode_t {
# define M32_FIXME_WALLS 512 # define M32_FIXME_WALLS 512
# define M32_FIXME_SECTORS 2 # define M32_FIXME_SECTORS 2
# define LUNATIC_EXTERN static
#define MAXWALLSB ((MAXWALLS>>2)+(MAXWALLS>>3)) #define MAXWALLSB ((MAXWALLS>>2)+(MAXWALLS>>3))

2
source/duke3d/src/actors.cpp
View file

@ -844,7 +844,7 @@ void A_DoGutsDir(int spriteNum, int tileNum, int spawnCnt)
} }
#endif #endif
LUNATIC_EXTERN int32_t G_ToggleWallInterpolation(int32_t wallNum, int32_t setInterpolation) static int32_t G_ToggleWallInterpolation(int32_t wallNum, int32_t setInterpolation)
{ {
if (setInterpolation) if (setInterpolation)
{ {

2
source/duke3d/src/gamedef.cpp
View file

@ -2119,7 +2119,7 @@ void C_FreeProjectile(int32_t j)
} }
LUNATIC_EXTERN void C_DefineProjectile(int32_t j, int32_t what, int32_t val) static void C_DefineProjectile(int32_t j, int32_t what, int32_t val)
{ {
if (g_tile[j].proj == NULL) if (g_tile[j].proj == NULL)
{ {

2
source/duke3d/src/gameexec.cpp
View file

@ -1132,7 +1132,7 @@ static int G_StartTrackSlotWrap(int const volumeNum, int const levelNum)
return 0; return 0;
} }
LUNATIC_EXTERN void G_ShowView(vec3_t vec, fix16_t a, fix16_t horiz, int sect, int ix1, int iy1, int ix2, int iy2, int unbiasedp) static void G_ShowView(vec3_t vec, fix16_t a, fix16_t horiz, int sect, int ix1, int iy1, int ix2, int iy2, int unbiasedp)
{ {
int x1 = min(ix1, ix2); int x1 = min(ix1, ix2);
int x2 = max(ix1, ix2); int x2 = max(ix1, ix2);

2
source/duke3d/src/namesdyn.cpp
View file

@ -42,7 +42,7 @@ struct dynitem
const int16_t staticval; const int16_t staticval;
}; };
LUNATIC_EXTERN struct dynitem g_dynTileList[] = static struct dynitem g_dynTileList[] =
{ {
{ "ACCESS_ICON", DVPTR(ACCESS_ICON), ACCESS_ICON__STATIC }, { "ACCESS_ICON", DVPTR(ACCESS_ICON), ACCESS_ICON__STATIC },
{ "ACCESSCARD", DVPTR(ACCESSCARD), ACCESSCARD__STATIC }, { "ACCESSCARD", DVPTR(ACCESSCARD), ACCESSCARD__STATIC },

2
source/duke3d/src/soundsdyn.cpp
View file

@ -47,7 +47,7 @@ struct dynitem
const int16_t staticval; const int16_t staticval;
}; };
LUNATIC_EXTERN struct dynitem g_dynSoundList[] = static struct dynitem g_dynSoundList[] =
{ {
{ "ALIEN_SWITCH1", DVPTR(ALIEN_SWITCH1), ALIEN_SWITCH1__STATIC }, { "ALIEN_SWITCH1", DVPTR(ALIEN_SWITCH1), ALIEN_SWITCH1__STATIC },
{ "BIGBANG", DVPTR(BIGBANG), BIGBANG__STATIC }, { "BIGBANG", DVPTR(BIGBANG), BIGBANG__STATIC },