diff --git a/build-all.sh b/build-all.sh index 0d1f6befe..fd0c70654 100755 --- a/build-all.sh +++ b/build-all.sh @@ -48,7 +48,7 @@ function buildAll() { mkdir -p ${G_GENERATED} -if [[ 1 == 1 ]]; then +if [[ 0 == 1 ]]; then pushd thirdparty/bzip2 clearAndEnterBuild cmake ${COMMON} \ diff --git a/src/main.c b/src/main.c index 52d27e9a1..9f29eb5fa 100644 --- a/src/main.c +++ b/src/main.c @@ -720,7 +720,7 @@ void showHeader(void) { // 00000000011111111112222222222333333333344444444445555555555666666666677777777778 // 12345678901234567890123456789012345678901234567890123456789012345678901234567890 utilSay(" ___ ___ _ _ ___ ___"); - utilSay("/ __|_ _| \\| |/ __| __| Somewhat Interactive Nostalgic Game Engine %s Beta 4", VERSION_STRING); + utilSay("/ __|_ _| \\| |/ __| __| Somewhat Interactive Nostalgic Game Engine %s Beta 5", VERSION_STRING); utilSay("\\__ \\| || .` | (_ | _| Copyright (c) 2006-%s Scott C. Duensing", COPYRIGHT_END_YEAR); utilSay("|___/___|_|\\_|\\___|___| https://KangarooPunch.com https://SingeEngine.com"); utilSay(""); diff --git a/src/singe.c b/src/singe.c index e736e4cc8..cd272bc93 100644 --- a/src/singe.c +++ b/src/singe.c @@ -2950,7 +2950,7 @@ int32_t apiVideoLoad(lua_State *L) { result = _global.nextVideoId++; HASH_ADD_INT(_global.videoList, id, video); // Select desired default audio track - if (_global.conf->audioOutputTrack < videoGetAudioTracks(video->id)) { + if (_global.conf->audioOutputTrack < videoGetAudioTracks(video->handle)) { videoSetAudioTrack(video->handle, _global.conf->audioOutputTrack); } // Set default volume @@ -5302,6 +5302,7 @@ void singe(SDL_Window *window, SDL_Renderer *renderer, ConfigT *conf) { HASH_ITER(hh, _global.videoList, video, videoTemp) { HASH_DEL(_global.videoList, video); progTrace("Unloading video handle %d", video->id); + videoUnload(video->handle); if (video->surface) SDL_FreeSurface(video->surface); if (video->rotatedZoomedSurface) SDL_FreeSurface(video->rotatedZoomedSurface); free(video);