diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4a648be4c..f039e10ec 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D2X-Rebirth Changelog +20120328 +-------- +main/movie.c: Call all necessary MVE functions when initializing robot movies to prevent crashes if a robot movie is the first one the program plays + 20120324 -------- arch/ogl/gr.c, arch/sdl/gr.c, ui/menubar.c: Draw the editor menubar properly - by drawing in response to EVENT_WINDOW_DRAW and initialising the screen canvas properly. The latter fixes a lot of other editor drawing issues as well diff --git a/main/movie.c b/main/movie.c index f2bba04ee..2341fba0c 100644 --- a/main/movie.c +++ b/main/movie.c @@ -492,6 +492,10 @@ int InitRobotMovie(char *filename) con_printf(CON_DEBUG, "RoboFile=%s\n", filename); + MVE_memCallbacks(MPlayAlloc, MPlayFree); + MVE_ioCallbacks(FileRead); + MVE_sfCallbacks(MovieShowFrame); + MVE_palCallbacks(MovieSetPalette); MVE_sndInit(-1); //tell movies to play no sound for robots RoboFile = PHYSFSRWOPS_openRead(filename);