Changeset 2106


Ignore:
Timestamp:
Nov 22, 2012, 12:22:35 AM (8 years ago)
Author:
sam
Message:

build: rename Map to LevelMap so that we can use Map for the hashmap.

Location:
trunk/src
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r2105 r2106  
    1919    lol/unit.h lol/debug.h \
    2020    lol/core/types.h lol/core/array.h lol/core/string.h lol/core/hash.h \
     21    lol/core/map.h \
    2122    lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
    2223    lol/math/math.h \
  • trunk/src/core.h

    r2105 r2106  
    7676// Base types
    7777#include <lol/debug.h>
     78
    7879#include <lol/core/types.h>
    7980#include <lol/core/array.h>
    8081#include <lol/core/string.h>
    8182#include <lol/core/hash.h>
     83#include <lol/core/map.h>
     84
    8285#include <lol/math/math.h>
    8386#include <lol/math/half.h>
    8487#include <lol/math/real.h>
    8588#include <lol/math/vector.h>
     89
    8690#include "numeric.h"
    8791#include "timer.h"
  • trunk/src/lolcore.vcxproj

    r2105 r2106  
    585585    <ClInclude Include="lol\core\array.h" />
    586586    <ClInclude Include="lol\core\hash.h" />
     587    <ClInclude Include="lol\core\map.h" />
    587588    <ClInclude Include="lol\core\string.h" />
    588589    <ClInclude Include="lol\core\types.h" />
  • trunk/src/lolcore.vcxproj.filters

    r2105 r2106  
    740740    </ClInclude>
    741741    <ClInclude Include="hash.h">
     742      <Filter>src\core</Filter>
     743    </ClInclude>
     744    <ClInclude Include="map.h">
    742745      <Filter>src\core</Filter>
    743746    </ClInclude>
  • trunk/src/map.cpp

    r1985 r2106  
    2626
    2727/*
    28  * Map implementation class
     28 * LevelMap implementation class
    2929 */
    3030
    31 class MapData
     31class LevelMapData
    3232{
    33     friend class Map;
     33    friend class LevelMap;
    3434
    3535    static int const MAX_TILESETS = 128;
     
    4545
    4646/*
    47  * Public Map class
     47 * Public LevelMap class
    4848 */
    4949
    50 Map::Map(char const *path)
    51   : data(new MapData())
     50LevelMap::LevelMap(char const *path)
     51  : data(new LevelMapData())
    5252{
    5353    data->ntilers = 0;
     
    5656
    5757    char tmp[BUFSIZ];
    58     int gids[MapData::MAX_TILESETS];
     58    int gids[LevelMapData::MAX_TILESETS];
    5959    uint32_t *tiles = NULL;
    6060    int level = 0, orientation = 0, ntiles = 0;
     
    152152}
    153153
    154 Map::~Map()
     154LevelMap::~LevelMap()
    155155{
    156156    for (int i = 0; i < data->ntilers; i++)
     
    161161}
    162162
    163 void Map::Render(int x, int y, int z)
     163void LevelMap::Render(int x, int y, int z)
    164164{
    165165    for (int i = 0; i < data->m_layers.Count(); i++)
     
    167167}
    168168
    169 int Map::GetWidth()
     169int LevelMap::GetWidth()
    170170{
    171171    return data->width * 32;
    172172}
    173173
    174 int Map::GetHeight()
     174int LevelMap::GetHeight()
    175175{
    176176    return data->height * 32;
  • trunk/src/map.h

    r748 r2106  
    1010
    1111//
    12 // The Map class
    13 // -------------
    14 // A Map object is a collection of Layers and other information (to be
     12// The LevelMap class
     13// ------------------
     14// A LevelMap object is a collection of Layers and other information (to be
    1515// determined later).
    1616//
    1717
    18 #if !defined __LOL_MAP_H__
    19 #define __LOL_MAP_H__
     18#if !defined __LOL_LEVELMAP_H__
     19#define __LOL_LEVELMAP_H__
    2020
    2121namespace lol
    2222{
    2323
    24 class MapData;
     24class LevelMapData;
    2525
    26 class Map
     26class LevelMap
    2727{
    2828public:
    29     Map(char const *path);
    30     ~Map();
     29    LevelMap(char const *path);
     30    ~LevelMap();
    3131
    3232    void Render(int x, int y, int z);
     
    3535
    3636private:
    37     MapData *data;
     37    LevelMapData *data;
    3838};
    3939
Note: See TracChangeset for help on using the changeset viewer.