From 96cc074ea0752165d2eb9281c9affeda8e5be5b1 Mon Sep 17 00:00:00 2001 From: WinterGrascph Date: Tue, 26 Apr 2016 14:44:01 +0200 Subject: DM: Create engine and detection with dummy data --- engines/dm/module.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 engines/dm/module.mk (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk new file mode 100644 index 0000000000..808b4e5c52 --- /dev/null +++ b/engines/dm/module.mk @@ -0,0 +1,17 @@ +MODULE := engines/dm + +MODULE_OBJS := \ + detection.o \ + dm.o + +MODULE_DIRS += \ + engines/dm + +# This module can be built as a plugin +ifeq ($(ENABLE_DM), DYNAMIC_PLUGIN) +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/rules.mk + -- cgit v1.2.3 From 055e789d0461f881b13cb4fe6e3331b1872eb633 Mon Sep 17 00:00:00 2001 From: WinterGrascph Date: Mon, 2 May 2016 20:58:55 +0200 Subject: DM: Create DisplayMan, add support parsing IMG0 files Add display manager named DisplayMan with functions: setUpScreens(), loadGraphics() (which loads graphics from the graphics.dat file), setPalette(..), loadIntoBitmap(..) which loads the requested image into a bitmap and blitToScreen(..) --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 808b4e5c52..3fad4ee9f4 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -2,7 +2,8 @@ MODULE := engines/dm MODULE_OBJS := \ detection.o \ - dm.o + dm.o \ + gfx.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From 05fbf0b3584c5bef1827ce43951b325a20ac40ac Mon Sep 17 00:00:00 2001 From: WinterGrascph Date: Thu, 12 May 2016 22:44:30 +0200 Subject: DM: Add dungeonman.o to module.mk, fix _bitmaps memory leak --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 3fad4ee9f4..ca425c5ffb 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -3,7 +3,8 @@ MODULE := engines/dm MODULE_OBJS := \ detection.o \ dm.o \ - gfx.o + gfx.o \ + dungeonman.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From ad8fbaa118e26cb57d3d77ddb7a597c2b37a9f76 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Wed, 15 Jun 2016 10:41:33 +0200 Subject: DM: Add event manager --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index ca425c5ffb..3078fa54ab 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -4,7 +4,8 @@ MODULE_OBJS := \ detection.o \ dm.o \ gfx.o \ - dungeonman.o + dungeonman.o \ + eventman.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From 98c79f89bf2c5860f39a6ec7ca88a01a2f987323 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Fri, 17 Jun 2016 14:29:05 +0200 Subject: DM: Add mouse input processing and display for movement arrows --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 3078fa54ab..ed2e2ea442 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -5,7 +5,8 @@ MODULE_OBJS := \ dm.o \ gfx.o \ dungeonman.o \ - eventman.o + eventman.o \ + menus.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From 9b57cdb8ddc6e8c199bd47d1ca04ce49c3280e6d Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Fri, 17 Jun 2016 22:32:42 +0200 Subject: DM: Add champion POD and it's enums --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index ed2e2ea442..1acf291453 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -6,7 +6,8 @@ MODULE_OBJS := \ gfx.o \ dungeonman.o \ eventman.o \ - menus.o + menus.o \ + champion.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From 3ff3512c64fd3e5245b45506203a8d5083598a88 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Sat, 18 Jun 2016 11:36:31 +0200 Subject: DM: Add initialization related to F0435_STARTEND_LoadGame_CPSF --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 1acf291453..45a6ed528d 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -7,7 +7,8 @@ MODULE_OBJS := \ dungeonman.o \ eventman.o \ menus.o \ - champion.o + champion.o \ + loadsave.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From 9d7f35cc8282f1ee6a41ea98d56388030435b4c4 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Sun, 19 Jun 2016 00:34:15 +0200 Subject: DM: Add ObjectMan --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 45a6ed528d..088caf82d3 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -8,7 +8,8 @@ MODULE_OBJS := \ eventman.o \ menus.o \ champion.o \ - loadsave.o + loadsave.o \ + objectman.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From f4f4c867a41a8bd306c3ec288e5b948ad1bf7e25 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Sun, 19 Jun 2016 16:17:28 +0200 Subject: DM: Add InventoryMan, G0041_s_Graphic562_Box_ViewportFloppyZzzCross --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 088caf82d3..3a7fa1038c 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -9,7 +9,8 @@ MODULE_OBJS := \ menus.o \ champion.o \ loadsave.o \ - objectman.o + objectman.o \ + inventory.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From a72bfe712da048fce3f32375826cd5724c6f9508 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 22 Jun 2016 23:20:58 +0200 Subject: DM: Fix link --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 3a7fa1038c..bc36e8b6eb 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -10,7 +10,8 @@ MODULE_OBJS := \ champion.o \ loadsave.o \ objectman.o \ - inventory.o + inventory.o \ + text.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From 23e0dfcc282a27ff16ba2891971de5ea5fe336c9 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Fri, 26 Aug 2016 22:36:31 +0200 Subject: DM: Add standard GPLv2 header --- engines/dm/module.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index bc36e8b6eb..b78ad9679e 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -1,3 +1,31 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# +# +# +# Based on the Reverse Engineering work of Christophe Fontanel, +# maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) +# + + MODULE := engines/dm MODULE_OBJS := \ -- cgit v1.2.3 From 4b67e047eda34ae4ee54f416355f3154bb08d56d Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Fri, 26 Aug 2016 22:37:14 +0200 Subject: DM: Add MovesensMan --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index b78ad9679e..bd9b57677b 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -39,7 +39,8 @@ MODULE_OBJS := \ loadsave.o \ objectman.o \ inventory.o \ - text.o + text.o \ + movesens.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From 36a29bbe867206d2b0b408550ad4ee15610c9276 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 29 Jun 2016 20:41:35 +0200 Subject: DM: Reorder files in MK file --- engines/dm/module.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index bd9b57677b..d5756c9d5f 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -29,18 +29,18 @@ MODULE := engines/dm MODULE_OBJS := \ + champion.o \ detection.o \ dm.o \ - gfx.o \ dungeonman.o \ eventman.o \ - menus.o \ - champion.o \ + gfx.o \ + inventory.o \ loadsave.o \ + menus.o \ + movesens.o \ objectman.o \ - inventory.o \ - text.o \ - movesens.o + text.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From 57ca9afcff6b688d438a7c02096141921f28fc36 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 29 Jun 2016 22:51:40 +0200 Subject: DM: Move two global arrays to DMEngine --- engines/dm/module.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index d5756c9d5f..28bcaa2a54 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -32,6 +32,7 @@ MODULE_OBJS := \ champion.o \ detection.o \ dm.o \ + dmglobals.o \ dungeonman.o \ eventman.o \ gfx.o \ -- cgit v1.2.3 From 5bb19fd2611dd28e6187b4d873de3f754a352b74 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Fri, 26 Aug 2016 22:41:19 +0200 Subject: DM: Add GroupMan, Group, ActiveGroup, F0196_GROUP_InitializeActiveGroups --- engines/dm/module.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 28bcaa2a54..721eb43db9 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -36,6 +36,7 @@ MODULE_OBJS := \ dungeonman.o \ eventman.o \ gfx.o \ + group.o \ inventory.o \ loadsave.o \ menus.o \ -- cgit v1.2.3 From d312ac086d0a1cd19c784e1fd7752652f8896ad8 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Thu, 30 Jun 2016 19:59:35 +0200 Subject: DM: Add dependencies for F0115_DUNGEONVIEW_DrawObjectsCreaturesProjectilesExplosions_CPSEF --- engines/dm/module.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 721eb43db9..a1460ae944 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -42,7 +42,8 @@ MODULE_OBJS := \ menus.o \ movesens.o \ objectman.o \ - text.o + text.o \ + timeline.o MODULE_DIRS += \ engines/dm -- cgit v1.2.3 From c95b23317ce179fe168a20f39a132b4cd9ec4f32 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Thu, 7 Jul 2016 00:46:51 +0200 Subject: DM: Add some missing code --- engines/dm/module.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index a1460ae944..50a8364cd4 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -42,6 +42,7 @@ MODULE_OBJS := \ menus.o \ movesens.o \ objectman.o \ + projexpl.o \ text.o \ timeline.o -- cgit v1.2.3 From e8bdaee8bf1404f42203c69def0a1f834f2ad386 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Mon, 25 Jul 2016 16:27:24 +0200 Subject: DM: Add DialogMan --- engines/dm/module.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 50a8364cd4..75b4385421 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -31,6 +31,7 @@ MODULE := engines/dm MODULE_OBJS := \ champion.o \ detection.o \ + dialog.o \ dm.o \ dmglobals.o \ dungeonman.o \ -- cgit v1.2.3 From 22d6973de5814a6229fb665a43882df1eb140048 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Mon, 1 Aug 2016 15:24:47 +0200 Subject: DM: Add sound loading --- engines/dm/module.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 75b4385421..bf1cef8694 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -44,6 +44,7 @@ MODULE_OBJS := \ movesens.o \ objectman.o \ projexpl.o \ + sounds.o \ text.o \ timeline.o -- cgit v1.2.3 From 50c5b39887288b34fd5c9eb25ade633bf43dff4d Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Wed, 10 Aug 2016 11:10:56 +0200 Subject: DM: Add debugger console --- engines/dm/module.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index bf1cef8694..559ebf1707 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -30,6 +30,7 @@ MODULE := engines/dm MODULE_OBJS := \ champion.o \ + console.o \ detection.o \ dialog.o \ dm.o \ -- cgit v1.2.3 From cc8d3d9dd72e4a7f77ea6f114d917300aa7d1689 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Tue, 16 Aug 2016 17:54:22 +0200 Subject: DM: Add LZW decompressor --- engines/dm/module.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dm/module.mk') diff --git a/engines/dm/module.mk b/engines/dm/module.mk index 559ebf1707..d495284da5 100644 --- a/engines/dm/module.mk +++ b/engines/dm/module.mk @@ -41,6 +41,7 @@ MODULE_OBJS := \ group.o \ inventory.o \ loadsave.o \ + lzw.o \ menus.o \ movesens.o \ objectman.o \ -- cgit v1.2.3