Better MSS logging when ASI files are missing and causes sound to not be played (also don't spam console)
This commit is contained in:
Louvenarde
parent
4394864b99
commit
704a125223
@ -419,8 +419,31 @@ namespace Components
|
||||
});
|
||||
}
|
||||
|
||||
void PrintAliasError(Game::conChannel_t channel, const char * originalMsg, const char* soundName, const char* lastErrorStr)
|
||||
{
|
||||
// We add a bit more info and we clear the sound stream when it happens
|
||||
// to avoid spamming the error
|
||||
const auto newMsg = std::format("{}Make sure you have the 'miles' folder in your game directory! Otherwise MP3 and other codecs will be unavailable.\n", originalMsg);
|
||||
Game::Com_PrintError(channel, newMsg.c_str(), soundName, lastErrorStr);
|
||||
|
||||
for (size_t i = 0; i < ARRAYSIZE(Game::milesGlobal->streamReadInfo); i++)
|
||||
{
|
||||
if (0 == std::strncmp(Game::milesGlobal->streamReadInfo[i].path, soundName, ARRAYSIZE(Game::milesGlobal->streamReadInfo[i].path)))
|
||||
{
|
||||
Game::milesGlobal->streamReadInfo[i].path[0] = '\x00'; // This kills it and make sure it doesn't get played again for now
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Logger::Logger()
|
||||
{
|
||||
// Print sound aliases errors
|
||||
if (!Dedicated::IsEnabled())
|
||||
{
|
||||
Utils::Hook(0x64BA67, PrintAliasError, HOOK_CALL).install()->quick();
|
||||
}
|
||||
|
||||
Utils::Hook(0x642139, BuildOSPath_Stub, HOOK_JUMP).install()->quick();
|
||||
|
||||
Scheduler::Loop(Frame, Scheduler::Pipeline::SERVER);
|
||||
|
||||
@ -21,6 +21,8 @@ namespace Game
|
||||
NetField* clientStateFields = reinterpret_cast<Game::NetField*>(0x741E40);
|
||||
size_t clientStateFieldsCount = Utils::Hook::Get<size_t>(0x7433C8);
|
||||
|
||||
MssLocal* milesGlobal = reinterpret_cast<MssLocal*>(0x649A1A0);
|
||||
|
||||
const char* origErrorMsg = reinterpret_cast<const char*>(0x79B124);
|
||||
|
||||
XModel* G_GetModel(const int index)
|
||||
|
||||
@ -56,6 +56,8 @@ namespace Game
|
||||
// This does not belong anywhere else
|
||||
extern NetField* clientStateFields;
|
||||
extern size_t clientStateFieldsCount;
|
||||
extern MssLocal* milesGlobal;
|
||||
|
||||
|
||||
extern const char* origErrorMsg;
|
||||
|
||||
|
||||
@ -2426,7 +2426,7 @@ namespace Game
|
||||
float scale;
|
||||
unsigned int noScalePartBits[6];
|
||||
unsigned __int16* boneNames;
|
||||
unsigned char *parentList;
|
||||
unsigned char* parentList;
|
||||
short* quats;
|
||||
float* trans;
|
||||
unsigned char* partClassification;
|
||||
@ -5519,6 +5519,32 @@ namespace Game
|
||||
StructuredDataEnumEntry* entries;
|
||||
};
|
||||
|
||||
enum LookupResultDataType
|
||||
{
|
||||
LOOKUP_RESULT_INT = 0x0,
|
||||
LOOKUP_RESULT_BOOL = 0x1,
|
||||
LOOKUP_RESULT_STRING = 0x2,
|
||||
LOOKUP_RESULT_FLOAT = 0x3,
|
||||
LOOKUP_RESULT_SHORT = 0x4,
|
||||
};
|
||||
|
||||
enum LookupState
|
||||
{
|
||||
LOOKUP_IN_PROGRESS = 0x0,
|
||||
LOOKUP_FINISHED = 0x1,
|
||||
LOOKUP_ERROR = 0x2,
|
||||
};
|
||||
|
||||
enum LookupError
|
||||
{
|
||||
LOOKUP_ERROR_NONE = 0x0,
|
||||
LOOKUP_ERROR_WRONG_DATA_TYPE = 0x1,
|
||||
LOOKUP_ERROR_INDEX_OUTSIDE_BOUNDS = 0x2,
|
||||
LOOKUP_ERROR_INVALID_STRUCT_PROPERTY = 0x3,
|
||||
LOOKUP_ERROR_INVALID_ENUM_VALUE = 0x4,
|
||||
LOOKUP_ERROR_COUNT = 0x5,
|
||||
};
|
||||
|
||||
enum StructuredDataTypeCategory
|
||||
{
|
||||
DATA_INT = 0x0,
|
||||
@ -5594,6 +5620,15 @@ namespace Game
|
||||
unsigned int size;
|
||||
};
|
||||
|
||||
|
||||
struct StructuredDataLookup
|
||||
{
|
||||
StructuredDataDef* def;
|
||||
StructuredDataType* type;
|
||||
unsigned int offset;
|
||||
LookupError error;
|
||||
};
|
||||
|
||||
struct StructuredDataDefSet
|
||||
{
|
||||
const char* name;
|
||||
@ -7932,8 +7967,8 @@ namespace Game
|
||||
|
||||
struct GfxCmdBufContext
|
||||
{
|
||||
GfxCmdBufSourceState *source;
|
||||
GfxCmdBufState *state;
|
||||
GfxCmdBufSourceState* source;
|
||||
GfxCmdBufState* state;
|
||||
};
|
||||
|
||||
struct GfxDrawGroupSetupFields
|
||||
@ -11101,6 +11136,159 @@ namespace Game
|
||||
FFD_USER_MAP = 0x2,
|
||||
};
|
||||
|
||||
struct ASISTAGE
|
||||
{
|
||||
int(__stdcall* ASI_stream_open)(unsigned int, int(__stdcall*)(unsigned int, void*, int, int), unsigned int);
|
||||
int(__stdcall* ASI_stream_process)(int, void*, int);
|
||||
int(__stdcall* ASI_stream_seek)(int, int);
|
||||
int(__stdcall* ASI_stream_close)(int);
|
||||
int(__stdcall* ASI_stream_property)(int, unsigned int, void*, const void*, void*);
|
||||
unsigned int INPUT_BIT_RATE;
|
||||
unsigned int INPUT_SAMPLE_RATE;
|
||||
unsigned int INPUT_BITS;
|
||||
unsigned int INPUT_CHANNELS;
|
||||
unsigned int OUTPUT_BIT_RATE;
|
||||
unsigned int OUTPUT_SAMPLE_RATE;
|
||||
unsigned int OUTPUT_BITS;
|
||||
unsigned int OUTPUT_CHANNELS;
|
||||
unsigned int OUTPUT_RESERVOIR;
|
||||
unsigned int POSITION;
|
||||
unsigned int PERCENT_DONE;
|
||||
unsigned int MIN_INPUT_BLOCK_SIZE;
|
||||
unsigned int RAW_RATE;
|
||||
unsigned int RAW_BITS;
|
||||
unsigned int RAW_CHANNELS;
|
||||
unsigned int REQUESTED_RATE;
|
||||
unsigned int REQUESTED_BITS;
|
||||
unsigned int REQUESTED_CHANS;
|
||||
unsigned int STREAM_SEEK_POS;
|
||||
unsigned int DATA_START_OFFSET;
|
||||
unsigned int DATA_LEN;
|
||||
int stream;
|
||||
};
|
||||
|
||||
struct _STREAM
|
||||
{
|
||||
int block_oriented;
|
||||
int using_ASI;
|
||||
ASISTAGE* ASI;
|
||||
void* samp;
|
||||
unsigned int fileh;
|
||||
char* bufs[3];
|
||||
unsigned int bufsizes[3];
|
||||
int reset_ASI[3];
|
||||
int reset_seek_pos[3];
|
||||
int bufstart[3];
|
||||
void* asyncs[3];
|
||||
int loadedbufstart[2];
|
||||
int loadedorder[2];
|
||||
int loadorder;
|
||||
int bufsize;
|
||||
int readsize;
|
||||
unsigned int buf1;
|
||||
int size1;
|
||||
unsigned int buf2;
|
||||
int size2;
|
||||
unsigned int buf3;
|
||||
int size3;
|
||||
unsigned int datarate;
|
||||
int filerate;
|
||||
int filetype;
|
||||
unsigned int fileflags;
|
||||
int totallen;
|
||||
int substart;
|
||||
int sublen;
|
||||
int subpadding;
|
||||
unsigned int blocksize;
|
||||
int padding;
|
||||
int padded;
|
||||
int loadedsome;
|
||||
unsigned int startpos;
|
||||
unsigned int totalread;
|
||||
unsigned int loopsleft;
|
||||
unsigned int error;
|
||||
int preload;
|
||||
unsigned int preloadpos;
|
||||
int noback;
|
||||
int alldone;
|
||||
int primeamount;
|
||||
int readatleast;
|
||||
int playcontrol;
|
||||
void(__stdcall* callback)(_STREAM*);
|
||||
int user_data[8];
|
||||
void* next;
|
||||
int autostreaming;
|
||||
int docallback;
|
||||
};
|
||||
|
||||
enum SND_EQTYPE
|
||||
{
|
||||
SND_EQTYPE_FIRST = 0x0,
|
||||
SND_EQTYPE_LOWPASS = 0x0,
|
||||
SND_EQTYPE_HIGHPASS = 0x1,
|
||||
SND_EQTYPE_LOWSHELF = 0x2,
|
||||
SND_EQTYPE_HIGHSHELF = 0x3,
|
||||
SND_EQTYPE_BELL = 0x4,
|
||||
SND_EQTYPE_LAST = 0x4,
|
||||
SND_EQTYPE_COUNT = 0x5,
|
||||
SND_EQTYPE_INVALID = 0x5,
|
||||
};
|
||||
|
||||
struct __declspec(align(4)) SndEqParams
|
||||
{
|
||||
SND_EQTYPE type;
|
||||
float gain;
|
||||
float freq;
|
||||
float q;
|
||||
bool enabled;
|
||||
};
|
||||
|
||||
struct MssEqInfo
|
||||
{
|
||||
SndEqParams params[3][64];
|
||||
};
|
||||
|
||||
struct MssFileHandle
|
||||
{
|
||||
unsigned int id;
|
||||
MssFileHandle* next;
|
||||
int handle;
|
||||
char fileName[128];
|
||||
unsigned int hashCode;
|
||||
int offset;
|
||||
int fileOffset;
|
||||
int fileLength;
|
||||
};
|
||||
|
||||
struct __declspec(align(4)) MssStreamReadInfo
|
||||
{
|
||||
char path[256];
|
||||
int timeshift;
|
||||
float fraction;
|
||||
int startDelay;
|
||||
_STREAM* handle;
|
||||
bool readError;
|
||||
};
|
||||
|
||||
struct MssLocal
|
||||
{
|
||||
struct _DIG_DRIVER* driver;
|
||||
struct _SAMPLE* handle_sample[40];
|
||||
_STREAM* handle_stream[12];
|
||||
bool voiceEqDisabled[52];
|
||||
MssEqInfo eq[2];
|
||||
float eqLerp;
|
||||
unsigned int eqFilter;
|
||||
int currentRoomtype;
|
||||
MssFileHandle fileHandle[12];
|
||||
MssFileHandle* freeFileHandle;
|
||||
bool isMultiChannel;
|
||||
float realVolume[12];
|
||||
int playbackRate[52];
|
||||
MssStreamReadInfo streamReadInfo[12];
|
||||
};
|
||||
|
||||
|
||||
#pragma endregion
|
||||
|
||||
#ifndef IDA
|
||||
|
||||
Loading…
Reference in New Issue
Block a user