projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Node highlighting.
[oweals/minetest.git]
/
src
/
mapsector.h
diff --git
a/src/mapsector.h
b/src/mapsector.h
index 9fede7bd78b10f15af720d19ebad9d049f5da81f..dac4ee8d634992d55d933b63e7d587e4b2863bcd 100644
(file)
--- a/
src/mapsector.h
+++ b/
src/mapsector.h
@@
-1,6
+1,6
@@
/*
/*
-Minetest
-c55
-Copyright (C) 201
0
celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 201
3
celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@
-17,17
+17,14
@@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
#ifndef MAPSECTOR_HEADER
#define MAPSECTOR_HEADER
#ifndef MAPSECTOR_HEADER
#define MAPSECTOR_HEADER
-#include <jmutex.h>
-#include "common_irrlicht.h"
-#include "exceptions.h"
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
#include <ostream>
#include <ostream>
+#include <map>
+#include <list>
class MapBlock;
class Map;
class MapBlock;
class Map;
@@
-64,7
+61,7
@@
public:
void deleteBlock(MapBlock *block);
void deleteBlock(MapBlock *block);
- void getBlocks(
core
::list<MapBlock*> &dest);
+ void getBlocks(
std
::list<MapBlock*> &dest);
// Always false at the moment, because sector contains no metadata.
bool differs_from_disk;
// Always false at the moment, because sector contains no metadata.
bool differs_from_disk;
@@
-72,7
+69,7
@@
public:
protected:
// The pile of MapBlocks
protected:
// The pile of MapBlocks
-
core
::map<s16, MapBlock*> m_blocks;
+
std
::map<s16, MapBlock*> m_blocks;
Map *m_parent;
// Position on parent (in MapBlock widths)
Map *m_parent;
// Position on parent (in MapBlock widths)
@@
-114,7
+111,7
@@
public:
std::istream &is,
Map *parent,
v2s16 p2d,
std::istream &is,
Map *parent,
v2s16 p2d,
-
core
::map<v2s16, MapSector*> & sectors,
+
std
::map<v2s16, MapSector*> & sectors,
IGameDef *gamedef
);
IGameDef *gamedef
);