diff --git a/source/build/include/build.h b/source/build/include/build.h index cb5423b70..40e33ceb4 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -69,7 +69,6 @@ enum rendmode_t { # define M32_FIXME_WALLS 512 # define M32_FIXME_SECTORS 2 -# define LUNATIC_EXTERN static #define MAXWALLSB ((MAXWALLS>>2)+(MAXWALLS>>3)) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index 7c65c4939..9e730d051 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -844,7 +844,7 @@ void A_DoGutsDir(int spriteNum, int tileNum, int spawnCnt) } #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) { diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index a38ad2974..ec12539aa 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -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) { diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp index f3944a572..1a534a5f1 100644 --- a/source/duke3d/src/gameexec.cpp +++ b/source/duke3d/src/gameexec.cpp @@ -1132,7 +1132,7 @@ static int G_StartTrackSlotWrap(int const volumeNum, int const levelNum) 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 x2 = max(ix1, ix2); diff --git a/source/duke3d/src/namesdyn.cpp b/source/duke3d/src/namesdyn.cpp index 65d933ea2..7bfe19896 100644 --- a/source/duke3d/src/namesdyn.cpp +++ b/source/duke3d/src/namesdyn.cpp @@ -42,7 +42,7 @@ struct dynitem const int16_t staticval; }; -LUNATIC_EXTERN struct dynitem g_dynTileList[] = +static struct dynitem g_dynTileList[] = { { "ACCESS_ICON", DVPTR(ACCESS_ICON), ACCESS_ICON__STATIC }, { "ACCESSCARD", DVPTR(ACCESSCARD), ACCESSCARD__STATIC }, diff --git a/source/duke3d/src/soundsdyn.cpp b/source/duke3d/src/soundsdyn.cpp index c327c7d58..3022ec352 100644 --- a/source/duke3d/src/soundsdyn.cpp +++ b/source/duke3d/src/soundsdyn.cpp @@ -47,7 +47,7 @@ struct dynitem const int16_t staticval; }; -LUNATIC_EXTERN struct dynitem g_dynSoundList[] = +static struct dynitem g_dynSoundList[] = { { "ALIEN_SWITCH1", DVPTR(ALIEN_SWITCH1), ALIEN_SWITCH1__STATIC }, { "BIGBANG", DVPTR(BIGBANG), BIGBANG__STATIC },