mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Don't leak binaryBlob

Browse source
This commit is contained in:
leo60228 2020-06-07 16:11:35 -04:00 committed by Ethan Lee
parent 9b91047bba
commit f3b26904ec
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
desktop_version/src/BinaryBlob.cpp
View file

@ -123,6 +123,18 @@ bool binaryBlob::unPackBinary(const char* name)
return true;
}
void binaryBlob::clear()
{
for (int i = 0; i < 128; i += 1)
{
if (m_headers[i].valid)
{
free(m_memblocks[i]);
m_headers[i].valid = false;
}
}
}
int binaryBlob::getIndex(const char* _name)
{
for (int i = 0; i < 128; i += 1)

2
desktop_version/src/BinaryBlob.h
View file

@ -31,6 +31,8 @@ public:
char* getAddress(int _index);
void clear();
private:
int numberofHeaders;
resourceheader m_headers[128];

3
desktop_version/src/Music.cpp
View file

@ -9,6 +9,8 @@ void musicclass::init()
soundTracks.clear();
musicTracks.clear();
musicReadBlob.clear();
soundTracks.push_back(SoundTrack( "sounds/jump.wav" ));
soundTracks.push_back(SoundTrack( "sounds/jump2.wav" ));
soundTracks.push_back(SoundTrack( "sounds/hurt.wav" ));
@ -60,7 +62,6 @@ void musicclass::init()
musicWriteBlob.writeBinaryBlob("data/BinaryMusic.vvv");
#endif
binaryBlob musicReadBlob;
if (!musicReadBlob.unPackBinary("mmmmmm.vvv"))
{
mmmmmm = false;

3
desktop_version/src/Music.h
View file

@ -2,6 +2,7 @@
#define MUSIC_H
#include "SoundSystem.h"
#include "BinaryBlob.h"
#include <vector>
@ -50,6 +51,8 @@ public:
// MMMMMM mod settings
bool mmmmmm;
bool usingmmmmmm;
binaryBlob musicReadBlob;
};
extern musicclass music;