# HG changeset patch # User Matti Hamalainen # Date 1209390395 -10800 # Node ID f791c889f74c7598e2e7fc24705c45933f97e72c # Parent cdccb12b19a620f657ec42a1316101b2b12aa1e0 We have never actually supported J2B (Jazz Jackrabbit 2) modules (the loader was a stub), so remove the references to it. diff -r cdccb12b19a6 -r f791c889f74c src/modplug/Makefile --- a/src/modplug/Makefile Mon Apr 28 16:31:52 2008 +0300 +++ b/src/modplug/Makefile Mon Apr 28 16:46:35 2008 +0300 @@ -32,7 +32,6 @@ load_ams.cxx \ load_amf.cxx \ load_669.cxx \ - load_j2b.cxx \ load_mt2.cxx \ load_psm.cxx \ archive/archive.cxx \ diff -r cdccb12b19a6 -r f791c889f74c src/modplug/archive/archive.cxx --- a/src/modplug/archive/archive.cxx Mon Apr 28 16:31:52 2008 +0300 +++ b/src/modplug/archive/archive.cxx Mon Apr 28 16:46:35 2008 +0300 @@ -69,8 +69,6 @@ return true; if (lExt == ".xm") return true; - if (lExt == ".j2b") - return true; if (lExt == ".mt2") return true; if (lExt == ".psm") diff -r cdccb12b19a6 -r f791c889f74c src/modplug/load_j2b.cxx --- a/src/modplug/load_j2b.cxx Mon Apr 28 16:31:52 2008 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -/* - * This source code is public domain. - * - * Authors: Olivier Lapicque -*/ - - -/////////////////////////////////////////////////// -// -// J2B module loader -// -/////////////////////////////////////////////////// -#include "stdafx.h" -#include "sndfile.h" - diff -r cdccb12b19a6 -r f791c889f74c src/modplug/modplugbmp.cxx --- a/src/modplug/modplugbmp.cxx Mon Apr 28 16:31:52 2008 +0300 +++ b/src/modplug/modplugbmp.cxx Mon Apr 28 16:46:35 2008 +0300 @@ -198,8 +198,6 @@ return true; if (lExt == ".ult") return true; - if (lExt == ".j2b") - return true; if (lExt == ".mt2") return true; diff -r cdccb12b19a6 -r f791c889f74c src/modplug/plugin.cxx --- a/src/modplug/plugin.cxx Mon Apr 28 16:31:52 2008 +0300 +++ b/src/modplug/plugin.cxx Mon Apr 28 16:46:35 2008 +0300 @@ -81,7 +81,7 @@ } const gchar *fmts[] = - { "amf", "ams", "dbm", "dbf", "dsm", "far", "mdl", "stm", "ult", "j2b", "mt2", + { "amf", "ams", "dbm", "dbf", "dsm", "far", "mdl", "stm", "ult", "mt2", "mdz", "mdr", "mdgz", "mdbz", "mod", "s3z", "s3r", "s3gz", "s3m", "xmz", "xmr", "xmgz", "itz", "itr", "itgz", "dmf", "umx", "it", "669", "xm", "mtm", "psm", "ft2", "zip", "gz", "bz2", "rar", "rb",