minor changes in source structure

svn-id: r4949

6 files changed, 16 insertions, 42 deletions

diff --git a/Makefile.common b/Makefile.common
index 4fc42ee752..0e0b3fb805 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -21,7 +21,7 @@ SCUMM_OBJS = scumm/actor.o scumm/akos.o scumm/boxes.o scumm/bundle.o \
 	scumm/object.o scumm/resource.o scumm/resource_v2.o scumm/resource_v3.o \
 	scumm/resource_v4.o scumm/saveload.o scumm/script.o \
 	scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o  scumm/sound.o \
-	scumm/string.o scumm/sys.o scumm/vars.o scumm/verbs.o \
+	scumm/string.o scumm/vars.o scumm/verbs.o \
 #	scumm/insane.o
 
 SIMON_OBJS = simon/debug.o simon/items.o simon/midi.o simon/res.o simon/simon.o \
diff --git a/common/main.cpp b/common/main.cpp
index 8ce167f382..9587ee7085 100644
--- a/common/main.cpp
+++ b/common/main.cpp
@@ -144,3 +144,12 @@ int main(int argc, char *argv[])
 	
 	return 0;
 }
+
+void *operator new(size_t size) {
+	return calloc(size, 1);
+}
+
+void operator delete(void *ptr) {
+	free(ptr);
+}
+
diff --git a/common/scummsys.h b/common/scummsys.h
index 9048a1e3d2..f6b613ff95 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -365,4 +365,6 @@ char *strdup(const char *s);
 /* Initialized operator new */
 void * operator new(size_t size);
 
+void operator delete(void *ptr);
+
 #endif
diff --git a/scumm.dsp b/scumm.dsp
index bba122401a..a87d2c7d94 100644
--- a/scumm.dsp
+++ b/scumm.dsp
@@ -412,10 +412,6 @@ SOURCE=.\scumm\string.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\scumm\sys.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\scumm\vars.cpp

 # End Source File

 # Begin Source File

diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index df7e268e56..1aac72a417 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1561,3 +1561,7 @@ void Scumm::setupGUIColors() {
 		_newgui->_shadowcolor = _gui->_shadowcolor;
 	}
 }
+
+bool Scumm::checkFixedDisk() {
+	return true;
+}
diff --git a/scumm/sys.cpp b/scumm/sys.cpp
deleted file mode 100644
index 8cd3efe342..0000000000
--- a/scumm/sys.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/* 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$
- *
- */
-
-#include "stdafx.h"
-#include "scumm.h"
-
-bool Scumm::checkFixedDisk() 
-{
-	return true;
-}
-
-void *operator new(size_t size) {
-	return calloc(size, 1);
-}
-
-void operator delete(void *ptr) {
-	free(ptr);
-}