aboutsummaryrefslogtreecommitdiff
path: root/engines/director/lingo
diff options
context:
space:
mode:
authorEugene Sandulenko2016-08-06 21:28:17 +0200
committerEugene Sandulenko2016-08-06 21:34:27 +0200
commit0204628f2692b79572ba477777605bbe8328fed8 (patch)
treeef612aa4decda0efedda060e4a5efc3816fc35ac /engines/director/lingo
parentbbc6e2aa6a0d36358ff11ae27a3099a5975b2780 (diff)
downloadscummvm-rg350-0204628f2692b79572ba477777605bbe8328fed8.tar.gz
scummvm-rg350-0204628f2692b79572ba477777605bbe8328fed8.tar.bz2
scummvm-rg350-0204628f2692b79572ba477777605bbe8328fed8.zip
DIRECTOR: Lingo: Added stubs for open*, do, pause commands
Diffstat (limited to 'engines/director/lingo')
-rw-r--r--engines/director/lingo/lingo-builtins.cpp136
-rw-r--r--engines/director/lingo/lingo.h20
2 files changed, 106 insertions, 50 deletions
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 58c1ef4460..180e434a6c 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -53,17 +53,22 @@ static struct BuiltinProto {
{ "closeDA", Lingo::b_closeDA, 0, 0, false },
{ "closeResFile", Lingo::b_closeResFile, 0, 1, false },
{ "closeXlib", Lingo::b_closeXlib, 0, 1, false },
- // Misc
- { "alert", Lingo::b_alert, 1, 1, false },
+ { "openDA", Lingo::b_openDA, 1, 1, false },
+ { "openResFile", Lingo::b_openResFile, 1, 1, false },
+ { "openXlib", Lingo::b_openXlib, 1, 1, false },
+ // Control
{ "continue", Lingo::b_continue, 0, 0, false },
- { "cursor", Lingo::b_cursor, 1, 1, false },
+ { "dontPassEvent", Lingo::b_dontPassEvent, 0, 0, false },
{ "delay", Lingo::b_delay, 1, 1, false },
{ "do", Lingo::b_do, 1, 1, false },
- { "dontPassEvent", Lingo::b_dontPassEvent, 0, 0, false },
+ { "nothing", Lingo::b_nothing, 0, 0, false },
+ { "pause", Lingo::b_pause, 0, 0, false },
+ // Misc
+ { "alert", Lingo::b_alert, 1, 1, false },
+ { "cursor", Lingo::b_cursor, 1, 1, false },
{ "editableText", Lingo::b_editableText, 0, 0, false },
{ "installMenu", Lingo::b_installMenu, 1, 1, false },
{ "moveableSprite", Lingo::b_moveableSprite,0, 0, false },
- { "nothing", Lingo::b_nothing, 0, 0, false },
{ "updatestage", Lingo::b_updatestage, 0, 0, false },
{ "ilk", Lingo::b_ilk, 1, 2, true },
// Point
@@ -241,74 +246,75 @@ void Lingo::b_string() {
}
///////////////////
-// Misc
+// Files
///////////////////
-void Lingo::b_dontPassEvent() {
- warning("STUB: b_dontPassEvent");
+void Lingo::b_closeDA() {
+ warning("STUB: b_closeDA");
}
-void Lingo::b_updatestage() {
- warning("STUB: b_updatestage");
+void Lingo::b_closeResFile() {
+ Datum d = g_lingo->pop();
+
+ d.toString();
+
+ warning("STUB: b_closeResFile(%s)", d.u.s->c_str());
+
+ delete d.u.s;
}
-void Lingo::b_ilk() {
+void Lingo::b_closeXlib() {
Datum d = g_lingo->pop();
- d.u.i = d.type;
- d.type = SYMBOL;
- g_lingo->push(d);
-}
-void Lingo::b_closeDA() {
- warning("STUB: b_closeDA");
-}
+ d.toString();
-void Lingo::b_continue() {
- warning("STUB: b_continue");
-}
+ warning("STUB: b_closeXlib(%s)", d.u.s->c_str());
-void Lingo::b_nothing() {
- warning("STUB: b_nothing");
+ delete d.u.s;
}
-void Lingo::b_alert() {
+void Lingo::b_openDA() {
Datum d = g_lingo->pop();
d.toString();
- warning("STUB: b_alert");
+ warning("STUB: b_openDA(%s)", d.u.s->c_str());
delete d.u.s;
}
-void Lingo::b_closeResFile() {
+void Lingo::b_openResFile() {
Datum d = g_lingo->pop();
d.toString();
- warning("STUB: c_closeResFile(%s)", d.u.s->c_str());
+ warning("STUB: b_openResFile(%s)", d.u.s->c_str());
delete d.u.s;
}
-void Lingo::b_closeXlib() {
+void Lingo::b_openXlib() {
Datum d = g_lingo->pop();
d.toString();
- warning("STUB: c_closeXlib(%s)", d.u.s->c_str());
+ warning("STUB: b_openXlib(%s)", d.u.s->c_str());
delete d.u.s;
}
-void Lingo::b_beep() {
- Datum d = g_lingo->pop();
- warning("STUB: b_beep(%d)", d.u.i);
+///////////////////
+// Control
+///////////////////
+void Lingo::b_dontPassEvent() {
+ warning("STUB: b_dontPassEvent");
}
-void Lingo::b_cursor() {
- Datum d = g_lingo->pop();
- d.toInt();
- warning("STUB: b_cursor(%d)", d.u.i);
+void Lingo::b_continue() {
+ warning("STUB: b_continue");
+}
+
+void Lingo::b_nothing() {
+ warning("STUB: b_nothing");
}
void Lingo::b_delay() {
@@ -317,6 +323,47 @@ void Lingo::b_delay() {
warning("STUB: b_delay(%d)", d.u.i);
}
+void Lingo::b_do() {
+ Datum d = g_lingo->pop();
+ d.toString();
+ warning("STUB: b_do(%s)", d.u.s->c_str());
+}
+
+void Lingo::b_pause() {
+ warning("STUB: b_pause");
+}
+
+
+///////////////////
+// Misc
+///////////////////
+void Lingo::b_updatestage() {
+ warning("STUB: b_updatestage");
+}
+
+void Lingo::b_ilk() {
+ Datum d = g_lingo->pop();
+ d.u.i = d.type;
+ d.type = SYMBOL;
+ g_lingo->push(d);
+}
+
+void Lingo::b_alert() {
+ Datum d = g_lingo->pop();
+
+ d.toString();
+
+ warning("STUB: b_alert");
+
+ delete d.u.s;
+}
+
+void Lingo::b_cursor() {
+ Datum d = g_lingo->pop();
+ d.toInt();
+ warning("STUB: b_cursor(%d)", d.u.i);
+}
+
void Lingo::b_editableText() {
warning("STUB: b_editableText");
}
@@ -331,13 +378,6 @@ void Lingo::b_moveableSprite() {
warning("STUB: b_moveableSprite(%d)", d.u.i);
}
-void Lingo::b_do() {
- Datum d = g_lingo->pop();
- d.toString();
- warning("STUB: b_do(%s)", d.u.s->c_str());
-}
-
-
///////////////////
// Point
@@ -360,4 +400,14 @@ void Lingo::b_point() {
}
+///////////////////
+// Sound
+///////////////////
+void Lingo::b_beep() {
+ Datum d = g_lingo->pop();
+ warning("STUB: b_beep(%d)", d.u.i);
+}
+
+
+
} // End of namespace Director
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index cda21dbe85..afb23dfa10 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -268,26 +268,32 @@ public:
static void b_string();
static void b_tan();
- static void b_dontPassEvent();
static void b_editableText();
static void b_installMenu();
static void b_updatestage();
static void b_ilk();
static void b_moveableSprite();
+ static void b_alert();
+ static void b_cursor();
+
+ static void b_dontPassEvent();
+ static void b_delay();
+ static void b_do();
static void b_nothing();
- static void b_closeDA();
static void b_continue();
+ static void b_pause();
- static void b_alert();
- static void b_beep();
+ static void b_closeDA();
static void b_closeResFile();
static void b_closeXlib();
- static void b_cursor();
- static void b_delay();
- static void b_do();
+ static void b_openDA();
+ static void b_openResFile();
+ static void b_openXlib();
static void b_point();
+ static void b_beep();
+
void func_mci(Common::String &s);
void func_mciwait(Common::String &s);
void func_goto(Common::String &frame, Common::String &movie);