edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sound and image loading

Browse source
This commit is contained in:
def 2014-10-24 23:03:16 +02:00
parent 61b704dac3
commit 12102a14a6
3 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/engine/client/sound.cpp
View file

@ -435,9 +435,17 @@ int CSound::LoadWV(const char *pFilename)
int SampleID = AllocID();
if(SampleID < 0)
return -1;
// read the whole file into memory
int DataSize = io_length(ms_File);
if(DataSize <= 0)
{
io_close(ms_File);
dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
return -1;
}
char *pData = new char[DataSize];
io_read(ms_File, pData, DataSize);

23
src/game/editor/editor.cpp
View file

@ -2910,13 +2910,21 @@ void CEditor::AddSound(const char *pFileName, int StorageType, void *pUser)
return;
// read the whole file into memory
unsigned DataSize = io_length(SoundFile);
void *pData = mem_alloc(DataSize, 1);
io_read(SoundFile, pData, DataSize);
int DataSize = io_length(SoundFile);
if(DataSize <= 0)
{
io_close(SoundFile);
dbg_msg("sound/wv", "failed to open file. filename='%s'", pFileName);
return;
}
void *pData = mem_alloc((unsigned) DataSize, 1);
io_read(SoundFile, pData, (unsigned) DataSize);
io_close(SoundFile);
// load sound
int SoundId = pEditor->Sound()->LoadWVFromMem(pData, DataSize);
int SoundId = pEditor->Sound()->LoadWVFromMem(pData, (unsigned) DataSize);
if(SoundId == -1)
return;
@ -2924,7 +2932,7 @@ void CEditor::AddSound(const char *pFileName, int StorageType, void *pUser)
CEditorSound *pSound = new CEditorSound(pEditor);
pSound->m_SoundID = SoundId;
pSound->m_External = 1; // external by default
pSound->m_DataSize = DataSize;
pSound->m_DataSize = (unsigned) DataSize;
pSound->m_pData = pData;
str_copy(pSound->m_aName, aBuf, sizeof(pSound->m_aName));
pEditor->m_Map.m_lSounds.add(pSound);
@ -3725,6 +3733,11 @@ void CEditor::FilelistPopulate(int StorageType)
m_FilesSelectedIndex = m_FileList.size() ? 0 : -1;
m_FilePreviewImage = 0;
m_aFileDialogActivate = false;
if(m_FilesSelectedIndex >= 0)
str_copy(m_aFileDialogFileName, m_FileList[m_FilesSelectedIndex].m_aFilename, sizeof(m_aFileDialogFileName));
else
m_aFileDialogFileName[0] = 0;
}
void CEditor::InvokeFileDialog(int StorageType, int FileType, const char *pTitle, const char *pButtonText,

13
src/game/editor/io.cpp
View file

@ -651,10 +651,17 @@ int CEditorMap::Load(class IStorage *pStorage, const char *pFileName, int Storag
{
// read the whole file into memory
pSound->m_DataSize = io_length(SoundFile);
pSound->m_pData = mem_alloc(pSound->m_DataSize, 1);
io_read(SoundFile, pSound->m_pData, pSound->m_DataSize);
if(pSound->m_DataSize > 0)
{
pSound->m_pData = mem_alloc(pSound->m_DataSize, 1);
io_read(SoundFile, pSound->m_pData, pSound->m_DataSize);
}
io_close(SoundFile);
pSound->m_SoundID = m_pEditor->Sound()->LoadWVFromMem(pSound->m_pData, pSound->m_DataSize);
if(pSound->m_DataSize > 0)
{
pSound->m_SoundID = m_pEditor->Sound()->LoadWVFromMem(pSound->m_pData, pSound->m_DataSize);
}
}
}
else