Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reorder field.

Browse source
This commit is contained in:
Joris 2012-09-07 18:31:41 +02:00
parent 61c60d580f
commit 0be07616c6
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/include/map.h
View file

@ -150,16 +150,23 @@ public:
class CMap
{
public:
inline unsigned int getIndex(int x, int y) const {
unsigned int getIndex(int x, int y) const {
return x + y * this->Info.MapWidth;
}
unsigned int getIndex(const Vec2i &pos) const {
return getIndex(pos.x, pos.y);
}
inline CMapField *Field(unsigned int index) const {
CMapField *Field(unsigned int index) const {
return &this->Fields[index];
}
/// Get the MapField at location x,y
CMapField *Field(int x, int y) const {
return &this->Fields[x + y * this->Info.MapWidth];
}
CMapField *Field(const Vec2i &pos) const {
return Field(pos.x, pos.y);
}
/// Alocate and initialise map table.
void Create();
@ -195,14 +202,6 @@ public:
/// Save the map.
void Save(CFile &file) const;
/// Get the MapField at location x,y
inline CMapField *Field(int x, int y) const {
return &this->Fields[x + y * this->Info.MapWidth];
}
CMapField *Field(const Vec2i &pos) const {
return Field(pos.x, pos.y);
}
//
// Wall
//
@ -253,7 +252,6 @@ private:
public:
CMapField *Fields; /// fields on map
bool NoFogOfWar; /// fog of war disabled
CTileset Tileset; /// tileset data