mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-04 15:27:30 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored dependency on ClientEntityFactory to EntityFactory

Browse Source
This commit is contained in:
Collin Smith
2019-12-16 05:04:53 -08:00
parent 8c637e9ae6
commit 4ea338312c
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/riiablo/map/Map.java
View File

@ -25,7 +25,7 @@ import com.riiablo.codec.excel.Levels;
import com.riiablo.codec.excel.LvlPrest;
import com.riiablo.codec.excel.LvlTypes;
import com.riiablo.engine.Engine;
import com.riiablo.engine.client.ClientEntityFactory;
import com.riiablo.engine.EntityFactory;
import com.riiablo.engine.server.component.Warp;
import com.riiablo.map.pfa.AStarPathFinder;
import com.riiablo.map.pfa.Point2;
@ -323,6 +323,9 @@ public class Map implements Disposable {
final IntMap<DT1s> dt1s = new IntMap<>();
final Array<Zone> zones = new Array<>(); // TODO: replace with R-tree? https://en.wikipedia.org/wiki/R-tree
ComponentMapper<Warp> mWarp;
EntityFactory factory;
public Map(int seed, int diff) {
this.seed = seed;
this.diff = diff;
@ -765,7 +768,7 @@ public class Map implements Disposable {
final int x = this.x + (warpX * DT1.Tile.SUBTILE_SIZE);
final int y = this.y + (warpY * DT1.Tile.SUBTILE_SIZE);
if (entities == EMPTY_ENTITY_ARRAY) entities = new IntArray();
int entity = Riiablo.engine.getSystem(ClientEntityFactory.class).createWarp(map, this, index, x, y);
int entity = map.factory.createWarp(map, this, index, x, y);
entities.add(entity);
}
@ -779,10 +782,9 @@ public class Map implements Disposable {
}
public int findWarp(int id) {
ComponentMapper<Warp> mWarp = Riiablo.engine.getMapper(Warp.class);
for (int i = 0, size = entities.size; i < size; i++) {
int entityId = entities.get(i);
Warp warp = mWarp.get(entityId);
Warp warp = map.mWarp.get(entityId);
if (warp != null && warp.index == id) {
return entityId;
}
@ -1132,7 +1134,7 @@ public class Map implements Disposable {
final int y = zone.y + (ty * DT1.Tile.SUBTILE_SIZE);
for (int i = 0; i < ds1.numObjects; i++) {
DS1.Object obj = ds1.objects[i];
int entityId = Riiablo.engine.getSystem(ClientEntityFactory.class).createObject(zone.map, zone, this, obj, x + obj.x, y + obj.y);
int entityId = zone.map.factory.createObject(zone.map, zone, this, obj, x + obj.x, y + obj.y);
zone.addEntity(entityId); // FIXME: waypoints are placed correctly when adding 0.25f to ds1 object position -- is this consistent with others?
}
}

5
core/src/com/riiablo/screen/GameScreen.java
View File

@ -497,9 +497,10 @@ public class GameScreen extends ScreenAdapter implements GameLoadingScreen.Loada
engine = Riiablo.engine = new World(config);
// hacked until I can rewrite into proper system
engine.getInjector().inject(Act1MapBuilder.INSTANCE);
engine.inject(map);
engine.inject(Act1MapBuilder.INSTANCE);
if (mobileControls != null) engine.getInjector().inject(mobileControls);
if (mobileControls != null) engine.inject(mobileControls);
loadingScreen = new GameLoadingScreen(map, getDependencies());
}