moved scummfg to config-file.h - seems more logical. Also added a legal header

svn-id: r4122

2 files changed, 25 insertions, 2 deletions

diff --git a/config-file.h b/config-file.h
index 154118b723..922724cce4 100644
--- a/config-file.h
+++ b/config-file.h
@@ -1,3 +1,25 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001  Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
 #ifndef __CONFIG_FILE_H__
 #define __CONFIG_FILE_H__
 
@@ -22,4 +44,7 @@ class Config {
     int ndomains;
 };
 
+// The global config object
+extern Config * scummcfg;
+
 #endif
diff --git a/scumm.h b/scumm.h
index c35b5a19cc..58fdbff5f5 100644
--- a/scumm.h
+++ b/scumm.h
@@ -1851,8 +1851,6 @@ void outputdisplay2(Scumm *s, int disp);
 extern const byte revBitMask[8];
 //void blitToScreen(Scumm *s, byte *src, int x, int y, int w, int h);
 
-extern Config * scummcfg;
-
 #if defined(__GNUC__)
 void CDECL error(const char *s, ...) NORETURN;
 #else