Initial revision

svn-id: r4785

.cvsignore

@@ -1,6 +0,0 @@
-.deps
-.DS_Store
-.gdb_history
-*.s[0-9][0-9]
-*.c[0-9][0-9]
-scummvm

.indent.pro

@@ -1,15 +0,0 @@
--br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs
--npcs -nbap -l105
--Tbool -Tbyte -Tvoid -Tuint32 -Tuint8 -Tuint16 -Tint -Tint8 -Tint16 -Tint32
--TFILE
--TOSystem -TScumm -TThreadProc -TSoundProc -TEvent -TProperty
--TConfig -Thashconfig -TGameDetector -TSaveLoadEntry -TScummPoint
--TGui -TGuiWidget -TNewGui -TWidget -TDialog
--TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -TImageHeader -TRoomHeader
--TCodeHeader -TResHdr -TBompHeader -TBompDrawData -TBlastObject -TLoadedCostume
--TActor -TBox -TBoxCoords -TVirtScreen -TPathVertex -TPathNode -TFindObjectInRoom
--TMidiChannelAdl -TSoundEngine -TPart -TPlayer -TSong
--TSerializer -TMidiDriver -TIMuseInternal -TIMuseDriver -TStreamCallback
--TSoundMixer -TPlayingSoundHandle -TPremixProc -TMIDIEVENT -TFM_OPL
--TItem -TChild -TChild1 -TChild2 -TTimeEvent -TSubroutine -TSubroutineLine
--TFillOrCopyStruct -TTrack -TNoteRec -TMidiEvent

Makefile

@@ -1,15 +1,15 @@
 # $Header$
 
-CC       = g++
+CXX      = c++
 CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
 DEFINES  =
 LDFLAGS :=
-INCLUDES:= -I./ -I./sound
+INCLUDES:= -I. -Icommon -Iscumm -Isound
 LIBS	 = -lncurses
 
 # Uncomment this to activate the MAD lib for compressed sound files
-# DEFINES += -DCOMPRESSED_SOUND_FILE
-# LIBS    += -lmad
+DEFINES += -DCOMPRESSED_SOUND_FILE
+LIBS    += -lmad
 
 # Uncomment this to activate the ALSA lib for midi
 # DEFINES += -DUSE_ALSA
@@ -19,23 +19,23 @@ LIBS	 = -lncurses
 # Beware, only define one of them, otherwise the compilation will blow up.
 
 # Comment this if you want to disable SDL output
-OBJS	 = sdl.o
+OBJS	 = backends/sdl/sdl.o
 INCLUDES += `sdl-config --cflags`
 LIBS    += `sdl-config --libs`
 DEFINES += -DUNIX
 
 # Uncomment this (instead of the above) to activate the SDL with OpenGL output
-# OBJS	 = sdl_gl.o
+# OBJS	 = backends/sdl/sdl_gl.o
 # INCLUDES += `sdl-config --cflags`
 # LIBS    += `sdl-config --libs` -lGL
 # DEFINES += -DUNIX
 
 # Uncomment this in addition to the above if you compile on Mac OS X
-# LIBS	+= -framework QuickTime -framework AudioUnit
-# DEFINES += -DMACOSX
+LIBS	+= -framework QuickTime -framework AudioUnit
+DEFINES += -DMACOSX
 
 # Uncomment this if you rather want X11 output
-# OBJS     = x11.o
+# OBJS     = backends/x11/x11.o
 # DEFINES += -DUNIX -DX11_BACKEND
 # LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
 # INCLUDES+= -I/usr/X11R6/include

Makefile.common

@@ -4,31 +4,44 @@
 
 ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
 
-INCS	= scumm.h scummsys.h stdafx.h
+INCS	= scumm/scumm.h common/scummsys.h common/stdafx.h
 
-OBJS	+= util.o newgui.o gui/widget.o gui/dialog.o \
-	gui/ListWidget.o gui/ScrollBarWidget.o \
-	actor.o akos.o boxes.o bundle.o config-file.o costume.o debug.o \
-	debugrl.o engine.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
+COMMON_OBJS = common/config-file.o common/gameDetector.o common/main.o \
+	common/timer.o common/util.o
 
-DISTFILES=$(OBJS:.o=.cpp) Makefile scummvm.dsp scummvm.dsw stdafx.cpp \
-	whatsnew.txt readme.txt copying.txt \
-	actor.h akos.h boxes.h bundle.h cmdline.h config-file.h costume.h debug.h \
-	debugrl.h engine.h fb2opengl.h gameDetector.h gapi_keys.h gfx.h gui.h guimaps.h \
-	newgui.h object.h resource.h saveload.h scaler.h scumm.h scummsys.h smush.h \
-	sound.h stdafx.h system.h timer.h util.h sound/fmopl.h
+GUI_OBJS = gui/gui.o gui/newgui.o gui/widget.o gui/dialog.o gui/ListWidget.o \
+	gui/ScrollBarWidget.o 
+
+SCUMM_OBJS = scumm/actor.o scumm/akos.o scumm/boxes.o scumm/bundle.o \
+	scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/engine.o scumm/gfx.o \
+	scumm/imuse.o scumm/insane.o scumm/object.o scumm/resource.o \
+	scumm/resource_v3.o scumm/resource_v4.o scumm/saveload.o scumm/scaler.o \
+	scumm/script.o scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o \
+	scumm/string.o scumm/sys.o scumm/vars.o scumm/verbs.o
+
+SIMON_OBJS = simon/debug.o simon/items.o simon/midi.o simon/res.o simon/simon.o \
+	simon/sys.o simon/verb.o simon/vga.o
+
+SOUND_OBJS = sound/fmopl.o sound/mididrv.o sound/mixer.o sound/sound.o
+
+OBJS	+= $(COMMON_OBJS) $(GUI_OBJS) scumm/libscumm.a simon/libsimon.a $(SOUND_OBJS)
+
+DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
+	debugrl.h whatsnew.txt readme.txt copying.txt \
+	scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h
 
 all: scummvm$(EXEEXT)
 
 scummvm$(EXEEXT): $(OBJS)
-	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
+
+scumm/libscumm.a: $(SCUMM_OBJS)
+	ar cru $@ $+
+	ranlib $@ 
+
+simon/libsimon.a: $(SIMON_OBJS)
+	ar cru $@ $+
+	ranlib $@ 
 
 clean:
 	rm -f $(OBJS) scummvm$(EXEEXT)
@@ -37,7 +50,7 @@ clean:
 
 # Default (dumb) compile & dependcy rules
 .cpp.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+	$(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 $(OBJS): $(INCS)
 
 
@@ -45,10 +58,10 @@ $(OBJS): $(INCS)
 # 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"
+#	mkdir -p $(*D)/$(DEPDIR)
+#	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+#	echo -n "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
+#	cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
+#	rm -f "$(*D)/$(DEPDIR)/$(*F).d2"
 #
 #-include $(DEPDIR)/*.d

Makefile.irix

@@ -1,21 +0,0 @@
-# $Header$
-
-CC      = CC
-CFLAGS  = -O2 -Olimit 9000 -mips2
-#CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
-# Remove -DHAVE_NO_BOOL if your compiler has a builtin bool type
-DEFINES = -DUNIX -DHAVE_NO_BOOL -DCOMPRESSED_SOUND_FILE
-LDFLAGS :=
-INCLUDES:= `sdl-config --cflags` -I./ -I./sound
-CPPFLAGS= $(DEFINES) $(INCLUDES)
-
-# Add -lmad for -DCOMPRESSED_SOUND_FILE
-LIBS   = `sdl-config --libs` -lmad -lm
-
-OBJS	= sdl.o
-
-include Makefile.common
-
-dist:
-	rm -f $(ZIPFILE)
-	zip -q $(ZIPFILE) $(DISTFILES)

Makefile.mingw

@@ -1,45 +0,0 @@
-# Where is scummvm will be installed
-SCUMMVMPATH=C:/scummvm
-SRC=.
-VPATH=$(SRC)
-
-### Modify these paths
-SDL_CFLAGS=-I$(SRC)/sdl/include
-SDL_LIBS=-L$(SRC)/sdl/lib -lSDLmain -lSDL
-
-# If MAD (MPEG Audio Decoder) header and library isn't installed remove -lmad and -DCOMPRESSED_SOUND_FILE
-CC      = g++
-CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
-DEFINES = -DCOMPRESSED_SOUND_FILE
-LDFLAGS :=-mwindows -mconsole
-INCLUDES:= $(SDL_CFLAGS) -I./ -I./sound
-CPPFLAGS= $(DEFINES) $(INCLUDES)
-LIBS	= -lmingw32 -lwinmm -lmad $(SDL_LIBS)
-EXEEXT	:=.exe
-
-# Uncomment this for SDL normal output
-OBJS	= sdl.o scummvmico.o
-# Or uncomment this for SDL with OpenGL output
-#OBJS	= sdl_gl.o scummvmico.o
-#LIBS += -lopengl32
-
-include Makefile.common
-
-scummvmico.o: scummvm.ico
-	windres scummvm.rc scummvmico.o
-
-
-# Some additional targets
-install:   scummvm$(EXEEXT)
-	mkdir -p $(SCUMMVMPATH)
-	strip scummvm$(EXEEXT) -o $(SCUMMVMPATH)/scummvm$(EXEEXT)
-
-dist:   install
-	cp copying.txt $(SCUMMVMPATH)
-	cp readme.txt $(SCUMMVMPATH)
-	cp whatsnew.txt $(SCUMMVMPATH)
-	cp SDL/README-SDL.txt $(SCUMMVMPATH)
-	cp SDL/lib/SDL.dll $(SCUMMVMPATH)
-	u2d $(SCUMMVMPATH)/*.txt
-
-.PHONY: install dist

Makefile.qtopia

@@ -1,20 +0,0 @@
-# $Header$
-
-CC      = arm-linux-g++
-CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
-DEFINES = -DUNIX -DCOMPRESSED_SOUND_FILE -DBYPASS_COPY_PROT -DQTOPIA -DSCUMM_NEED_ALIGNMENT 
-LDFLAGS :=
-INCLUDES:= `/opt/Qtopia/sharp/bin/sdl-config --cflags` -I./ -I./sound
-CPPFLAGS= $(DEFINES) $(INCLUDES)
-
-# Add -lmad for -DCOMPRESSED_SOUND_FILE
-LIBS	= `/opt/Qtopia/sharp/bin/sdl-config --libs` -lmad
-#-lncurses
-
-OBJS	= sdl.o
-
-include Makefile.common
-
-dist:
-	rm -f $(ZIPFILE)
-	zip -q $(ZIPFILE) $(DISTFILES)

backends/morphos/Makefile

@@ -14,15 +14,14 @@ INCS	= scumm.h scummsys.h stdafx.h
 
 GUIOBJS = widget.o dialog.o newgui.o ListWidget.o ScrollBarWidget.o
 
-SCUMMOBJS = actor.o akos.o boxes.o bundle.o costume.o debug.o debugrl.o gfx.o \
-	object.o saveload.o script.o scummvm.o sound.o string.o sys.o vars.o verbs.o \
-	script_v1.o script_v2.o gui.o imuse.o insane.o resource.o resource_v3.o resource_v4.o
-
 SIMONOBJS =	midi.o simon.o simondebug.o simonitems.o simonres.o simonsys.o simonverb.o simonvga.o
 
-OBJS	= config-file.o engine.o gameDetector.o fmopl.o mixer.o mididrv.o util.o main.o \
+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 \
-	$(GUIOBJS) $(SCUMMOBJS) $(SIMONOBJS)
+	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 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 \
 	windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \

common/gameDetector.cpp

@@ -22,11 +22,11 @@
 
 
 #include "stdafx.h"
-#include "scumm.h"
+#include "scumm/scumm.h"
 #include "sound/mididrv.h"
-#include "sound/imuse.h"
-#include "gameDetector.h"
-#include "config-file.h"
+#include "scumm/imuse.h"
+#include "common/gameDetector.h"
+#include "common/config-file.h"
 
 
 #define CHECK_OPTION() if ((current_option != NULL) || (*s != '\0')) goto ShowHelpAndExit

common/stdafx.h

@@ -2,6 +2,9 @@
  * $Id$
  *
  * $Log$
+ * Revision 1.1  2002/08/21 16:07:23  fingolfin
+ * Initial revision
+ *
  * Revision 1.18  2002/07/08 13:33:10  fingolfin
  * two more small QNX fixes
  *

debian/.cvsignore

@@ -1,6 +0,0 @@
-changelog
-files
-scummvm
-scummvm.postinst.debhelper
-scummvm.prerm.debhelper
-scummvm.substvars

debian/README.Debian

@@ -1,9 +0,0 @@
-scummvm for Debian
-------------------
-
- There is no documentation for the configuration file. For now you can use:
- scummvm -w -p[path] [options] game
- it will write a config file in ~/.scummvmrc and from then on you can just
- run 'scummvm game' and it will remember your options
-
- -- Bastien Nocera <hadess@hadess.net>, Friday 10 May 2002

debian/changelog.cvs

@@ -1,8 +0,0 @@
-scummvm (@VERSION@-1) unstable; urgency=low
-
-  * This is a CVS snapshot, don't file bugs on the Debian BTS if you use
-    this package. Instead use the Sourceforge bug tracker:
-    http://sourceforge.net/tracker/?group_id=37116
-
- -- Bastien Nocera <hadess@hadess.net>  Fri,  5 Apr 2002 16:37:09 +0100
-

debian/changelog.debian

@@ -1,22 +0,0 @@
-scummvm (0.2.0) unstable; urgency=low
-
-  * Release of ScummVM 0.2.0
-
-   -- James Brown <ender@enderboi.com>  Tue, 14 May 2002 18:16:02 +0800
-
-scummvm (0.1.0b-2) unstable; urgency=low
-
-  * Moved the scummvm main bin under /usr/lib, the wrapper script under
-    /usr/games
-  * Fixed bug in the script that made it not work if the path was relative
-
- -- Bastien Nocera <hadess@hadess.net>  Wed, 10 Apr 2002 19:27:05 +0100
-
-scummvm (0.1.0b-1) unstable; urgency=low
-
-  * Initial Release.
-  * Packaged made under the influence of beer at GUAD3C in Sevilla ! Arriba !
-    Ole !
-
- -- Bastien Nocera <hadess@hadess.net>  Fri,  5 Apr 2002 16:37:09 +0100
-

debian/changelog.debian_official

@@ -1,23 +0,0 @@
-scummvm (0.2.0) unstable; urgency=low
-
-  * New upstream version (Closes: #143281)
-  * Killed the wrapper script, see upstream changelog
-
- -- Bastien Nocera <hadess@hadess.net>  Wed, 15 May 2002 03:27:11 +0100
-
-scummvm (0.1.0b-2) unstable; urgency=low
-
-  * Moved the scummvm main bin under /usr/lib, the wrapper script under
-    /usr/games
-  * Fixed bug in the script that made it not work if the path was relative
-
- -- Bastien Nocera <hadess@hadess.net>  Wed, 10 Apr 2002 19:27:05 +0100
-
-scummvm (0.1.0b-1) unstable; urgency=low
-
-  * Initial Release.
-  * Packaged made under the influence of beer at GUAD3C in Sevilla ! Arriba !
-    Ole !
-
- -- Bastien Nocera <hadess@hadess.net>  Fri,  5 Apr 2002 16:37:09 +0100
-

debian/control

@@ -1,15 +0,0 @@
-Source: scummvm
-Section: contrib/games
-Priority: optional
-Maintainer: Bastien Nocera <hadess@hadess.net>
-Build-Depends: debhelper (>> 3.0.0), libsdl1.2-dev, libreadline4-dev, libncurses5-dev
-Standards-Version: 3.5.2
-
-Package: scummvm
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Engine to run some LucasArts adventure games
- The "Script Creation Utility for Maniac Mansion Virtual Machine" (scummvm for
- short) is an engine used to run a lot of LucasArts adventure games.
- .
- You will also need the data files from the game to be able to play it.

debian/copyright

@@ -1,16 +0,0 @@
-This package was debianized by Bastien Nocera <hadess@hadess.net> on
-Fri,  5 Apr 2002 16:37:09 +0100.
-
-It was downloaded from http://prdownloads.sourceforge.net/scummvm/
-
-Upstream Author(s): ScummVM team <scummvm-devel@lists.sourceforge.net>
-
-Copyright:
-
-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, or (at your option) any
-later version.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.

debian/prepare

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ ! -e debian/rules ] ; then
-	echo "Run from the top-level source directory as debian/prepare"
-	exit 1
-fi
-
-if [ -d CVS/ ] && [ $1 != "--nocvs" ]; then
-	TODATE=`date +%Y%m%d`
-	NEXT_VERSION=`grep SCUMMVM_VERSION scumm.h | sed 's,\#define\ SCUMMVM_VERSION\ \",,gi' | sed 's,\ devel\",,gi'`
-	cat debian/changelog.cvs | sed s/@VERSION@/$NEXT_VERSION.cvs$TODATE/g \
-	> debian/changelog.tmp && mv debian/changelog.tmp debian/changelog
-	exit 0
-else
-	if [ x$USER = xhadess ]; then
-		cp debian/changelog.debian_official debian/changelog
-	else
-		cp debian/changelog.debian debian/changelog
-	fi
-fi

debian/rules

@@ -1,48 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_COMPAT=3
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-build:
-	dh_testdir
-	$(MAKE)
-
-clean:
-	dh_testdir
-	dh_testroot
-	-$(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -m0777 scummvm $(CURDIR)/debian/scummvm/usr/games/scummvm
-	install -m0644 scummvm.6 \
-		$(CURDIR)/debian/scummvm/usr/share/man/man6
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs 
-	dh_installmanpages scummvm.6
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary install

debian/scummvm.dirs

@@ -1,3 +0,0 @@
-usr/games
-usr/lib/scummvm
-usr/share/man/man6

debian/scummvm.docs

@@ -1,2 +0,0 @@
-readme.txt
-whatsnew.txt

gui/dialog.cpp

@@ -28,7 +28,7 @@
 #include "ListWidget.h"
 #include "config-file.h"
 #include "sound/mididrv.h"
-#include "sound/imuse.h"
+#include "scumm/imuse.h"
 
 /*
  * TODO list
@@ -407,11 +407,29 @@ AboutDialog::AboutDialog(NewGui *gui)
 }
 
 PauseDialog::PauseDialog(NewGui *gui)
-	: Dialog (gui, 50, 80, 220, 16)
+	: Dialog (gui, 60, 20, 100, 100)
 {
 	addResText(4, 4, 220, 16, 10);
 }
 
+void PauseDialog::draw()
+{
+	if (_screenBuf) {
+		_gui->blitFrom(_screenBuf, _x, _y, _w, _h); 
+	} else {
+		_gui->fillRect(_x, _y, _w, _h, _gui->_bgcolor);
+		_gui->box(_x, _y, _w, _h);
+	}
+	_gui->addDirtyRect(_x, _y, _w, _h);
+	
+	_gui->frameRect(10 + _x, 15 + _y, 100, 100, _gui->_color);
+	for (int y = 0; y < 16; ++y)
+		for (int x = 0; x < 16; ++x)
+			_gui->fillRect(10 + _x + x*5, 15 + _y + y*5, 5, 5, y*16 + x);
+
+
+}
+
 SoundDialog::SoundDialog(NewGui *gui)
 	: Dialog (gui, 30, 20, 260, 110)
 {