X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=interpreters%2Ffrotz%2Ferr.c;h=81f2f14b2db1f736c9b7c804602b8803188054b8;hb=3c59ba5eef5cb4d39c06eb7f523b9c3b026bdc9b;hp=61ca78ce3bd13f8207740104f432f1cddc420107;hpb=b1f1dc50b22b30c4d7176e1ff7c0805e80fe0724;p=projects%2Fchimara%2Fchimara.git

diff --git a/interpreters/frotz/err.c b/interpreters/frotz/err.c
index 61ca78c..81f2f14 100644
--- a/interpreters/frotz/err.c
+++ b/interpreters/frotz/err.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "frotz.h"
@@ -48,6 +48,7 @@ static char *err_messages[] = {
     "Illegal window",
     "Illegal window property",
     "Print at illegal address",
+    "Illegal dictionary word length",
     "@jin called with object 0",
     "@get_child called with object 0",
     "@get_parent called with object 0",
@@ -100,8 +101,8 @@ void runtime_error (int errnum)
     if (errnum <= 0 || errnum > ERR_NUM_ERRORS)
 	return;
 
-    if (f_setup.err_report_mode == ERR_REPORT_FATAL
-	|| (!f_setup.ignore_errors && errnum <= ERR_MAX_FATAL)) {
+    if (option_err_report_mode == ERR_REPORT_FATAL
+	|| (!option_ignore_errors && errnum <= ERR_MAX_FATAL)) {
 	flush_buffer ();
 	os_fatal (err_messages[errnum - 1]);
 	return;
@@ -110,8 +111,8 @@ void runtime_error (int errnum)
     wasfirst = (error_count[errnum - 1] == 0);
     error_count[errnum - 1]++;
     
-    if ((f_setup.err_report_mode == ERR_REPORT_ALWAYS)
-	|| (f_setup.err_report_mode == ERR_REPORT_ONCE && wasfirst)) {
+    if ((option_err_report_mode == ERR_REPORT_ALWAYS)
+	|| (option_err_report_mode == ERR_REPORT_ONCE && wasfirst)) {
 	long pc;
 
 	GET_PC (pc);
@@ -121,7 +122,7 @@ void runtime_error (int errnum)
 	print_long (pc, 16);
 	print_char (')');
         
-	if (f_setup.err_report_mode == ERR_REPORT_ONCE) {
+	if (option_err_report_mode == ERR_REPORT_ONCE) {
 	    print_string (" (will ignore further occurrences)");
 	} else {
 	    print_string (" (occurence ");