Remove track aliases
This commit is contained in:
parent
68f4504a4a
commit
d6c0582c84
@ -29,8 +29,6 @@ const Constants = {
|
||||
unknownObjectType: true,
|
||||
unknownTrackType: true,
|
||||
spawnWithoutSpawnInfo: true,
|
||||
trackAliasAlreadyExists: true,
|
||||
trackAliasNoTrack: true,
|
||||
switchUndefinedModel: true,
|
||||
switchInvalidDataFormat: true,
|
||||
switchNoModel: true,
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
import { ElectrificationResolutionStatus } from './electrification-status.js';
|
||||
import SceneryParserLog from './scenery-parser-log.js';
|
||||
|
||||
export default class Scenery
|
||||
{
|
||||
@ -7,7 +6,6 @@ export default class Scenery
|
||||
signalBoxes = [];
|
||||
spawnPoints = [];
|
||||
bounds = { minX: Infinity, minZ: Infinity, maxX: -Infinity, maxZ: -Infinity };
|
||||
trackAliases = {};
|
||||
electrificationResolved = ElectrificationResolutionStatus.NOT_RESOLVED;
|
||||
static nextMiscId = 1;
|
||||
|
||||
@ -52,26 +50,6 @@ export default class Scenery
|
||||
return this.objects[category][id] ?? null;
|
||||
}
|
||||
|
||||
addTrackAlias(id, alias) {
|
||||
if(this.trackAliases[alias]) {
|
||||
SceneryParserLog.warn('trackAliasAlreadyExists', `Track alias "${alias}" already exists for track "${this.trackAliases[alias]}". Cannot add alias for "${id}"`);
|
||||
return;
|
||||
}
|
||||
|
||||
const track = this.getObject('tracks', id);
|
||||
if(!track) {
|
||||
SceneryParserLog.warn('trackAliasNoTrack', `Cannot add alias "${alias}" for non-existing track "${id}"`);
|
||||
return;
|
||||
}
|
||||
|
||||
track.aliases.push(alias);
|
||||
this.trackAliases[alias] = id;
|
||||
}
|
||||
|
||||
getTrackIdByAlias(idOrAlias) {
|
||||
return this.trackAliases[idOrAlias] || idOrAlias;
|
||||
}
|
||||
|
||||
_updateBounds(objBounds) {
|
||||
if(!objBounds || !Array.isArray(objBounds)) return;
|
||||
|
||||
|
||||
@ -157,7 +157,6 @@ export default class Switch extends SceneryObject {
|
||||
|
||||
trackObj.switch = this;
|
||||
scenery.addObject(trackObj);
|
||||
scenery.addTrackAlias(trackId, trackId);
|
||||
|
||||
return trackObj;
|
||||
}
|
||||
|
||||
@ -38,14 +38,11 @@ export default class TrackObject extends SceneryObject {
|
||||
if(this.applied) return; // already applied
|
||||
this.applied = true;
|
||||
|
||||
// TODO: Is the scenery.getTrackIdByAlias needed?
|
||||
const trackId = scenery.getTrackIdByAlias(this.track_id);
|
||||
const track = scenery.getObject('tracks', trackId);
|
||||
const track = scenery.getObject('tracks', this.track_id);
|
||||
if (!track) {
|
||||
SceneryParserLog.warn('trackObjectCannotBeApplied', `TrackObject ${this.id} cannot be applied: track ${trackId} not found`)
|
||||
SceneryParserLog.warn('trackObjectCannotBeApplied', `TrackObject ${this.id} cannot be applied: track ${this.track_id} not found`)
|
||||
return;
|
||||
}
|
||||
|
||||
this.track = track;
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,6 @@ export default class Track extends SceneryObject {
|
||||
end_slope;
|
||||
prefab_name;
|
||||
hide_isolation = false;
|
||||
aliases = [];
|
||||
switch = null;
|
||||
electrificationStatus = ElectrificationStatus.NOT_CHECKED;
|
||||
hasNEVP = false;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user