[Scummvm-git-logs] scummvm master -> d49861fc1a8f15f8690cd66fb43ae420e71a7f93
sev-
sev at scummvm.org
Mon Dec 5 22:06:50 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d49861fc1a FULLPIPE: Implemented ModalMap::getSceneHPicture()
Commit: d49861fc1a8f15f8690cd66fb43ae420e71a7f93
https://github.com/scummvm/scummvm/commit/d49861fc1a8f15f8690cd66fb43ae420e71a7f93
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-05T22:06:38+01:00
Commit Message:
FULLPIPE: Implemented ModalMap::getSceneHPicture()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/modal.cpp
engines/fullpipe/modal.h
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 2818397..6b77f59 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -162,6 +162,44 @@ namespace Fullpipe {
#define PIC_MAP_S36 5260
#define PIC_MAP_S37 5261
#define PIC_MAP_S38 5262
+#define PIC_MAP_H01 5357
+#define PIC_MAP_H02 5358
+#define PIC_MAP_H03 5359
+#define PIC_MAP_H04 5360
+#define PIC_MAP_H05 5361
+#define PIC_MAP_H06 5362
+#define PIC_MAP_H07 5363
+#define PIC_MAP_H08 5364
+#define PIC_MAP_H09 5365
+#define PIC_MAP_H10 5366
+#define PIC_MAP_H11 5367
+#define PIC_MAP_H12 5368
+#define PIC_MAP_H13 5369
+#define PIC_MAP_H14 5370
+#define PIC_MAP_H15 5371
+#define PIC_MAP_H16 5372
+#define PIC_MAP_H17 5373
+#define PIC_MAP_H18 5394
+#define PIC_MAP_H19 5393
+#define PIC_MAP_H20 5374
+#define PIC_MAP_H21 5375
+#define PIC_MAP_H22 5376
+#define PIC_MAP_H23 5377
+#define PIC_MAP_H24 5378
+#define PIC_MAP_H25 5379
+#define PIC_MAP_H26 5380
+#define PIC_MAP_H27 5381
+#define PIC_MAP_H28 5382
+#define PIC_MAP_H29 5383
+#define PIC_MAP_H30 5384
+#define PIC_MAP_H31 5385
+#define PIC_MAP_H32 5386
+#define PIC_MAP_H33 5387
+#define PIC_MAP_H34 5388
+#define PIC_MAP_H35 5389
+#define PIC_MAP_H36 5390
+#define PIC_MAP_H37 5391
+#define PIC_MAP_H38 5392
#define PIC_TTL_CREDITS 5172
#define QU_INTR_STARTINTRO 5133
#define SC_1 301
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 9c7c0f7..49e9be6 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -551,6 +551,93 @@ PictureObject *ModalMap::getScenePicture() {
error("ModalMap::getScenePicture(): Unknown scene id: %d", g_fp->_currentScene->_sceneId);
}
+PictureObject *ModalMap::getSceneHPicture(PictureObject *obj) {
+ if (!obj)
+ return NULL;
+
+ switch (obj->_id) {
+ case PIC_MAP_S01:
+ return _mapScene->getPictureObjectById(PIC_MAP_H01, 0);
+ case PIC_MAP_S02:
+ return _mapScene->getPictureObjectById(PIC_MAP_H02, 0);
+ case PIC_MAP_S03:
+ return _mapScene->getPictureObjectById(PIC_MAP_H03, 0);
+ case PIC_MAP_S04:
+ return _mapScene->getPictureObjectById(PIC_MAP_H04, 0);
+ case PIC_MAP_S05:
+ return _mapScene->getPictureObjectById(PIC_MAP_H05, 0);
+ case PIC_MAP_S06:
+ return _mapScene->getPictureObjectById(PIC_MAP_H06, 0);
+ case PIC_MAP_S07:
+ return _mapScene->getPictureObjectById(PIC_MAP_H07, 0);
+ case PIC_MAP_S09:
+ return _mapScene->getPictureObjectById(PIC_MAP_H09, 0);
+ case PIC_MAP_S08:
+ return _mapScene->getPictureObjectById(PIC_MAP_H08, 0);
+ case PIC_MAP_S10:
+ return _mapScene->getPictureObjectById(PIC_MAP_H10, 0);
+ case PIC_MAP_S11:
+ return _mapScene->getPictureObjectById(PIC_MAP_H11, 0);
+ case PIC_MAP_S12:
+ return _mapScene->getPictureObjectById(PIC_MAP_H12, 0);
+ case PIC_MAP_S13:
+ return _mapScene->getPictureObjectById(PIC_MAP_H13, 0);
+ case PIC_MAP_S14:
+ return _mapScene->getPictureObjectById(PIC_MAP_H14, 0);
+ case PIC_MAP_S15:
+ return _mapScene->getPictureObjectById(PIC_MAP_H15, 0);
+ case PIC_MAP_S16:
+ return _mapScene->getPictureObjectById(PIC_MAP_H16, 0);
+ case PIC_MAP_S17:
+ return _mapScene->getPictureObjectById(PIC_MAP_H17, 0);
+ case PIC_MAP_S1819:
+ return _mapScene->getPictureObjectById(PIC_MAP_H18, 0);
+ case PIC_MAP_S20:
+ return _mapScene->getPictureObjectById(PIC_MAP_H20, 0);
+ case PIC_MAP_S21:
+ return _mapScene->getPictureObjectById(PIC_MAP_H21, 0);
+ case PIC_MAP_S22:
+ return _mapScene->getPictureObjectById(PIC_MAP_H22, 0);
+ case PIC_MAP_S23_1:
+ case PIC_MAP_S23_2:
+ return _mapScene->getPictureObjectById(PIC_MAP_H23, 0);
+ case PIC_MAP_S24:
+ return _mapScene->getPictureObjectById(PIC_MAP_H24, 0);
+ case PIC_MAP_S25:
+ return _mapScene->getPictureObjectById(PIC_MAP_H25, 0);
+ case PIC_MAP_S26:
+ return _mapScene->getPictureObjectById(PIC_MAP_H26, 0);
+ case PIC_MAP_S27:
+ return _mapScene->getPictureObjectById(PIC_MAP_H27, 0);
+ case PIC_MAP_S28:
+ return _mapScene->getPictureObjectById(PIC_MAP_H28, 0);
+ case PIC_MAP_S29:
+ return _mapScene->getPictureObjectById(PIC_MAP_H29, 0);
+ case PIC_MAP_S30:
+ return _mapScene->getPictureObjectById(PIC_MAP_H30, 0);
+ case PIC_MAP_S31_1:
+ case PIC_MAP_S31_2:
+ return _mapScene->getPictureObjectById(PIC_MAP_H31, 0);
+ case PIC_MAP_S32_1:
+ case PIC_MAP_S32_2:
+ return _mapScene->getPictureObjectById(PIC_MAP_H32, 0);
+ case PIC_MAP_S33:
+ return _mapScene->getPictureObjectById(PIC_MAP_H33, 0);
+ case PIC_MAP_S34:
+ return _mapScene->getPictureObjectById(PIC_MAP_H34, 0);
+ case PIC_MAP_S35:
+ return _mapScene->getPictureObjectById(PIC_MAP_H35, 0);
+ case PIC_MAP_S36:
+ return _mapScene->getPictureObjectById(PIC_MAP_H36, 0);
+ case PIC_MAP_S37:
+ return _mapScene->getPictureObjectById(PIC_MAP_H37, 0);
+ case PIC_MAP_S38:
+ return _mapScene->getPictureObjectById(PIC_MAP_H38, 0);
+ default:
+ return NULL;
+ }
+}
+
void FullpipeEngine::openMap() {
if (!_modalObject) {
ModalMap *map = new ModalMap;
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index a08cb3b..349fc3b 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -117,6 +117,7 @@ class ModalMap : public BaseModalObject {
void initMap();
PictureObject *getScenePicture();
+ PictureObject *getSceneHPicture(PictureObject *obj);
};
class ModalFinal : public BaseModalObject {
More information about the Scummvm-git-logs
mailing list