View difference between Paste ID: BKeJHfv2 and tz8cR4F5
SHOW: | | - or go back to the newest paste.
1-
HashTable<String, Reference<HyperspaceLocation*> > hyperspaceLocationMap;
1+
2
private:
3
	String location;
4-
Private:
4+
5
	Vector3 position;
6
public:
7-
	int x;
7+
	HyperspaceLocation(String location, String scene, Vector3 position) {
8-
	int y;
8+
		this->location = location;
9-
	int z;
9+
		this->scene = scene;
10-
}
10+
		this->position = position;
11
	}
12-
void parseDataTableRow(DataTableRow* row) {
12+
13-
	row->getValue(0, location);
13+
	HyperspaceLocation(DataTableRow* row) {
14-
	row->getValue(1, scene);
14+
		parseDataTableRow(row);
15-
	row->getValue(2, x);
15+
16-
	row->getValue(3, y);
16+
17-
	row->getValue(4, Z);
17+
	inline String& getLocation() {
18-
}
18+
		return location;
19
	}
20-
inline String& getLocation() {
20+
21-
	return location;
21+
	inline String& getScene() {
22-
}
22+
		return scene;
23
	}
24-
inline String& getScene() {
24+
25-
	return scene;
25+
	inline int getX() {
26-
}
26+
		return position.getX();
27
	}
28-
inline int getXLocation() {
28+
		
29-
	return x();
29+
	inline int getY() {
30-
}
30+
		return position.getY();
31
	}
32-
inline int getYLocation() {
32+
		
33-
	return y();
33+
	inline int getZ() {
34-
}
34+
		return position.getZ();
35
	}
36-
inline int getZLocation() {
36+
37-
	return z();
37+
	void parseDataTableRow(DataTableRow* row) {
38-
}
38+
		row->getValue(0, location);
39
		row->getValue(1, scene);
40-
void SpaceManager::loadClientData() {
40+
		row->getValue(2, x);
41-
	IffStream* iffStream = TemplateManager::instance()->openIffFile("datatables/space/hyperspace/hyperspace_locations.iff");
41+
		row->getValue(3, y);
42
		row->getValue(4, Z);
43-
	if (iffStream == NULL) {
43+
44-
		error("Could not load hyperspace locations.");
44+
45-
		return;
45+