[Scummvm-git-logs] scummvm master -> 5ff622189efa97344c74be2e9901f1df1c656ed7
sev-
sev at scummvm.org
Sun Jan 8 00:25:35 CET 2017
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:
5ff622189e DIRECTOR: Lingo: Added more D3 stubs
Commit: 5ff622189efa97344c74be2e9901f1df1c656ed7
https://github.com/scummvm/scummvm/commit/5ff622189efa97344c74be2e9901f1df1c656ed7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-08T00:24:59+01:00
Commit Message:
DIRECTOR: Lingo: Added more D3 stubs
Changed paths:
engines/director/lingo/lingo-builtins.cpp
engines/director/lingo/lingo.h
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 2dadf6c..1d93b9a 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -33,19 +33,18 @@ static struct BuiltinProto {
} builtins[] = {
// Math
{ "abs", Lingo::b_abs, 1, 1, true }, // D2
- { "atan", Lingo::b_atan, 1, 1, true }, // D4
- { "cos", Lingo::b_cos, 1, 1, true }, // D4
- { "exp", Lingo::b_exp, 1, 1, true }, // D4
- { "float", Lingo::b_float, 1, 1, true }, // D4
+ { "atan", Lingo::b_atan, 1, 1, true }, // D4
+ { "cos", Lingo::b_cos, 1, 1, true }, // D4
+ { "exp", Lingo::b_exp, 1, 1, true }, // D4
+ { "float", Lingo::b_float, 1, 1, true }, // D4
{ "integer", Lingo::b_integer, 1, 1, true },
- { "integerp", Lingo::b_integerp, 1, 1, true },
- { "log", Lingo::b_log, 1, 1, true }, // D4
- { "pi", Lingo::b_pi, 0, 0, true }, // D4
- { "power", Lingo::b_power, 2, 2, true }, // D4
+ { "log", Lingo::b_log, 1, 1, true }, // D4
+ { "pi", Lingo::b_pi, 0, 0, true }, // D4
+ { "power", Lingo::b_power, 2, 2, true }, // D4
{ "random", Lingo::b_random, 1, 1, true }, // D2
{ "sin", Lingo::b_sin, 1, 1, true },
{ "sqrt", Lingo::b_sqrt, 1, 1, true }, // D2
- { "tan", Lingo::b_tan, 1, 1, true }, // D4
+ { "tan", Lingo::b_tan, 1, 1, true }, // D4
// String
{ "chars", Lingo::b_chars, 3, 3, true }, // D2
{ "charToNum", Lingo::b_charToNum, 1, 1, true }, // D2
@@ -53,7 +52,6 @@ static struct BuiltinProto {
{ "numToChar", Lingo::b_numToChar, 1, 1, true }, // D2
{ "offset", Lingo::b_offset, 2, 2, true }, // D2
{ "string", Lingo::b_string, 1, 1, true }, // D2
- { "stringp", Lingo::b_stringp, 1, 1, true }, // D2
{ "value", Lingo::b_value, 1, 1, true }, // D2
// Files
{ "closeDA", Lingo::b_closeDA, 0, 0, false }, // D2
@@ -66,6 +64,7 @@ static struct BuiltinProto {
{ "setCallBack", Lingo::b_setCallBack, 2, 2, false }, // D3
{ "showResFile", Lingo::b_showResFile, 0, 1, false }, // D2
{ "showXlib", Lingo::b_showXlib, 0, 1, false }, // D2
+ { "xFactoryList", Lingo::b_xFactoryList, 1, 1, true }, // D3
// Control
{ "continue", Lingo::b_continue, 0, 0, false }, // D2
{ "dontPassEvent", Lingo::b_dontPassEvent, 0, 0, false }, // D2
@@ -84,17 +83,21 @@ static struct BuiltinProto {
// when mouseDown // D2
// when mouseUp // D2
// when timeOut // D2
+ // Types
+ { "floatP", Lingo::b_floatP, 1, 1, true }, // D3
+ { "ilk", Lingo::b_ilk, 1, 2, true }, // D4
+ { "integerp", Lingo::b_integerp, 1, 1, true }, // D2
+ { "objectp", Lingo::b_objectp, 1, 1, true }, // D2
+ { "stringp", Lingo::b_stringp, 1, 1, true }, // D2
+ { "symbolp", Lingo::b_symbolp, 1, 1, true }, // D2
// Misc
{ "alert", Lingo::b_alert, 1, 1, false }, // D2
{ "cursor", Lingo::b_cursor, 1, 1, false }, // D2
{ "printFrom", Lingo::b_printFrom, -1,0, false }, // D2
- { "ilk", Lingo::b_ilk, 1, 2, true }, // D4
// put // D2
// set // D2
- { "objectp", Lingo::b_objectp, 1, 1, true },
{ "showGlobals", Lingo::b_showGlobals, 0, 0, false }, // D2
{ "showLocals", Lingo::b_showLocals, 0, 0, false }, // D2
- { "symbolp", Lingo::b_symbolp, 1, 1, true }, // D2
// Score
{ "constrainH", Lingo::b_constrainH, 2, 2, true }, // D2
{ "constrainV", Lingo::b_constrainV, 2, 2, true }, // D2
@@ -123,6 +126,7 @@ static struct BuiltinProto {
{ "sound-fadeOut", Lingo::b_soundFadeOut, 1, 2, false }, // D3
{ "sound-playFile", Lingo::b_soundPlayFile, 2, 2, false }, // D3
{ "sound-stop", Lingo::b_soundStop, 1, 1, false }, // D3
+ { "soundBusy", Lingo::b_soundBusy, 1, 1, true }, // D3
// Constants
{ "backspace", Lingo::b_backspace, 0, 0, false }, // D2
{ "empty", Lingo::b_empty, 0, 0, false }, // D2
@@ -249,14 +253,6 @@ void Lingo::b_integer(int nargs) {
g_lingo->push(d);
}
-void Lingo::b_integerp(int nargs) {
- Datum d = g_lingo->pop();
- int res = (d.type == INT) ? 1 : 0;
- d.toInt();
- d.u.i = res;
- g_lingo->push(d);
-}
-
void Lingo::b_log(int nargs) {
Datum d = g_lingo->pop();
d.toFloat();
@@ -394,14 +390,6 @@ void Lingo::b_string(int nargs) {
g_lingo->push(d);
}
-void Lingo::b_stringp(int nargs) {
- Datum d = g_lingo->pop();
- int res = (d.type == STRING) ? 1 : 0;
- d.toInt();
- d.u.i = res;
- g_lingo->push(d);
-}
-
void Lingo::b_value(int nargs) {
Datum d = g_lingo->pop();
d.toInt();
@@ -491,6 +479,16 @@ void Lingo::b_showXlib(int nargs) {
delete d.u.s;
}
+void Lingo::b_xFactoryList(int nargs) {
+ Datum d = g_lingo->pop();
+
+ d.toString();
+
+ warning("STUB: b_xFactoryList(%s)", d.u.s->c_str());
+
+ delete d.u.s;
+}
+
///////////////////
// Control
///////////////////
@@ -550,10 +548,17 @@ void Lingo::b_startTimer(int nargs) {
warning("STUB: b_startTimer");
}
-
///////////////////
-// Misc
+// Types
///////////////////
+void Lingo::b_floatP(int nargs) {
+ Datum d = g_lingo->pop();
+ int res = (d.type == FLOAT) ? 1 : 0;
+ d.toInt();
+ d.u.i = res;
+ g_lingo->push(d);
+}
+
void Lingo::b_ilk(int nargs) {
Datum d = g_lingo->pop();
d.u.i = d.type;
@@ -561,6 +566,42 @@ void Lingo::b_ilk(int nargs) {
g_lingo->push(d);
}
+void Lingo::b_integerp(int nargs) {
+ Datum d = g_lingo->pop();
+ int res = (d.type == INT) ? 1 : 0;
+ d.toInt();
+ d.u.i = res;
+ g_lingo->push(d);
+}
+
+void Lingo::b_objectp(int nargs) {
+ Datum d = g_lingo->pop();
+ int res = (d.type == OBJECT) ? 1 : 0;
+ d.toInt();
+ d.u.i = res;
+ g_lingo->push(d);
+}
+
+void Lingo::b_stringp(int nargs) {
+ Datum d = g_lingo->pop();
+ int res = (d.type == STRING) ? 1 : 0;
+ d.toInt();
+ d.u.i = res;
+ g_lingo->push(d);
+}
+
+void Lingo::b_symbolp(int nargs) {
+ Datum d = g_lingo->pop();
+ int res = (d.type == SYMBOL) ? 1 : 0;
+ d.toInt();
+ d.u.i = res;
+ g_lingo->push(d);
+}
+
+
+///////////////////
+// Misc
+///////////////////
void Lingo::b_alert(int nargs) {
Datum d = g_lingo->pop();
@@ -577,14 +618,6 @@ void Lingo::b_cursor(int nargs) {
warning("STUB: b_cursor(%d)", d.u.i);
}
-void Lingo::b_objectp(int nargs) {
- Datum d = g_lingo->pop();
- int res = (d.type == OBJECT) ? 1 : 0;
- d.toInt();
- d.u.i = res;
- g_lingo->push(d);
-}
-
void Lingo::b_showGlobals(int nargs) {
warning("STUB: b_showGlobals");
}
@@ -593,14 +626,6 @@ void Lingo::b_showLocals(int nargs) {
warning("STUB: b_showLocals");
}
-void Lingo::b_symbolp(int nargs) {
- Datum d = g_lingo->pop();
- int res = (d.type == SYMBOL) ? 1 : 0;
- d.toInt();
- d.u.i = res;
- g_lingo->push(d);
-}
-
///////////////////
// Score
///////////////////
@@ -761,6 +786,12 @@ void Lingo::b_mciwait(int nargs) {
g_lingo->func_mciwait(*d.u.s);
}
+void Lingo::b_soundBusy(int nargs) {
+ g_lingo->printStubWithArglist("b_soundBusy", nargs);
+
+ g_lingo->dropStack(nargs);
+}
+
void Lingo::b_soundFadeIn(int nargs) {
g_lingo->printStubWithArglist("b_soundFadeIn", nargs);
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index cbc8011..5e7242a 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -304,7 +304,6 @@ public:
static void b_exp(int nargs);
static void b_float(int nargs);
static void b_integer(int nargs);
- static void b_integerp(int nargs);
static void b_log(int nargs);
static void b_pi(int nargs);
static void b_power(int nargs);
@@ -319,16 +318,19 @@ public:
static void b_numToChar(int nargs);
static void b_offset(int nargs);
static void b_string(int nargs);
- static void b_stringp(int nargs);
+ static void b_floatP(int nargs);
static void b_ilk(int nargs);
+ static void b_integerp(int nargs);
+ static void b_objectp(int nargs);
+ static void b_stringp(int nargs);
+ static void b_symbolp(int nargs);
+
static void b_alert(int nargs);
static void b_cursor(int nargs);
- static void b_objectp(int nargs);
static void b_printFrom(int nargs);
static void b_showGlobals(int nargs);
static void b_showLocals(int nargs);
- static void b_symbolp(int nargs);
static void b_value(int nargs);
static void b_constrainH(int nargs);
@@ -369,12 +371,14 @@ public:
static void b_setCallBack(int nargs);
static void b_showResFile(int nargs);
static void b_showXlib(int nargs);
+ static void b_xFactoryList(int nargs);
static void b_point(int nargs);
static void b_beep(int nargs);
static void b_mci(int nargs);
static void b_mciwait(int nargs);
+ static void b_soundBusy(int nargs);
static void b_soundFadeIn(int nargs);
static void b_soundFadeOut(int nargs);
static void b_soundPlayFile(int nargs);
More information about the Scummvm-git-logs
mailing list