@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | /** |
| 115 | 115 | * Test a bit in the SFLAGs slot of a SYNTAX |
| 116 | 116 | * |
| 117 | - * @param Itafroma\Zork\Struc\Syntax $s The syntax to test |
|
| 117 | + * @param Syntax $s The syntax to test |
|
| 118 | 118 | * @param int $bit The bit to test |
| 119 | 119 | * @return boolean FALSE if bit is set, TRUE otherwise |
| 120 | 120 | */ |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | /** |
| 126 | 126 | * Retrieves an object property. |
| 127 | 127 | * |
| 128 | - * @param Itafroma\Zork\Struc\StrucInterface $o The object to access. |
|
| 128 | + * @param StrucInterface $o The object to access. |
|
| 129 | 129 | * @param mixed $p The property to retrieve. |
| 130 | 130 | * @return mixed The property value. |
| 131 | 131 | */ |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | /** |
| 147 | 147 | * Sets an object property. |
| 148 | 148 | * |
| 149 | - * @param Itafroma\Zork\Struc\StrucInterface $o The object to modify. |
|
| 149 | + * @param StrucInterface $o The object to modify. |
|
| 150 | 150 | * @param mixed $p The property to modify. |
| 151 | 151 | * @param mixed $x The value to set. |
| 152 | 152 | */ |
@@ -91,18 +91,18 @@ |
||
| 91 | 91 | |
| 92 | 92 | // Globals for room |
| 93 | 93 | flagword(...[ |
| 94 | - 'RSEENBIT', // Visited? |
|
| 95 | - 'RLIGHTBIT', // Endogenous light source? |
|
| 96 | - 'RLANDBIT', // On land |
|
| 97 | - 'RWATERBIT', // Water room |
|
| 98 | - 'RAIRBIT', // Mid-air room |
|
| 94 | + 'RSEENBIT', // Visited? |
|
| 95 | + 'RLIGHTBIT', // Endogenous light source? |
|
| 96 | + 'RLANDBIT', // On land |
|
| 97 | + 'RWATERBIT', // Water room |
|
| 98 | + 'RAIRBIT', // Mid-air room |
|
| 99 | 99 | 'RSACREDBIT', // Thief not allowed |
| 100 | - 'RFILLBIT', // Can fill bottle here |
|
| 101 | - 'RMUNGBIT', // Room has been munged |
|
| 102 | - 'RBUCKBIT', // This room is a bucket |
|
| 103 | - 'RHOUSEBIT', // This room is part of the house |
|
| 104 | - 'RENDGAME', // This room is in the end game |
|
| 105 | - 'RNWALLBIT', // This room doesn't have walls |
|
| 100 | + 'RFILLBIT', // Can fill bottle here |
|
| 101 | + 'RMUNGBIT', // Room has been munged |
|
| 102 | + 'RBUCKBIT', // This room is a bucket |
|
| 103 | + 'RHOUSEBIT', // This room is part of the house |
|
| 104 | + 'RENDGAME', // This room is in the end game |
|
| 105 | + 'RNWALLBIT', // This room doesn't have walls |
|
| 106 | 106 | ]); |
| 107 | 107 | |
| 108 | 108 | // SFLAGs of a SYNTAX |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | // Given <FLAGWORD>'s usage in the rest of the original source, this could |
| 79 | 79 | // be simplified to a simple foreach loop. The use of array_walk_recursive() |
| 80 | 80 | // here is to emulate the use of MDL's <MAPF> SUBR in the original source. |
| 81 | - array_walk_recursive($fs, function($f) use ($oblists, &$tot, &$cnt) { |
|
| 81 | + array_walk_recursive($fs, function ($f) use ($oblists, &$tot, &$cnt) { |
|
| 82 | 82 | // It's unknown what the GROUP-GLUE symbol is in the oblist. It appears |
| 83 | 83 | // to be always empty. |
| 84 | 84 | if (is_scalar($f) && !lookup('GROUP-GLUE', $oblists->get('INITIAL'))) { |