[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.199,1.200 scummvm.cpp,1.200,1.201 Makefile.common,1.16,1.17 scummvm.dsp,1.49,1.50 init.cpp,1.16,NONE

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv5918

Modified Files:
	scumm.h scummvm.cpp Makefile.common scummvm.dsp 
Removed Files:
	init.cpp 
Log Message:
got rid of init.cpp

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- scumm.h	12 Aug 2002 16:05:13 -0000	1.199
+++ scumm.h	14 Aug 2002 00:01:39 -0000	1.200
@@ -423,7 +423,7 @@
 	/* Core class/array definitions */
 	Gdi gdi;
 
-	Actor *_actors;	// Has MAX_ACTORS elements, see init.cpp
+	Actor *_actors;	// Has MAX_ACTORS elements
 	
 	uint16 *_inventory;
 	byte *_arrays;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- scummvm.cpp	11 Aug 2002 11:53:51 -0000	1.200
+++ scummvm.cpp	14 Aug 2002 00:01:39 -0000	1.201
@@ -63,6 +63,19 @@
 }
 
 
+Scumm::Scumm (void) {
+	_newgui = new NewGui(this);
+	_bundle = new Bundle(this);
+	_timer = new Timer(this);
+}
+
+Scumm::~Scumm (void) {
+	delete [] _actors;
+	delete _newgui;
+	delete _bundle;
+	delete _timer;
+}
+
 void Scumm::scummInit()
 {
 	int i;

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.common	4 Aug 2002 16:30:55 -0000	1.16
+++ Makefile.common	14 Aug 2002 00:01:39 -0000	1.17
@@ -8,15 +8,15 @@
 
 OBJS	+= util.o newgui.o gui/widget.o gui/dialog.o \
 	gui/ListWidget.o gui/ScrollBarWidget.o \
-	actor.o boxes.o costume.o gfx.o object.o resource.o \
-	saveload.o script.o scummvm.o sound.o string.o \
-	sys.o verbs.o script_v1.o script_v2.o debug.o gui.o \
-	sound/imuse.o sound/fmopl.o sound/mixer.o debugrl.o \
-	akos.o vars.o insane.o gameDetector.o init.o \
-	v3/resource_v3.o v4/resource_v4.o scaler.o main.o \
-        simon/midi.o simon/simon.o simon/simonsys.o simon/simonvga.o \
-        simon/simondebug.o simon/simonres.o simon/simonitems.o simon/simonverb.o \
-        sound/mididrv.o config-file.o bundle.o timer.o
+	actor.o akos.o boxes.o bundle.o config-file.o costume.o debug.o \
+	debugrl.o gameDetector.o gfx.o gui.o insane.o main.o object.o \
+	resource.o saveload.o scaler.o script.o script_v1.o script_v2.o \
+	scummvm.o sound.o string.o sys.o timer.o vars.o verbs.o  \
+	sound/imuse.o sound/fmopl.o sound/mixer.o \
+	v3/resource_v3.o v4/resource_v4.o \
+	simon/midi.o simon/simon.o simon/simonsys.o simon/simonvga.o \
+	simon/simondebug.o simon/simonres.o simon/simonitems.o simon/simonverb.o \
+	sound/mididrv.o
 
 DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
 	debugrl.h whatsnew.txt readme.txt copying.txt \
@@ -33,19 +33,19 @@
 .PHONY: all clean dist
 
 # Default (dumb) compile & dependcy rules
-.cpp.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-$(OBJS): $(INCS)
+#.cpp.o:
+#	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+#$(OBJS): $(INCS)
 
 
 # If you use GCC, disable the above and enable this for intelligent
 # dependency tracking. 
-#DEPDIR := .deps
-#.cpp.o:
-#	mkdir -p $(DEPDIR)
-#	$(CC) -Wp,-MMD,"$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-#	echo -n "$(*D)/" > $(DEPDIR)/$(*F).d
-#	cat "$(DEPDIR)/$(*F).d2" >> "$(DEPDIR)/$(*F).d"
-#	rm -f "$(DEPDIR)/$(*F).d2"
-#
-#-include $(DEPDIR)/*.d
+DEPDIR := .deps
+.cpp.o:
+	mkdir -p $(DEPDIR)
+	$(CC) -Wp,-MMD,"$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+	echo -n "$(*D)/" > $(DEPDIR)/$(*F).d
+	cat "$(DEPDIR)/$(*F).d2" >> "$(DEPDIR)/$(*F).d"
+	rm -f "$(DEPDIR)/$(*F).d2"
+
+-include $(DEPDIR)/*.d

Index: scummvm.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.dsp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- scummvm.dsp	4 Aug 2002 16:30:56 -0000	1.49
+++ scummvm.dsp	14 Aug 2002 00:01:39 -0000	1.50
@@ -343,10 +343,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\init.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\insane.cpp
 # End Source File
 # Begin Source File

--- init.cpp DELETED ---