aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBorja Lorente2016-08-24 11:43:58 +0200
committerBorja Lorente2016-08-24 11:59:30 +0200
commit841c22704c33057a292a1b0d44ba104d77dd8c18 (patch)
tree91b8afa9753632fc97a49c9daf1e1236b7428fb0
parentb7b258474f0a135f626ec3d46d19b4f54926f50f (diff)
downloadscummvm-rg350-841c22704c33057a292a1b0d44ba104d77dd8c18.tar.gz
scummvm-rg350-841c22704c33057a292a1b0d44ba104d77dd8c18.tar.bz2
scummvm-rg350-841c22704c33057a292a1b0d44ba104d77dd8c18.zip
MACVENTURE: Include border bitmaps in ScummVM
-rw-r--r--Makefile.common3
-rw-r--r--devtools/create_macventure/AltBox_act.bmpbin0 -> 822 bytes
-rw-r--r--devtools/create_macventure/AltBox_inac.bmpbin0 -> 822 bytes
-rw-r--r--devtools/create_macventure/InvWindow_act.bmpbin0 -> 16686 bytes
-rw-r--r--devtools/create_macventure/InvWindow_inac.bmpbin0 -> 8414 bytes
-rw-r--r--devtools/create_macventure/NoGrowDoc_act.bmpbin0 -> 8622 bytes
-rw-r--r--devtools/create_macventure/NoGrowDoc_inac.bmpbin0 -> 8622 bytes
-rw-r--r--devtools/create_macventure/PlainDBox_act.bmpbin0 -> 6966 bytes
-rw-r--r--devtools/create_macventure/PlainDBox_inac.bmpbin0 -> 6966 bytes
-rw-r--r--devtools/create_macventure/RDoc4_act.bmpbin0 -> 8694 bytes
-rw-r--r--devtools/create_macventure/RDoc4_inac.bmpbin0 -> 8694 bytes
-rw-r--r--devtools/create_macventure/ZoomDoc_act.bmpbin0 -> 11302 bytes
-rw-r--r--devtools/create_macventure/ZoomDoc_inac.bmpbin0 -> 8622 bytes
-rwxr-xr-xdevtools/create_macventure/create_macventure.sh8
-rw-r--r--engines/macventure/datafiles.cpp2
15 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common
index df24d397de..762b9051d0 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -285,6 +285,9 @@ endif
ifdef ENABLE_WINTERMUTE
DIST_FILES_ENGINEDATA+=wintermute.zip
endif
+ifdef ENABLE_MACVENTURE
+DIST_FILES_ENGINEDATA+=macventure.dat
+endif
DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA))
# pred.dic is currently only used for the AGI engine
diff --git a/devtools/create_macventure/AltBox_act.bmp b/devtools/create_macventure/AltBox_act.bmp
new file mode 100644
index 0000000000..aa9fa7e841
--- /dev/null
+++ b/devtools/create_macventure/AltBox_act.bmp
Binary files differ
diff --git a/devtools/create_macventure/AltBox_inac.bmp b/devtools/create_macventure/AltBox_inac.bmp
new file mode 100644
index 0000000000..aa9fa7e841
--- /dev/null
+++ b/devtools/create_macventure/AltBox_inac.bmp
Binary files differ
diff --git a/devtools/create_macventure/InvWindow_act.bmp b/devtools/create_macventure/InvWindow_act.bmp
new file mode 100644
index 0000000000..a38b0a9834
--- /dev/null
+++ b/devtools/create_macventure/InvWindow_act.bmp
Binary files differ
diff --git a/devtools/create_macventure/InvWindow_inac.bmp b/devtools/create_macventure/InvWindow_inac.bmp
new file mode 100644
index 0000000000..f3f2cfaa8b
--- /dev/null
+++ b/devtools/create_macventure/InvWindow_inac.bmp
Binary files differ
diff --git a/devtools/create_macventure/NoGrowDoc_act.bmp b/devtools/create_macventure/NoGrowDoc_act.bmp
new file mode 100644
index 0000000000..3570e798d9
--- /dev/null
+++ b/devtools/create_macventure/NoGrowDoc_act.bmp
Binary files differ
diff --git a/devtools/create_macventure/NoGrowDoc_inac.bmp b/devtools/create_macventure/NoGrowDoc_inac.bmp
new file mode 100644
index 0000000000..f3f97652e5
--- /dev/null
+++ b/devtools/create_macventure/NoGrowDoc_inac.bmp
Binary files differ
diff --git a/devtools/create_macventure/PlainDBox_act.bmp b/devtools/create_macventure/PlainDBox_act.bmp
new file mode 100644
index 0000000000..6521080588
--- /dev/null
+++ b/devtools/create_macventure/PlainDBox_act.bmp
Binary files differ
diff --git a/devtools/create_macventure/PlainDBox_inac.bmp b/devtools/create_macventure/PlainDBox_inac.bmp
new file mode 100644
index 0000000000..6521080588
--- /dev/null
+++ b/devtools/create_macventure/PlainDBox_inac.bmp
Binary files differ
diff --git a/devtools/create_macventure/RDoc4_act.bmp b/devtools/create_macventure/RDoc4_act.bmp
new file mode 100644
index 0000000000..ab78661359
--- /dev/null
+++ b/devtools/create_macventure/RDoc4_act.bmp
Binary files differ
diff --git a/devtools/create_macventure/RDoc4_inac.bmp b/devtools/create_macventure/RDoc4_inac.bmp
new file mode 100644
index 0000000000..ab78661359
--- /dev/null
+++ b/devtools/create_macventure/RDoc4_inac.bmp
Binary files differ
diff --git a/devtools/create_macventure/ZoomDoc_act.bmp b/devtools/create_macventure/ZoomDoc_act.bmp
new file mode 100644
index 0000000000..b2ccc9c602
--- /dev/null
+++ b/devtools/create_macventure/ZoomDoc_act.bmp
Binary files differ
diff --git a/devtools/create_macventure/ZoomDoc_inac.bmp b/devtools/create_macventure/ZoomDoc_inac.bmp
new file mode 100644
index 0000000000..963949b392
--- /dev/null
+++ b/devtools/create_macventure/ZoomDoc_inac.bmp
Binary files differ
diff --git a/devtools/create_macventure/create_macventure.sh b/devtools/create_macventure/create_macventure.sh
new file mode 100755
index 0000000000..1408179039
--- /dev/null
+++ b/devtools/create_macventure/create_macventure.sh
@@ -0,0 +1,8 @@
+printf "Creating border file...\n"
+
+zip -r macventure.zip *.bmp
+mv macventure.zip macventure.dat
+
+echo done
+
+ls -l macventure.dat
diff --git a/engines/macventure/datafiles.cpp b/engines/macventure/datafiles.cpp
index d41aa99d4c..2c17b66209 100644
--- a/engines/macventure/datafiles.cpp
+++ b/engines/macventure/datafiles.cpp
@@ -30,7 +30,7 @@
namespace MacVenture {
-#define MACVENTURE_DATA_BUNDLE Common::String("macventure.zip")
+#define MACVENTURE_DATA_BUNDLE Common::String("macventure.dat")
struct BorderName {
MVWindowType type;