projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update interpreters to latest Garglk codebase
[projects/chimara/chimara.git]
/
interpreters
/
frotz
/
object.c
diff --git
a/interpreters/frotz/object.c
b/interpreters/frotz/object.c
index 22ffd080595e09d42c51c2f40161e59b6731d7e2..ed2108788d8ba830010337a4f5dffdb0f698db74 100644
(file)
--- a/
interpreters/frotz/object.c
+++ b/
interpreters/frotz/object.c
@@
-1,5
+1,5
@@
/* object.c - Object manipulation opcodes
/* object.c - Object manipulation opcodes
- *
Copyright (c) 1995-1997 Stefan Jokisch
+ * Copyright (c) 1995-1997 Stefan Jokisch
*
* This file is part of Frotz.
*
*
* This file is part of Frotz.
*
@@
-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
*
* 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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA
*/
#include "frotz.h"
*/
#include "frotz.h"
@@
-43,8
+43,6
@@
static zword object_address (zword obj)
{
static zword object_address (zword obj)
{
-/* zchar obj_num[10]; */
-
/* Check object number */
if (obj > ((h_version <= V3) ? 255 : MAX_OBJECT)) {
/* Check object number */
if (obj > ((h_version <= V3) ? 255 : MAX_OBJECT)) {
@@
-279,7
+277,7
@@
void z_clear_attr (void)
/* If we are monitoring attribute assignment display a short note */
/* If we are monitoring attribute assignment display a short note */
- if (
f_setup.
attribute_assignment) {
+ if (
option_
attribute_assignment) {
stream_mssg_on ();
print_string ("@clear_attr ");
print_object (zargs[0]);
stream_mssg_on ();
print_string ("@clear_attr ");
print_object (zargs[0]);
@@
-319,7
+317,7
@@
void z_jin (void)
/* If we are monitoring object locating display a short note */
/* If we are monitoring object locating display a short note */
- if (
f_setup.
object_locating) {
+ if (
option_
object_locating) {
stream_mssg_on ();
print_string ("@jin ");
print_object (zargs[0]);
stream_mssg_on ();
print_string ("@jin ");
print_object (zargs[0]);
@@
-379,7
+377,7
@@
void z_get_child (void)
/* If we are monitoring object locating display a short note */
/* If we are monitoring object locating display a short note */
- if (
f_setup.
object_locating) {
+ if (
option_
object_locating) {
stream_mssg_on ();
print_string ("@get_child ");
print_object (zargs[0]);
stream_mssg_on ();
print_string ("@get_child ");
print_object (zargs[0]);
@@
-491,7
+489,7
@@
void z_get_parent (void)
/* If we are monitoring object locating display a short note */
/* If we are monitoring object locating display a short note */
- if (
f_setup.
object_locating) {
+ if (
option_
object_locating) {
stream_mssg_on ();
print_string ("@get_parent ");
print_object (zargs[0]);
stream_mssg_on ();
print_string ("@get_parent ");
print_object (zargs[0]);
@@
-762,7
+760,7
@@
void z_insert_obj (void)
/* If we are monitoring object movements display a short note */
/* If we are monitoring object movements display a short note */
- if (
f_setup.
object_movement) {
+ if (
option_
object_movement) {
stream_mssg_on ();
print_string ("@move_obj ");
print_object (obj1);
stream_mssg_on ();
print_string ("@move_obj ");
print_object (obj1);
@@
-888,7
+886,7
@@
void z_remove_obj (void)
/* If we are monitoring object movements display a short note */
/* If we are monitoring object movements display a short note */
- if (
f_setup.
object_movement) {
+ if (
option_
object_movement) {
stream_mssg_on ();
print_string ("@remove_obj ");
print_object (zargs[0]);
stream_mssg_on ();
print_string ("@remove_obj ");
print_object (zargs[0]);
@@
-923,7
+921,7
@@
void z_set_attr (void)
/* If we are monitoring attribute assignment display a short note */
/* If we are monitoring attribute assignment display a short note */
- if (
f_setup.
attribute_assignment) {
+ if (
option_
attribute_assignment) {
stream_mssg_on ();
print_string ("@set_attr ");
print_object (zargs[0]);
stream_mssg_on ();
print_string ("@set_attr ");
print_object (zargs[0]);
@@
-973,7
+971,7
@@
void z_test_attr (void)
/* If we are monitoring attribute testing display a short note */
/* If we are monitoring attribute testing display a short note */
- if (
f_setup.
attribute_testing) {
+ if (
option_
attribute_testing) {
stream_mssg_on ();
print_string ("@test_attr ");
print_object (zargs[0]);
stream_mssg_on ();
print_string ("@test_attr ");
print_object (zargs[0]);