[Scummvm-cvs-logs] scummvm master -> 33abb6118f9551c6a4afc05ad35de6f630ccb152
sev-
sev at scummvm.org
Tue May 17 18:21:43 CEST 2016
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3aafeee19c SCUMM HE: Started work on Complex Array Operations
33abb6118f ALL: Change main engine header guard defines to <directory>_<engine>_H
Commit: 3aafeee19c6ebe9c5bd1f1840dd6fc809ed6a87d
https://github.com/scummvm/scummvm/commit/3aafeee19c6ebe9c5bd1f1840dd6fc809ed6a87d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-17T18:21:29+02:00
Commit Message:
SCUMM HE: Started work on Complex Array Operations
Changed paths:
engines/scumm/he/script_v100he.cpp
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 7fe1d88..e6d0cdc 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -625,42 +625,55 @@ void ScummEngine_v100he::o100_arrayOps() {
}
break;
case 132: // SO_COMPLEX_ARRAY_MATH_OPERATION
- // TODO: Used by room 2 script 2180 in Moonbase Commander (modify-line-of-sight)
- fetchScriptWord();
- fetchScriptWord();
- type = pop();
- pop();
- pop();
- pop();
- pop();
- pop();
- pop();
- pop();
- pop();
- dim1end = pop();
- dim1start = pop();
- dim2end = pop();
- dim2start = pop();
- id = readVar(array);
- if (id == 0) {
- defineArray(array, kDwordArray, dim2start, dim2end, dim1start, dim1end);
- }
- switch (type) {
- case 1:
- break;
- case 2:
- break;
- case 3:
- break;
- case 4:
- break;
- case 5:
+ {
+ // TODO: Used by room 2 script 2180 in Moonbase Commander (modify-line-of-sight)
+ int a2 = fetchScriptWord();
+ int a1 = fetchScriptWord();
+ type = pop();
+ int a1_dim1end = pop();
+ int a1_dim1start = pop();
+ int a1_dim2end = pop();
+ int a1_dim2start = pop();
+ int a2_dim1end = pop();
+ int a2_dim1start = pop();
+ int a2_dim2end = pop();
+ int a2_dim2start = pop();
+ dim1end = pop();
+ dim1start = pop();
+ dim2end = pop();
+ dim2start = pop();
+
+ int a12_num = a1_dim2end - a1_dim2start + 1;
+ int a11_num = a1_dim1end - a1_dim1start + 1;
+ int a22_num = a2_dim2end - a2_dim2start + 1;
+ int a21_num = a2_dim1end - a2_dim1start + 1;
+ int d12_num = dim2end - dim2start + 1;
+ int d11_num = dim1end - dim1start + 1;
+
+ id = readVar(array);
+ if (id == 0) {
+ defineArray(array, kDwordArray, dim2start, dim2end, dim1start, dim1end);
+ }
+ if (a12_num != a22_num || a12_num != d12_num || a11_num != a21_num || a11_num != d11_num) {
+ error("Operation size mismatch (%d vs %d)(%d vs %d)", a12_num, a22_num, a11_num, a21_num);
+ }
+ switch (type) {
+ case 1: // Addition
+ break;
+ case 2: // Subtraction
+ break;
+ case 3: // Binary AND
+ break;
+ case 4: // Binary OR
+ break;
+ case 5: // Binary XOR
+ break;
+ default:
+ error("o100_arrayOps: case 132 unknown type %d)", type);
+ }
+ warning("STUB: o100_arrayOps: case 132 type %d", type);
break;
- default:
- error("o100_arrayOps: case 132 unknown type %d)", type);
}
- warning("STUB: o100_arrayOps: case 132 type %d", type);
- break;
case 133: // SO_RANGE_ARRAY_ASSIGNMENT
b = pop();
c = pop();
Commit: 33abb6118f9551c6a4afc05ad35de6f630ccb152
https://github.com/scummvm/scummvm/commit/33abb6118f9551c6a4afc05ad35de6f630ccb152
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-17T18:21:30+02:00
Commit Message:
ALL: Change main engine header guard defines to <directory>_<engine>_H
Recently we started to use this as new semantics, although in the past
we used simly <engine>_H. Now these guard defines are consistent with
rest of the files which are used in the engines.
Changed paths:
engines/agi/agi.h
engines/cge/cge.h
engines/cge2/cge2.h
engines/cine/cine.h
engines/composer/composer.h
engines/draci/draci.h
engines/drascula/drascula.h
engines/dreamweb/dreamweb.h
engines/groovie/groovie.h
engines/hugo/hugo.h
engines/lastexpress/lastexpress.h
engines/lure/lure.h
engines/mohawk/mohawk.h
engines/neverhood/neverhood.h
engines/parallaction/parallaction.h
engines/pegasus/pegasus.h
engines/prince/prince.h
engines/queen/queen.h
engines/saga/saga.h
engines/sci/sci.h
engines/scumm/scumm.h
engines/sherlock/sherlock.h
engines/sky/sky.h
engines/sword1/sword1.h
engines/sword2/sword2.h
engines/sword25/sword25.h
engines/teenagent/teenagent.h
engines/testbed/testbed.h
engines/tinsel/tinsel.h
engines/toltecs/toltecs.h
engines/tony/tony.h
engines/touche/touche.h
engines/tsage/tsage.h
engines/tucker/tucker.h
engines/wintermute/wintermute.h
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 1baf0d9..79d05c4 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef AGI_H
-#define AGI_H
+#ifndef AGI_AGI_H
+#define AGI_AGI_H
#include "common/scummsys.h"
#include "common/error.h"
@@ -991,4 +991,4 @@ private:
} // End of namespace Agi
-#endif /* AGI_H */
+#endif /* AGI_AGI_H */
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index c43358f..d3f8a93 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef CGE_H
-#define CGE_H
+#ifndef CGE_CGE_H
+#define CGE_CGE_H
#include "common/random.h"
#include "common/savefile.h"
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index fbe4cb3..18f919b 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -25,8 +25,8 @@
* Copyright (c) 1994-1997 Janus B. Wisniewski and L.K. Avalon
*/
-#ifndef CGE2_H
-#define CGE2_H
+#ifndef CGE2_CGE2_H
+#define CGE2_CGE2_H
#include "common/random.h"
#include "common/savefile.h"
@@ -335,4 +335,4 @@ public:
} // End of namespace CGE2
-#endif // CGE2_H
+#endif // CGE2_CGE2_H
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 7c0191b..615e36d 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef CINE_H
-#define CINE_H
+#ifndef CINE_CINE_H
+#define CINE_CINE_H
#include "common/scummsys.h"
diff --git a/engines/composer/composer.h b/engines/composer/composer.h
index 234494e..d1a85e9 100644
--- a/engines/composer/composer.h
+++ b/engines/composer/composer.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef COMPOSER_H
-#define COMPOSER_H
+#ifndef COMPOSER_COMPOSER_H
+#define COMPOSER_COMPOSER_H
#include "common/ini-file.h"
#include "common/random.h"
diff --git a/engines/draci/draci.h b/engines/draci/draci.h
index 540c288..90afdbc 100644
--- a/engines/draci/draci.h
+++ b/engines/draci/draci.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef DRACI_H
-#define DRACI_H
+#ifndef DRACI_DRACI_H
+#define DRACI_DRACI_H
#include "engines/engine.h"
#include "common/random.h"
@@ -126,4 +126,4 @@ static inline long scummvm_lround(double val) { return (long)floor(val + 0.5); }
} // End of namespace Draci
-#endif // DRACI_H
+#endif // DRACI_DRACI_H
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index acca2e5..c879a83 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef DRASCULA_H
-#define DRASCULA_H
+#ifndef DRASCULA_DRASCULA_H
+#define DRASCULA_DRASCULA_H
#include "common/scummsys.h"
#include "common/archive.h"
@@ -784,4 +784,4 @@ protected:
} // End of namespace Drascula
-#endif /* DRASCULA_H */
+#endif /* DRASCULA_DRASCULA_H */
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 2e5fb42..45bacdb 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef DREAMWEB_H
-#define DREAMWEB_H
+#ifndef DREAMWEB_DREAMWEB_H
+#define DREAMWEB_DREAMWEB_H
#include "common/error.h"
#include "common/keyboard.h"
diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h
index d442d39..c2994d2 100644
--- a/engines/groovie/groovie.h
+++ b/engines/groovie/groovie.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef GROOVIE_H
-#define GROOVIE_H
+#ifndef GROOVIE_GROOVIE_H
+#define GROOVIE_GROOVIE_H
#include "groovie/debug.h"
#include "groovie/font.h"
@@ -132,4 +132,4 @@ private:
} // End of namespace Groovie
-#endif // GROOVIE_H
+#endif // GROOVIE_GROOVIE_H
diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h
index 27dfea8..85209af 100644
--- a/engines/hugo/hugo.h
+++ b/engines/hugo/hugo.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef HUGO_H
-#define HUGO_H
+#ifndef HUGO_HUGO_H
+#define HUGO_HUGO_H
#include "engines/engine.h"
@@ -341,4 +341,4 @@ private:
} // End of namespace Hugo
-#endif // Hugo_H
+#endif // HUGO_HUGO_H
diff --git a/engines/lastexpress/lastexpress.h b/engines/lastexpress/lastexpress.h
index b4098f3..b33784b 100644
--- a/engines/lastexpress/lastexpress.h
+++ b/engines/lastexpress/lastexpress.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef LASTEXPRESS_H
-#define LASTEXPRESS_H
+#ifndef LASTEXPRESS_LASTEXPRESS_H
+#define LASTEXPRESS_LASTEXPRESS_H
#include "lastexpress/debug.h"
#include "lastexpress/eventhandler.h"
@@ -146,4 +146,4 @@ private:
} // End of namespace LastExpress
-#endif // LASTEXPRESS_H
+#endif // LASTEXPRESS_LASTEXPRESS_H
diff --git a/engines/lure/lure.h b/engines/lure/lure.h
index af00197..71ce2d3 100644
--- a/engines/lure/lure.h
+++ b/engines/lure/lure.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef LURE_H
-#define LURE_H
+#ifndef LURE_LURE_H
+#define LURE_LURE_H
#include "engines/engine.h"
#include "common/rect.h"
diff --git a/engines/mohawk/mohawk.h b/engines/mohawk/mohawk.h
index 6fa733e..ac91dca 100644
--- a/engines/mohawk/mohawk.h
+++ b/engines/mohawk/mohawk.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef MOHAWK_H
-#define MOHAWK_H
+#ifndef MOHAWK_MOHAWK_H
+#define MOHAWK_MOHAWK_H
#include "common/scummsys.h"
#include "common/array.h"
diff --git a/engines/neverhood/neverhood.h b/engines/neverhood/neverhood.h
index 9eac4ff..4c5f9c3 100644
--- a/engines/neverhood/neverhood.h
+++ b/engines/neverhood/neverhood.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef NEVERHOOD_H
-#define NEVERHOOD_H
+#ifndef NEVERHOOD_NEVERHOOD_H
+#define NEVERHOOD_NEVERHOOD_H
#include "common/scummsys.h"
#include "common/events.h"
@@ -149,4 +149,4 @@ private:
} // End of namespace Neverhood
-#endif /* NEVERHOOD_H */
+#endif /* NEVERHOOD_NEVERHOOD_H */
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 6ea5058..c483989 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef PARALLACTION_H
-#define PARALLACTION_H
+#ifndef PARALLACTION_PARALLACTION_H
+#define PARALLACTION_PARALLACTION_H
#include "common/str.h"
#include "common/stack.h"
diff --git a/engines/pegasus/pegasus.h b/engines/pegasus/pegasus.h
index d88545a..57ae910 100644
--- a/engines/pegasus/pegasus.h
+++ b/engines/pegasus/pegasus.h
@@ -23,8 +23,8 @@
*
*/
-#ifndef PEGASUS_H
-#define PEGASUS_H
+#ifndef PEGASUS_PEGASUS_H
+#define PEGASUS_PEGASUS_H
#include "common/list.h"
#include "common/macresman.h"
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index 6dce044..82fcb15 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef PRINCE_H
-#define PRINCE_H
+#ifndef PRINCE_PRINCE_H
+#define PRINCE_PRINCE_H
#include "common/random.h"
#include "common/system.h"
diff --git a/engines/queen/queen.h b/engines/queen/queen.h
index c00e1b3..789025c 100644
--- a/engines/queen/queen.h
+++ b/engines/queen/queen.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEEN_H
-#define QUEEN_H
+#ifndef QUEEN_QUEEN_H
+#define QUEEN_QUEEN_H
#include "engines/engine.h"
#include "common/random.h"
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 06cb411..422eaa5 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef SAGA_H
-#define SAGA_H
+#ifndef SAGA_SAGA_H
+#define SAGA_SAGA_H
#include "engines/engine.h"
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 7df3d38..c49a516 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef SCI_H
-#define SCI_H
+#ifndef SCI_SCI_H
+#define SCI_SCI_H
#include "engines/engine.h"
#include "common/macresman.h"
@@ -460,4 +460,4 @@ const char *getSciVersionDesc(SciVersion version);
} // End of namespace Sci
-#endif // SCI_H
+#endif // SCI_SCI_H
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 6e0adc3..62386d3 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef SCUMM_H
-#define SCUMM_H
+#ifndef SCUMM_SCUMM_H
+#define SCUMM_SCUMM_H
#include "engines/engine.h"
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index d3b2d0c..0b4333e 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef SHERLOCK_HOLMES_H
-#define SHERLOCK_HOLMES_H
+#ifndef SHERLOCK_SHERLOCK_H
+#define SHERLOCK_SHERLOCK_H
#include "common/scummsys.h"
#include "common/array.h"
diff --git a/engines/sky/sky.h b/engines/sky/sky.h
index 5683300..374302b 100644
--- a/engines/sky/sky.h
+++ b/engines/sky/sky.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef SKY_H
-#define SKY_H
+#ifndef SKY_SKY_H
+#define SKY_SKY_H
#include "common/error.h"
diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h
index eb24ef7..8dab522 100644
--- a/engines/sword1/sword1.h
+++ b/engines/sword1/sword1.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef SWORD1_H
-#define SWORD1_H
+#ifndef SWORD1_SWORD1_H
+#define SWORD1_SWORD1_H
#include "engines/engine.h"
#include "common/error.h"
@@ -150,4 +150,4 @@ private:
} // End of namespace Sword1
-#endif //BSSWORD1_H
+#endif // SWORD1_SWORD1_H
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index ef5c2b2..65d1a95 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -22,8 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef SWORD2_H
-#define SWORD2_H
+#ifndef SWORD2_SWORD2_H
+#define SWORD2_SWORD2_H
#define FRAMES_PER_SECOND 12
diff --git a/engines/sword25/sword25.h b/engines/sword25/sword25.h
index 72391cf..c08f20e 100644
--- a/engines/sword25/sword25.h
+++ b/engines/sword25/sword25.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef SWORD25_H
-#define SWORD25_H
+#ifndef SWORD25_SWORD25_H
+#define SWORD25_SWORD25_H
#include "common/scummsys.h"
#include "engines/engine.h"
diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h
index 234bfb1..438f06d 100644
--- a/engines/teenagent/teenagent.h
+++ b/engines/teenagent/teenagent.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TEENAGENT_ENGINE_H
-#define TEENAGENT_ENGINE_H
+#ifndef TEENAGENT_TEENAGENT_H
+#define TEENAGENT_TEENAGENT_H
#include "engines/engine.h"
diff --git a/engines/testbed/testbed.h b/engines/testbed/testbed.h
index 0f70e11..5ea05fe 100644
--- a/engines/testbed/testbed.h
+++ b/engines/testbed/testbed.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TESTBED_H
-#define TESTBED_H
+#ifndef TESTBED_TESTBED_H
+#define TESTBED_TESTBED_H
#include "common/array.h"
@@ -72,4 +72,4 @@ private:
} // End of namespace Testbed
-#endif // TESTBED_H
+#endif // TESTBED_TESTBED_H
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index c83bc80..9e4ce61 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TINSEL_H
-#define TINSEL_H
+#ifndef TINSEL_TINSEL_H
+#define TINSEL_TINSEL_H
#include "common/scummsys.h"
#include "common/system.h"
@@ -251,4 +251,4 @@ void CdHasChanged();
} // End of namespace Tinsel
-#endif /* TINSEL_H */
+#endif /* TINSEL_TINSEL_H */
diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index 7a04f6e..ece82f4 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TOLTECS_H
-#define TOLTECS_H
+#ifndef TOLTECS_TOLTECS_H
+#define TOLTECS_TOLTECS_H
#include "common/scummsys.h"
#include "common/endian.h"
@@ -231,4 +231,4 @@ public:
} // End of namespace Toltecs
-#endif /* TOLTECS_H */
+#endif /* TOLTECS_TOLTECS_H */
diff --git a/engines/tony/tony.h b/engines/tony/tony.h
index 40bace8..fc47e1a 100644
--- a/engines/tony/tony.h
+++ b/engines/tony/tony.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TONY_H
-#define TONY_H
+#ifndef TONY_TONY_H
+#define TONY_TONY_H
#include "common/scummsys.h"
#include "common/system.h"
@@ -242,4 +242,4 @@ extern TonyEngine *g_vm;
} // End of namespace Tony
-#endif /* TONY_H */
+#endif /* TONY_TONY_H */
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index 33c415d..c76532b 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TOUCHE_ENGINE_H
-#define TOUCHE_ENGINE_H
+#ifndef TOUCHE_TOUCHE_H
+#define TOUCHE_TOUCHE_H
#include "common/array.h"
#include "common/endian.h"
diff --git a/engines/tsage/tsage.h b/engines/tsage/tsage.h
index dd077e5..ca29d68 100644
--- a/engines/tsage/tsage.h
+++ b/engines/tsage/tsage.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TSAGE_H
-#define TSAGE_H
+#ifndef TSAGE_TSAGE_H
+#define TSAGE_TSAGE_H
#include "engines/engine.h"
#include "gui/debugger.h"
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 2ab94de..1be4682 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef TUCKER_ENGINE_H
-#define TUCKER_ENGINE_H
+#ifndef TUCKER_TUCKER_H
+#define TUCKER_TUCKER_H
#include "common/file.h"
#include "common/util.h"
diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h
index f8f5fc7..f61a809 100644
--- a/engines/wintermute/wintermute.h
+++ b/engines/wintermute/wintermute.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef WINTERMUTE_H
-#define WINTERMUTE_H
+#ifndef WINTERMUTE_WINTERMUTE_H
+#define WINTERMUTE_WINTERMUTE_H
#include "engines/engine.h"
#include "engines/advancedDetector.h"
More information about the Scummvm-git-logs
mailing list