Differences From Artifact [7a1598ea36]:
- File src/DynamicEntity.m — part of check-in [5b7b7d2fc5] at 2025-03-24 22:14:24 on branch trunk — Convert player into a class (user: js, size: 6976) [annotate] [blame] [check-ins using]
To Artifact [ba58eb8bdf]:
- File
src/DynamicEntity.m
— part of check-in
[75e920ae30]
at
2025-03-29 14:25:43
on branch trunk
— Switch from clang-format to manual formatting
clang-format does too many weird things. (user: js, size: 6984) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
163 164 165 166 167 168 169 | .moving = _moving }; for (int i = 0; i < NUMGUNS; i++) data.ammo[i] = _ammo[i]; memcpy(data.name, _name.UTF8String, min(_name.UTF8StringLength, 259)); | | | | | | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | .moving = _moving }; for (int i = 0; i < NUMGUNS; i++) data.ammo[i] = _ammo[i]; memcpy(data.name, _name.UTF8String, min(_name.UTF8StringLength, 259)); if ([self isKindOfClass: Player.class]) { Player *player = (Player *)self; data.lifeSequence = player.lifeSequence, data.frags = player.frags; memcpy(data.team, player.team.UTF8String, min(player.team.UTF8StringLength, 259)); } if ([self isKindOfClass: Monster.class]) { Monster *monster = (Monster *)self; data.monsterState = monster.monsterState; data.monsterType = monster.monsterType; data.targetYaw = monster.targetYaw; data.trigger = monster.trigger; data.attackTarget = monster.attackTarget; data.anger = monster.anger; } return [OFData dataWithItems: &data count: sizeof(data)]; } - (void)setFromSerializedData: (OFData *)data { struct dynent d; if (data.count != sizeof(struct dynent)) @throw [OFOutOfRangeException exception]; memcpy(&d, data.items, data.count); |
︙ | ︙ | |||
235 236 237 238 239 240 241 | for (int i = 0; i < NUMGUNS; i++) _ammo[i] = d.ammo[i]; _blocked = d.blocked; _moving = d.moving; | | | | | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 | for (int i = 0; i < NUMGUNS; i++) _ammo[i] = d.ammo[i]; _blocked = d.blocked; _moving = d.moving; _name = [[OFString alloc] initWithUTF8String: d.name]; if ([self isKindOfClass: Player.class]) { Player *player = (Player *)self; player.lifeSequence = d.lifeSequence; player.frags = d.frags; player.team = @(d.team); } if ([self isKindOfClass: Monster.class]) { Monster *monster = (Monster *)self; monster.monsterState = d.monsterState; monster.monsterType = d.monsterType; monster.targetYaw = d.targetYaw; monster.trigger = d.trigger; monster.attackTarget = d.attackTarget; monster.anger = d.anger; |
︙ | ︙ |