Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Remove] Map transitions are they were not in use.

Browse Source 
[Fix] Invisible collision in bottom left.
This commit is contained in:
Tamir Atias 2012-02-05 18:14:11 +02:00
parent 3e9c83428d
commit ac883d6b64
5 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Media/Maps/map
View File

@ -8,10 +8,6 @@
<solidEntity>false</solidEntity>
<zLevel>100</zLevel>
<mapTransition>map</mapTransition>
<mapTransX>0</mapTransX>
<mapTransY>0</mapTransY>
</tile>
<tile>
@ -2039,7 +2035,7 @@
<line>
<tile>
<tileTexture>grass</tileTexture>
<solidTile>true</solidTile>
<solidTile>false</solidTile>
<entityTexture>null</entityTexture>
<solidEntity>false</solidEntity>

4
src/Unuk/Player.cpp
View File

@ -113,10 +113,6 @@ void Player::SetCamera(void) {
void Player::Move() {
Character::Move();
if(map->GetMapTransitionName(tileX, tileY) != "null") {
SetXY((float)map->GetMapTransitionX(tileX, tileY), (float)map->GetMapTransitionY(tileX, tileY));
map->Load(map->GetMapTransitionName(tileX, tileY));
}
}
void Player::SetLevel(int level) {

30
src/libUnuk/LevelGen/LevelGen.cpp
View File

@ -98,24 +98,6 @@ void LevelGen::Load(const string filename) {
_tile[x][y].SetZLevel(atoi(dataElem->GetText()));
// </zlevel>
// <mapTransition>
dataElem = dataElem->NextSiblingElement("mapTransition");
assert(dataElem != NULL);
_tile[x][y].SetMapTransitionName(dataElem->GetText());
// </mapTransition>
// <mapTransX>
dataElem = dataElem->NextSiblingElement("mapTransX");
assert(dataElem != NULL);
// int mapTransX = atoi(dataElem->GetText()); // not referenced
// </mapTransX>
// <mapTransY>
dataElem = dataElem->NextSiblingElement("mapTransY");
assert(dataElem != NULL);
// int mapTransY = atoi(dataElem->GetText()); // not referenced
// </mapTransY>
tileElem = tileElem->NextSiblingElement("tile");
}
//</tile>
@ -391,15 +373,3 @@ int LevelGen::GetEntityHeight(int xArg, int yArg) {
int LevelGen::GetTileZLevel(int xArg, int yArg) {
return _tile[xArg + 1][yArg + 1].GetZLevel();
}
string LevelGen::GetMapTransitionName(int xArg, int yArg) {
return _tile[xArg + 1][yArg + 1].GetMapTransitionName();
}
int LevelGen::GetMapTransitionX(int xArg, int yArg) {
return _tile[xArg + 1][yArg + 1].GetMapTransitionX();
}
int LevelGen::GetMapTransitionY(int xArg, int yArg) {
return _tile[xArg + 1][yArg + 1].GetMapTransitionY();
}

4
src/libUnuk/LevelGen/LevelGen.h
View File

@ -41,10 +41,6 @@ public:
int GetTileZLevel(int xArg, int yArg);
string GetMapTransitionName(int xArg, int yArg);
int GetMapTransitionX(int xArg, int yArg);
int GetMapTransitionY(int xArg, int yArg);
string GetCurrentMap(void);
WorldManager& GetWorld(void) { return _world; }

13
src/libUnuk/LevelGen/MapTile.h
View File

@ -43,14 +43,6 @@ public:
void SetZLevel(int arg) { _zLevel = arg; }
int GetZLevel(void) { return _zLevel; }
// Map Transition Mutators.
void SetMapTransitionName(string arg) { _mapTransitionName = arg; }
string GetMapTransitionName(void) { return _mapTransitionName; }
void SetMapTransitionXY(int xArg, int yArg) { _mapTransitionX = xArg, _mapTransitionY = yArg; }
int GetMapTransitionX(void) { return _mapTransitionX; }
int GetMapTransitionY(void) { return _mapTransitionY; }
private:
MapElement _tile;
MapEntityGeneric _entity;
@ -58,9 +50,4 @@ private:
// -1 is a 'special' tile, the next tile that the player walks
// on is the players new zlevel.
int _zLevel;
// If not 'null', switch map when the player walks on this tile.
string _mapTransitionName;
int _mapTransitionX;
int _mapTransitionY;
};