diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index acf1d1fb60b27be3b77ccce618b1a14885e7afa9..8b87672bf70c1384f0dd62bb1c4646a780d8b2c1 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1627,6 +1627,7 @@ static void CL_LoadReceivedSavegame(void)
paused = false;
demoplayback = false;
+ titlemapinaction = TITLEMAP_OFF;
titledemo = false;
automapactive = false;
diff --git a/src/d_main.c b/src/d_main.c
index 8a7c446bbec9b2c1ff8bb020a0f64e75ca9edcec..15d3c80411e42c416d52655b7b526cb82e1cfc70 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1045,10 +1045,8 @@ void D_SRB2Main(void)
I_OutputMsg("setvbuf didnt work\n");
#endif
-#ifdef GETTEXT
// initialise locale code
M_StartupLocale();
-#endif
// get parameters from a response file (eg: srb2 @parms.txt)
M_FindResponseFile();
diff --git a/src/doomdef.h b/src/doomdef.h
index 0a98c874aa5eb63ace8d9e04021df642d7790f80..4965a904a0ba10eed976252f1a75fdd1ecc3c161 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -98,8 +98,8 @@
#ifdef GETTEXT
#include <libintl.h>
-#include <locale.h>
#endif
+#include <locale.h> // locale should not be dependent on GETTEXT -- 11/01/20 Monster Iestyn
#include <sys/types.h>
#include <sys/stat.h>
@@ -454,12 +454,12 @@ char savegamename[256];
// m_misc.h
#ifdef GETTEXT
#define M_GetText(String) gettext(String)
-void M_StartupLocale(void);
#else
// If no translations are to be used, make a stub
// M_GetText function that just returns the string.
#define M_GetText(x) (x)
#endif
+void M_StartupLocale(void);
extern void *(*M_Memcpy)(void* dest, const void* src, size_t n) FUNCNONNULL;
char *va(const char *format, ...) FUNCPRINTF;
char *M_GetToken(const char *inputString);
diff --git a/src/m_menu.c b/src/m_menu.c
index 3305519c314ae4136a2cbd5ce9192da8c7882bc3..ec4e51c9c9bfe35168d5a466ad2ae04c20f606ea 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1446,8 +1446,9 @@ static menuitem_t OP_SoundOptionsMenu[] =
{IT_HEADER, NULL, "Miscellaneous", NULL, 102},
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 114},
{IT_STRING | IT_CVAR, NULL, "Reset Music Upon Dying", &cv_resetmusic, 124},
+ {IT_STRING | IT_CVAR, NULL, "Default 1-Up sound", &cv_1upsound, 134},
- {IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 144},
+ {IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 154},
};
#ifdef HAVE_OPENMPT
diff --git a/src/m_misc.c b/src/m_misc.c
index a5091c257294fea8b84ca5b5d19f4586de9cbf87..0babd0abe94ec8e2a2dbe4b37ec38c9e3188c012 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1594,16 +1594,19 @@ boolean M_ScreenshotResponder(event_t *ev)
// M_StartupLocale.
// Sets up gettext to translate SRB2's strings.
#ifdef GETTEXT
-#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
-#define GETTEXTDOMAIN1 "/usr/share/locale"
-#define GETTEXTDOMAIN2 "/usr/local/share/locale"
-#elif defined (_WIN32)
-#define GETTEXTDOMAIN1 "."
-#endif
+ #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+ #define GETTEXTDOMAIN1 "/usr/share/locale"
+ #define GETTEXTDOMAIN2 "/usr/local/share/locale"
+ #elif defined (_WIN32)
+ #define GETTEXTDOMAIN1 "."
+ #endif
+#endif // GETTEXT
void M_StartupLocale(void)
{
+#ifdef GETTEXT
char *textdomhandle = NULL;
+#endif //GETTEXT
CONS_Printf("M_StartupLocale...\n");
@@ -1612,6 +1615,7 @@ void M_StartupLocale(void)
// Do not set numeric locale as that affects atof
setlocale(LC_NUMERIC, "C");
+#ifdef GETTEXT
// FIXME: global name define anywhere?
#ifdef GETTEXTDOMAIN1
textdomhandle = bindtextdomain("srb2", GETTEXTDOMAIN1);
@@ -1632,8 +1636,8 @@ void M_StartupLocale(void)
textdomain("srb2");
else
CONS_Printf("Could not find locale text domain!\n");
+#endif //GETTEXT
}
-#endif
// ==========================================================================
// MISC STRING FUNCTIONS
diff --git a/src/p_user.c b/src/p_user.c
index 0c4d25554ece955bd5d7ab059b04b6c2682a6ea3..ef1517644014c3fe4bb484b2f0d19823aa1f9b39 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1466,6 +1466,13 @@ void P_PlayLivesJingle(player_t *player)
S_StartSound(NULL, sfx_oneup);
else if (mariomode)
S_StartSound(NULL, sfx_marioa);
+ else if (cv_1upsound.value)
+ {
+ if (S_sfx[sfx_oneup].lumpnum != LUMPERROR)
+ S_StartSound(NULL, sfx_oneup);
+ else
+ S_StartSound(NULL, sfx_chchng);/* at least play something! */
+ }
else
{
P_PlayJingle(player, JT_1UP);
diff --git a/src/r_data.c b/src/r_data.c
index db18a8833ab8eaa186605593ab62fee5cb7fa56a..8718166720b627dd2ec85adeec65f14cba67739e 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -699,174 +699,152 @@ void R_FlushTextureCache(void)
int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum);
void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *index);
-//
-// R_LoadTextures
-// Initializes the texture list with the textures from the world map.
-//
-#define TX_START "TX_START"
-#define TX_END "TX_END"
-void R_LoadTextures(void)
+#ifdef WALLFLATS
+static INT32
+Rloadflats (INT32 i, INT32 w)
{
- INT32 i, w;
UINT16 j;
- UINT16 texstart, texend, texturesLumpPos;
- patch_t *patchlump;
- texpatch_t *patch;
+ UINT16 texstart, texend;
texture_t *texture;
+ texpatch_t *patch;
- // Free previous memory before numtextures change.
- if (numtextures)
+ // Yes
+ if (wadfiles[w]->type == RET_PK3)
{
- for (i = 0; i < numtextures; i++)
- {
- Z_Free(textures[i]);
- Z_Free(texturecache[i]);
- }
- Z_Free(texturetranslation);
- Z_Free(textures);
- Z_Free(texflats);
+ texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
+ texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart);
+ }
+ else
+ {
+ texstart = W_CheckNumForNamePwad("F_START", (UINT16)w, 0);
+ texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
}
- // Load patches and textures.
-
- // Get the number of textures to check.
- // NOTE: Make SURE the system does not process
- // the markers.
- // This system will allocate memory for all duplicate/patched textures even if it never uses them,
- // but the alternative is to spend a ton of time checking and re-checking all previous entries just to skip any potentially patched textures.
- for (w = 0, numtextures = 0; w < numwadfiles; w++)
+ if (!( texstart == INT16_MAX || texend == INT16_MAX ))
{
- // Count the textures from TEXTURES lumps
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
- while (texturesLumpPos != INT16_MAX)
- {
- numtextures += R_CountTexturesInTEXTURESLump((UINT16)w, (UINT16)texturesLumpPos);
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
- }
+ texstart++; // Do not count the first marker
- // Count single-patch textures
- if (wadfiles[w]->type == RET_PK3)
- {
- texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
- texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
- }
- else
+ // Work through each lump between the markers in the WAD.
+ for (j = 0; j < (texend - texstart); j++)
{
- texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
- texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
- }
+ UINT8 *flatlump;
+ UINT16 wadnum = (UINT16)w;
+ lumpnum_t lumpnum = texstart + j;
+ size_t lumplength;
+ size_t flatsize = 0;
- if (texstart == INT16_MAX || texend == INT16_MAX)
-#ifdef WALLFLATS
- goto countflats;
-#else
- continue;
-#endif
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
+ continue; // If it is then SKIP IT
+ }
- texstart++; // Do not count the first marker
+ flatlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
+ lumplength = W_LumpLengthPwad(wadnum, lumpnum);
- // PK3s have subfolders, so we can't just make a simple sum
- if (wadfiles[w]->type == RET_PK3)
- {
- for (j = texstart; j < texend; j++)
+ switch (lumplength)
{
- if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
- numtextures++;
+ case 4194304: // 2048x2048 lump
+ flatsize = 2048;
+ break;
+ case 1048576: // 1024x1024 lump
+ flatsize = 1024;
+ break;
+ case 262144:// 512x512 lump
+ flatsize = 512;
+ break;
+ case 65536: // 256x256 lump
+ flatsize = 256;
+ break;
+ case 16384: // 128x128 lump
+ flatsize = 128;
+ break;
+ case 1024: // 32x32 lump
+ flatsize = 32;
+ break;
+ default: // 64x64 lump
+ flatsize = 64;
+ break;
}
- }
- else // Add all the textures between TX_START and TX_END
- {
- numtextures += (UINT32)(texend - texstart);
- }
-
-#ifdef WALLFLATS
-countflats:
- // Count flats
- if (wadfiles[w]->type == RET_PK3)
- {
- texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
- texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart);
- }
- else
- {
- texstart = W_CheckNumForNamePwad("F_START", (UINT16)w, 0);
- texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
- }
- if (texstart == INT16_MAX || texend == INT16_MAX)
- continue;
+ //CONS_Printf("\n\"%s\" is a flat, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),flatsize,flatsize);
+ texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
- texstart++; // Do not count the first marker
+ // Set texture properties.
+ M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
- // PK3s have subfolders, so we can't just make a simple sum
- if (wadfiles[w]->type == RET_PK3)
- {
- for (j = texstart; j < texend; j++)
+#ifndef NO_PNG_LUMPS
+ if (R_IsLumpPNG((UINT8 *)flatlump, lumplength))
{
- if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
- numtextures++;
+ INT16 width, height;
+ R_PNGDimensions((UINT8 *)flatlump, &width, &height, lumplength);
+ texture->width = width;
+ texture->height = height;
}
- }
- else // Add all the textures between F_START and F_END
- {
- numtextures += (UINT32)(texend - texstart);
- }
+ else
#endif
- }
+ texture->width = texture->height = flatsize;
- // If no textures found by this point, bomb out
- if (!numtextures)
- I_Error("No textures detected in any WADs!\n");
+ texture->type = TEXTURETYPE_FLAT;
+ texture->patchcount = 1;
+ texture->holes = false;
+ texture->flip = 0;
- // Allocate memory and initialize to 0 for all the textures we are initialising.
- // There are actually 5 buffers allocated in one for convenience.
- textures = Z_Calloc((numtextures * sizeof(void *)) * 5, PU_STATIC, NULL);
- texflats = Z_Calloc((numtextures * sizeof(*texflats)), PU_STATIC, NULL);
+ // Allocate information for the texture's patches.
+ patch = &texture->patches[0];
- // Allocate texture column offset table.
- texturecolumnofs = (void *)((UINT8 *)textures + (numtextures * sizeof(void *)));
- // Allocate texture referencing cache.
- texturecache = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 2));
- // Allocate texture width table.
- texturewidth = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 3));
- // Allocate texture height table.
- textureheight = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 4));
- // Create translation table for global animation.
- texturetranslation = Z_Malloc((numtextures + 1) * sizeof(*texturetranslation), PU_STATIC, NULL);
+ patch->originx = patch->originy = 0;
+ patch->wad = (UINT16)w;
+ patch->lump = texstart + j;
+ patch->flip = 0;
- for (i = 0; i < numtextures; i++)
- texturetranslation[i] = i;
+ Z_Unlock(flatlump);
- for (i = 0, w = 0; w < numwadfiles; w++)
- {
- // Get the lump numbers for the markers in the WAD, if they exist.
- if (wadfiles[w]->type == RET_PK3)
- {
- texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
- texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
- while (texturesLumpPos != INT16_MAX)
- {
- R_ParseTEXTURESLump(w, texturesLumpPos, &i);
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
- }
+ texturewidth[i] = texture->width;
+ textureheight[i] = texture->height << FRACBITS;
+ i++;
}
- else
+ }
+
+ return i;
+}
+#endif/*WALLFLATS*/
+
+#define TX_START "TX_START"
+#define TX_END "TX_END"
+
+static INT32
+Rloadtextures (INT32 i, INT32 w)
+{
+ UINT16 j;
+ UINT16 texstart, texend, texturesLumpPos;
+ texture_t *texture;
+ patch_t *patchlump;
+ texpatch_t *patch;
+
+ // Get the lump numbers for the markers in the WAD, if they exist.
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
+ texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
+ while (texturesLumpPos != INT16_MAX)
{
- texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
- texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
- if (texturesLumpPos != INT16_MAX)
- R_ParseTEXTURESLump(w, texturesLumpPos, &i);
+ R_ParseTEXTURESLump(w, texturesLumpPos, &i);
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
}
+ }
+ else
+ {
+ texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
+ texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
+ if (texturesLumpPos != INT16_MAX)
+ R_ParseTEXTURESLump(w, texturesLumpPos, &i);
+ }
- if (texstart == INT16_MAX || texend == INT16_MAX)
-#ifdef WALLFLATS
- goto checkflats;
-#else
- continue;
-#endif
-
+ if (!( texstart == INT16_MAX || texend == INT16_MAX ))
+ {
texstart++; // Do not count the first marker
// Work through each lump between the markers in the WAD.
@@ -929,10 +907,45 @@ countflats:
textureheight[i] = texture->height << FRACBITS;
i++;
}
+ }
+
+ return i;
+}
+
+//
+// R_LoadTextures
+// Initializes the texture list with the textures from the world map.
+//
+void R_LoadTextures(void)
+{
+ INT32 i, w;
+ UINT16 j;
+ UINT16 texstart, texend, texturesLumpPos;
+
+ // Free previous memory before numtextures change.
+ if (numtextures)
+ {
+ for (i = 0; i < numtextures; i++)
+ {
+ Z_Free(textures[i]);
+ Z_Free(texturecache[i]);
+ }
+ Z_Free(texturetranslation);
+ Z_Free(textures);
+ Z_Free(texflats);
+ }
+ // Load patches and textures.
+
+ // Get the number of textures to check.
+ // NOTE: Make SURE the system does not process
+ // the markers.
+ // This system will allocate memory for all duplicate/patched textures even if it never uses them,
+ // but the alternative is to spend a ton of time checking and re-checking all previous entries just to skip any potentially patched textures.
+ for (w = 0, numtextures = 0; w < numwadfiles; w++)
+ {
#ifdef WALLFLATS
-checkflats:
- // Yes
+ // Count flats
if (wadfiles[w]->type == RET_PK3)
{
texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
@@ -944,92 +957,95 @@ checkflats:
texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
}
- if (texstart == INT16_MAX || texend == INT16_MAX)
- continue;
-
- texstart++; // Do not count the first marker
-
- // Work through each lump between the markers in the WAD.
- for (j = 0; j < (texend - texstart); j++)
+ if (!( texstart == INT16_MAX || texend == INT16_MAX ))
{
- UINT8 *flatlump;
- UINT16 wadnum = (UINT16)w;
- lumpnum_t lumpnum = texstart + j;
- size_t lumplength;
- size_t flatsize = 0;
+ texstart++; // Do not count the first marker
+ // PK3s have subfolders, so we can't just make a simple sum
if (wadfiles[w]->type == RET_PK3)
{
- if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
- continue; // If it is then SKIP IT
+ for (j = texstart; j < texend; j++)
+ {
+ if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
+ numtextures++;
+ }
}
-
- flatlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
- lumplength = W_LumpLengthPwad(wadnum, lumpnum);
-
- switch (lumplength)
+ else // Add all the textures between F_START and F_END
{
- case 4194304: // 2048x2048 lump
- flatsize = 2048;
- break;
- case 1048576: // 1024x1024 lump
- flatsize = 1024;
- break;
- case 262144:// 512x512 lump
- flatsize = 512;
- break;
- case 65536: // 256x256 lump
- flatsize = 256;
- break;
- case 16384: // 128x128 lump
- flatsize = 128;
- break;
- case 1024: // 32x32 lump
- flatsize = 32;
- break;
- default: // 64x64 lump
- flatsize = 64;
- break;
+ numtextures += (UINT32)(texend - texstart);
}
+ }
+#endif/*WALLFLATS*/
- //CONS_Printf("\n\"%s\" is a flat, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),flatsize,flatsize);
- texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
+ // Count the textures from TEXTURES lumps
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
+ while (texturesLumpPos != INT16_MAX)
+ {
+ numtextures += R_CountTexturesInTEXTURESLump((UINT16)w, (UINT16)texturesLumpPos);
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
+ }
- // Set texture properties.
- M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
+ // Count single-patch textures
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
+ texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
+ }
+ else
+ {
+ texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
+ texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
+ }
-#ifndef NO_PNG_LUMPS
- if (R_IsLumpPNG((UINT8 *)flatlump, lumplength))
+ if (texstart == INT16_MAX || texend == INT16_MAX)
+ continue;
+
+ texstart++; // Do not count the first marker
+
+ // PK3s have subfolders, so we can't just make a simple sum
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ for (j = texstart; j < texend; j++)
{
- INT16 width, height;
- R_PNGDimensions((UINT8 *)flatlump, &width, &height, lumplength);
- texture->width = width;
- texture->height = height;
+ if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
+ numtextures++;
}
- else
-#endif
- texture->width = texture->height = flatsize;
+ }
+ else // Add all the textures between TX_START and TX_END
+ {
+ numtextures += (UINT32)(texend - texstart);
+ }
+ }
- texture->type = TEXTURETYPE_FLAT;
- texture->patchcount = 1;
- texture->holes = false;
- texture->flip = 0;
+ // If no textures found by this point, bomb out
+ if (!numtextures)
+ I_Error("No textures detected in any WADs!\n");
- // Allocate information for the texture's patches.
- patch = &texture->patches[0];
+ // Allocate memory and initialize to 0 for all the textures we are initialising.
+ // There are actually 5 buffers allocated in one for convenience.
+ textures = Z_Calloc((numtextures * sizeof(void *)) * 5, PU_STATIC, NULL);
+ texflats = Z_Calloc((numtextures * sizeof(*texflats)), PU_STATIC, NULL);
- patch->originx = patch->originy = 0;
- patch->wad = (UINT16)w;
- patch->lump = texstart + j;
- patch->flip = 0;
+ // Allocate texture column offset table.
+ texturecolumnofs = (void *)((UINT8 *)textures + (numtextures * sizeof(void *)));
+ // Allocate texture referencing cache.
+ texturecache = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 2));
+ // Allocate texture width table.
+ texturewidth = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 3));
+ // Allocate texture height table.
+ textureheight = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 4));
+ // Create translation table for global animation.
+ texturetranslation = Z_Malloc((numtextures + 1) * sizeof(*texturetranslation), PU_STATIC, NULL);
- Z_Unlock(flatlump);
+ for (i = 0; i < numtextures; i++)
+ texturetranslation[i] = i;
- texturewidth[i] = texture->width;
- textureheight[i] = texture->height << FRACBITS;
- i++;
- }
+ for (i = 0, w = 0; w < numwadfiles; w++)
+ {
+#ifdef WALLFLATS
+ i = Rloadflats(i, w);
#endif
+ i = Rloadtextures(i, w);
}
#ifdef HWRENDER
diff --git a/src/s_sound.c b/src/s_sound.c
index 0235d8376ce791b7859ab8997153709a2b336848..606cde597f8e81bf5ab19687d8b0e5ca121dbd55 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -117,6 +117,13 @@ static consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL
consvar_t cv_resetmusic = {"resetmusic", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_resetmusicbyheader = {"resetmusicbyheader", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t cons_1upsound_t[] = {
+ {0, "Jingle"},
+ {1, "Sound"},
+ {0, NULL}
+};
+consvar_t cv_1upsound = {"1upsound", "Jingle", CV_SAVE, cons_1upsound_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
// Sound system toggles, saved into the config
consvar_t cv_gamedigimusic = {"digimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameDigiMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_gamemidimusic = {"midimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameMIDIMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -287,6 +294,7 @@ void S_RegisterSoundStuff(void)
CV_RegisterVar(&cv_samplerate);
CV_RegisterVar(&cv_resetmusic);
CV_RegisterVar(&cv_resetmusicbyheader);
+ CV_RegisterVar(&cv_1upsound);
CV_RegisterVar(&cv_playsoundsifunfocused);
CV_RegisterVar(&cv_playmusicifunfocused);
CV_RegisterVar(&cv_gamesounds);
diff --git a/src/s_sound.h b/src/s_sound.h
index 18f2d37433b85789f76101ab992635210709394f..9a4cbe48beb4538c3cb110233e29861cd8665494 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -35,6 +35,8 @@ extern consvar_t cv_numChannels;
extern consvar_t cv_resetmusic;
extern consvar_t cv_resetmusicbyheader;
+extern consvar_t cv_1upsound;
+
#define RESETMUSIC (!modeattacking && \
(cv_resetmusicbyheader.value ? \
(mapheaderinfo[gamemap-1]->musforcereset != -1 ? mapheaderinfo[gamemap-1]->musforcereset : cv_resetmusic.value) \