| … | |
… | |
| 143 | } |
143 | } |
| 144 | |
144 | |
| 145 | for (@$add, @$update) { |
145 | for (@$add, @$update) { |
| 146 | my $owner = $_->owner; |
146 | my $owner = $_->owner; |
| 147 | if ($_->is_valid) { |
147 | if ($_->is_valid) { |
|
|
148 | # why the next line doesn't seem to work is a mystery... maybe !=? or maybe bool? |
| 148 | (delete $_->{model})->remove (delete $_->{iter}) if $_->{model} && $_->{model} != $m2; |
149 | (delete $_->{model})->remove (delete $_->{iter}) if $_->{model} && $_->{model} != $m2;#d# |
|
|
150 | #(delete $_->{model})->remove (delete $_->{iter}) if $_->{model};#d# |
| 149 | $_->{model} = $m2; |
151 | $_->{model} = $m2; |
|
|
152 | warn "iter before $_->{iter}\n";#d# |
| 150 | $m2->set ($_->{iter} ||= $m2->append, |
153 | $m2->set ($_->{iter} ||= $m2->append, |
| 151 | 0, $_, |
154 | 0, $_, |
| 152 | 1, $room->{name}, |
155 | 1, $room->{name}, |
| 153 | 2, (uc substr $gametype{$_->type}, 0, 1),#d# should use ->gametype_char, which also does P, S |
156 | 2, (uc substr $gametype{$_->type}, 0, 1),#d# should use ->gametype_char, which also does P, S |
| 154 | 3, $owner->{name}, |
157 | 3, $owner->{name}, |
| … | |
… | |
| 159 | 8, $_->{user1}->rank, |
162 | 8, $_->{user1}->rank, |
| 160 | 9, $_->moves, |
163 | 9, $_->moves, |
| 161 | 10, $_->{observers}, |
164 | 10, $_->{observers}, |
| 162 | 11, $_->rules, |
165 | 11, $_->rules, |
| 163 | ); |
166 | ); |
|
|
167 | warn "iter after $_->{iter}\n";#d# |
| 164 | } else { |
168 | } else { |
| 165 | (delete $_->{model})->remove (delete $_->{iter}) if $_->{model} && $_->{model} != $m1; |
169 | #(delete $_->{model})->remove (delete $_->{iter}) if $_->{model} && $_->{model} != $m1;#d# |
|
|
170 | (delete $_->{model})->remove (delete $_->{iter}) if $_->{model};#d# |
| 166 | $_->{model} = $m1; |
171 | $_->{model} = $m1; |
| 167 | $m1->set ($_->{iter} ||= $m1->append, |
172 | $m1->set ($_->{iter} ||= $m1->append, |
| 168 | 0, $_, |
173 | 0, $_, |
| 169 | 1, $room->{name}, |
174 | 1, $room->{name}, |
| 170 | 2, (uc substr $gametype{$_->type}, 0, 1),#d# should use ->gametype_char, which also does P, S |
175 | 2, (uc substr $gametype{$_->type}, 0, 1),#d# should use ->gametype_char, which also does P, S |
