- do not print game init messages to the notify display.

This commit is contained in:
Christoph Oelckers 2020-08-26 20:19:54 +02:00
parent e3fe1b2b60
commit 4e846f8d66
8 changed files with 9 additions and 6 deletions

View File

@ -3447,7 +3447,7 @@ int32_t loaddefinitionsfile(const char *fn)
if (script) if (script)
{ {
Printf("Loading \"%s\"\n",fn); Printf(PRINT_NONOTIFY, "Loading \"%s\"\n",fn);
defsparser(script); defsparser(script);
} }
@ -3468,7 +3468,7 @@ int32_t loaddefinitionsfile(const char *fn)
if (!script) return -1; if (!script) return -1;
Printf("\n"); Printf(PRINT_NONOTIFY, "\n");
return 0; return 0;
} }

View File

@ -588,6 +588,7 @@ FSoundChan *SoundEngine::StartSound(int type, const void *source,
chan->Priority = basepriority; chan->Priority = basepriority;
chan->DistanceScale = float(attenuation); chan->DistanceScale = float(attenuation);
chan->SourceType = type; chan->SourceType = type;
chan->UserData = 0;
if (type == SOURCE_Unattached) if (type == SOURCE_Unattached)
{ {
chan->Point[0] = pt->X; chan->Point[1] = pt->Y; chan->Point[2] = pt->Z; chan->Point[0] = pt->X; chan->Point[1] = pt->Y; chan->Point[2] = pt->Z;

View File

@ -164,6 +164,7 @@ struct FSoundChan : public FISoundChannel
FSoundID OrgID; // Sound ID of sound used to start this channel. FSoundID OrgID; // Sound ID of sound used to start this channel.
float Volume; float Volume;
int EntChannel; // Actor's sound channel. int EntChannel; // Actor's sound channel.
int UserData; // Not used by the engine, the caller can use this to store some additional info.
int16_t Pitch; // Pitch variation. int16_t Pitch; // Pitch variation.
int16_t NearLimit; int16_t NearLimit;
int8_t Priority; int8_t Priority;

View File

@ -174,6 +174,7 @@ static FSerializer& Serialize(FSerializer& arc, const char* key, FSoundChan& cha
("rolloffmin", chan.Rolloff.MinDistance) ("rolloffmin", chan.Rolloff.MinDistance)
("rolloffmax", chan.Rolloff.MaxDistance) ("rolloffmax", chan.Rolloff.MaxDistance)
("limitrange", chan.LimitRange) ("limitrange", chan.LimitRange)
("userdata", chan.UserData)
.Array("point", chan.Point, 3); .Array("point", chan.Point, 3);
int SourceIndex = 0; int SourceIndex = 0;

View File

@ -611,7 +611,7 @@ void GameInterface::app_init()
if (!loaddefinitionsfile(defsfile)) if (!loaddefinitionsfile(defsfile))
{ {
uint32_t etime = I_msTime(); uint32_t etime = I_msTime();
Printf("Definitions file \"%s\" loaded in %d ms.\n", defsfile, etime - stime); Printf(PRINT_NONOTIFY, "Definitions file \"%s\" loaded in %d ms.\n", defsfile, etime - stime);
} }

View File

@ -133,7 +133,7 @@ int LoadSound(const char* sound);
void BendAmbientSound(); void BendAmbientSound();
void CheckAmbience(short nSector); void CheckAmbience(short nSector);
void PlayFX2(unsigned short nSound, short nSprite); void PlayFX2(unsigned short nSound, short nSprite, int sectf = 0);
void PlayFXAtXYZ(unsigned short nSound, int x, int y, int z, int nSector); void PlayFXAtXYZ(unsigned short nSound, int x, int y, int z, int nSector);
inline void D3PlayFX(unsigned short nSound, short nVal) inline void D3PlayFX(unsigned short nSound, short nVal)
{ {

View File

@ -284,7 +284,7 @@ static void loaddefs()
if (!loaddefinitionsfile(defsfile)) if (!loaddefinitionsfile(defsfile))
{ {
deftimer.Unclock(); deftimer.Unclock();
Printf("Definitions file \"%s\" loaded in %.3f ms.\n", defsfile, deftimer.TimeMS()); Printf(PRINT_NONOTIFY, "Definitions file \"%s\" loaded in %.3f ms.\n", defsfile, deftimer.TimeMS());
} }
userConfig.AddDefs.reset(); userConfig.AddDefs.reset();
} }

View File

@ -276,7 +276,7 @@ void GameInterface::app_init()
if (!SW_SHAREWARE) if (!SW_SHAREWARE)
LoadCustomInfoFromScript("swcustom.txt"); // Load user customisation information LoadCustomInfoFromScript("swcustom.txt"); // Load user customisation information
if (!loaddefinitionsfile(G_DefFile())) Printf("Definitions file loaded.\n"); if (!loaddefinitionsfile(G_DefFile())) Printf(PRINT_NONOTIFY, "Definitions file loaded.\n");
userConfig.AddDefs.reset(); userConfig.AddDefs.reset();
enginePostInit(); enginePostInit();
videoInit(); videoInit();