ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

got rid of init.cpp

Browse Source 
svn-id: r4736
This commit is contained in:
Max Horn
2002-08-14 00:01:39 +00:00
parent 8d22d4ade0
commit 16aa478d8b
7 changed files with 36 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.common
+21 -21
View File
@@ -8,15 +8,15 @@ INCS = scumm.h scummsys.h stdafx.h
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 @@ clean:
.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
init.cpp
-39
View File
@@ -1,39 +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"
#include "actor.h"
#include "newgui.h"
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;
}
morphos/Makefile
+1 -1
View File
@@ -20,7 +20,7 @@ OBJS = actor.o akos.o boxes.o config-file.o costume.o gfx.o object.o resource.o
saveload.o script.o scummvm.o sound.o string.o sys.o verbs.o \
morphos.o morphos_scaler.o morphos_sound.o morphos_start.o morphos_timer.o \
script_v1.o script_v2.o debug.o gui.o imuse.o fmopl.o mixer.o mididrv.o \
debugrl.o vars.o insane.o gameDetector.o init.o resource_v3.o resource_v4.o \
debugrl.o vars.o insane.o gameDetector.o resource_v3.o resource_v4.o \
util.o main.o bundle.o $(GUIOBJS) $(SIMONOBJS)
DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
scumm.h
+1 -1
View File
@@ -423,7 +423,7 @@ public:
/* 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;
scummvm.cpp
+13
View File
@@ -63,6 +63,19 @@ uint Scumm::getRandomNumberRng(uint min, uint max)
}
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;
scummvm.dsp
-4
View File
@@ -343,10 +343,6 @@ SOURCE=.\gui.cpp
# End Source File
# Begin Source File
SOURCE=.\init.cpp
# End Source File
# Begin Source File
SOURCE=.\insane.cpp
# End Source File
# Begin Source File
wince/PocketSCUMM.vcp
-192
View File
@@ -5254,198 +5254,6 @@ NODEP_CPP_GUI_C=\
"..\sound.h"\
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\init.cpp
!IF "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
DEP_CPP_INIT_=\
"..\actor.h"\
"..\akos.h"\
"..\boxes.h"\
"..\gfx.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\smush.h"\
"..\sound\mixer.h"\
"..\stdafx.h"\
"..\system.h"\
".\missing\unistd.h"\
".\SDLAudio\include\SDL_byteorder.h"\
NODEP_CPP_INIT_=\
"..\macos.h"\
!ELSEIF "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Debug"
DEP_CPP_INIT_=\
"..\akos.h"\
"..\boxes.h"\
"..\gfx.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\smush.h"\
"..\stdafx.h"\
"..\system.h"\
".\missing\unistd.h"\
NODEP_CPP_INIT_=\
"..\mixer.h"\
!ELSEIF "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Release"
DEP_CPP_INIT_=\
"..\akos.h"\
"..\boxes.h"\
"..\gfx.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\smush.h"\
"..\stdafx.h"\
"..\system.h"\
".\missing\unistd.h"\
NODEP_CPP_INIT_=\
"..\mixer.h"\
!ELSEIF "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Debug"
DEP_CPP_INIT_=\
"..\akos.h"\
"..\boxes.h"\
"..\gfx.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\smush.h"\
"..\stdafx.h"\
"..\system.h"\
".\missing\unistd.h"\
NODEP_CPP_INIT_=\
"..\mixer.h"\
!ELSEIF "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Release"
DEP_CPP_INIT_=\
"..\actor.h"\
"..\akos.h"\
"..\boxes.h"\
"..\gfx.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\smush.h"\
"..\sound\mixer.h"\
"..\stdafx.h"\
"..\system.h"\
".\mad\include\mad.h"\
".\missing\unistd.h"\
".\SDLAudio\include\SDL_byteorder.h"\
NODEP_CPP_INIT_=\
"..\macos.h"\
!ELSEIF "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Debug"
DEP_CPP_INIT_=\
"..\akos.h"\
"..\boxes.h"\
"..\gfx.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\smush.h"\
"..\stdafx.h"\
"..\system.h"\
".\missing\unistd.h"\
NODEP_CPP_INIT_=\
"..\mixer.h"\
!ELSEIF "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
DEP_CPP_INIT_=\
"..\actor.h"\
"..\boxes.h"\
"..\bundle.h"\
"..\gfx.h"\
"..\newgui.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\sound\mixer.h"\
"..\stdafx.h"\
"..\system.h"\
".\mad\include\mad.h"\
".\missing\unistd.h"\
".\SDLAudio\include\SDL_byteorder.h"\
NODEP_CPP_INIT_=\
"..\macos.h"\
!ELSEIF "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
DEP_CPP_INIT_=\
"..\actor.h"\
"..\boxes.h"\
"..\bundle.h"\
"..\gfx.h"\
"..\newgui.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\sound\mixer.h"\
"..\stdafx.h"\
"..\system.h"\
".\mad\include\mad.h"\
".\missing\unistd.h"\
".\SDLAudio\include\SDL_byteorder.h"\
NODEP_CPP_INIT_=\
"..\macos.h"\
!ELSEIF "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
DEP_CPP_INIT_=\
"..\akos.h"\
"..\boxes.h"\
"..\gfx.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\smush.h"\
"..\stdafx.h"\
"..\system.h"\
".\missing\unistd.h"\
NODEP_CPP_INIT_=\
"..\mixer.h"\
!ELSEIF "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Debug"
DEP_CPP_INIT_=\
"..\akos.h"\
"..\boxes.h"\
"..\gfx.h"\
"..\scumm.h"\
"..\scummsys.h"\
"..\smush.h"\
"..\stdafx.h"\
"..\system.h"\
".\missing\unistd.h"\
NODEP_CPP_INIT_=\
"..\mixer.h"\
!ENDIF
# End Source File