[Scummvm-cvs-logs] CVS: scummvm config-file.h,1.1,1.2 scumm.h,1.147,1.148
Max Horn
fingolfin at users.sourceforge.net
Sun Apr 28 13:00:27 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv22208
Modified Files:
config-file.h scumm.h
Log Message:
moved scummfg to config-file.h - seems more logical. Also added a legal header
Index: config-file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/config-file.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config-file.h 27 Apr 2002 17:21:38 -0000 1.1
--- config-file.h 28 Apr 2002 00:56:52 -0000 1.2
***************
*** 1,2 ****
--- 1,24 ----
+ /* 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,25 ****
--- 44,50 ----
int ndomains;
};
+
+ // The global config object
+ extern Config * scummcfg;
#endif
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** scumm.h 27 Apr 2002 16:58:29 -0000 1.147
--- scumm.h 28 Apr 2002 00:56:52 -0000 1.148
***************
*** 1852,1857 ****
//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;
--- 1852,1855 ----
More information about the Scummvm-git-logs
mailing list