summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-24 18:26:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-24 18:26:52 +0300
commit67ee3168a45ea09a863de5be2e0a94cf1afbe6dc (patch)
treeaa33639f3e70f81444b893bbbb99ab78f6beb2d6 /src/resources
parenta602d5c2460b197866028cfb3d2aa2b7b3aea80c (diff)
downloadManaVerse-67ee3168a45ea09a863de5be2e0a94cf1afbe6dc.tar.gz
ManaVerse-67ee3168a45ea09a863de5be2e0a94cf1afbe6dc.tar.bz2
ManaVerse-67ee3168a45ea09a863de5be2e0a94cf1afbe6dc.tar.xz
ManaVerse-67ee3168a45ea09a863de5be2e0a94cf1afbe6dc.zip
Fix compilation with clang.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/map/maplayer.cpp22
-rw-r--r--src/resources/map/maplayer.h8
2 files changed, 15 insertions, 15 deletions
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index b35960965..6b57837d9 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -83,7 +83,7 @@ MapLayer::~MapLayer()
mTempRows.clear();
}
-void MapLayer::optionChanged(const std::string &value)
+void MapLayer::optionChanged(const std::string &value) restrict
{
if (value == "highlightAttackRange")
{
@@ -94,7 +94,7 @@ void MapLayer::optionChanged(const std::string &value)
void MapLayer::setTile(const int x,
const int y,
- Image *const img)
+ Image *const img) restrict
{
mTiles[x + y * mWidth].image = img;
}
@@ -105,7 +105,7 @@ void MapLayer::draw(Graphics *const graphics,
int endX,
int endY,
const int scrollX,
- const int scrollY) const
+ const int scrollY) const restrict
{
if (!localPlayer)
return;
@@ -175,7 +175,7 @@ void MapLayer::draw(Graphics *const graphics,
BLOCK_END("MapLayer::draw")
}
-void MapLayer::drawSDL(Graphics *const graphics) const
+void MapLayer::drawSDL(Graphics *const graphics) const restrict2
{
BLOCK_START("MapLayer::drawSDL")
MapRows::const_iterator rit = mTempRows.begin();
@@ -202,7 +202,7 @@ void MapLayer::updateSDL(const Graphics *const graphics,
int endX,
int endY,
const int scrollX,
- const int scrollY)
+ const int scrollY) restrict2
{
BLOCK_START("MapLayer::updateSDL")
delete_all(mTempRows);
@@ -270,7 +270,7 @@ void MapLayer::updateOGL(Graphics *const graphics,
int endX,
int endY,
const int scrollX,
- const int scrollY)
+ const int scrollY) restrict2
{
BLOCK_START("MapLayer::updateOGL")
delete_all(mTempRows);
@@ -353,7 +353,7 @@ void MapLayer::updateOGL(Graphics *const graphics,
BLOCK_END("MapLayer::updateOGL")
}
-void MapLayer::drawOGL(Graphics *const graphics) const
+void MapLayer::drawOGL(Graphics *const graphics) const restrict2
{
BLOCK_START("MapLayer::drawOGL")
MapRows::const_iterator rit = mTempRows.begin();
@@ -384,7 +384,7 @@ void MapLayer::drawFringe(Graphics *const graphics,
int endY,
const int scrollX,
const int scrollY,
- const Actors &actors) const
+ const Actors &actors) const restrict
{
BLOCK_START("MapLayer::drawFringe")
if (!localPlayer ||
@@ -680,7 +680,7 @@ void MapLayer::drawFringe(Graphics *const graphics,
BLOCK_END("MapLayer::drawFringe")
}
-int MapLayer::getTileDrawWidth(const TileInfo *tilePtr,
+int MapLayer::getTileDrawWidth(const TileInfo *restrict tilePtr,
const int endX,
int &width)
{
@@ -708,7 +708,7 @@ int MapLayer::getTileDrawWidth(const TileInfo *tilePtr,
return c;
}
-void MapLayer::setDrawLayerFlags(const MapTypeT &n)
+void MapLayer::setDrawLayerFlags(const MapTypeT &n) restrict
{
mDrawLayerFlags = n;
mSpecialFlag = (mDrawLayerFlags != MapType::SPECIAL &&
@@ -718,7 +718,7 @@ void MapLayer::setDrawLayerFlags(const MapTypeT &n)
void MapLayer::updateConditionTiles(MetaTile *const metaTiles,
const int width,
- const int height)
+ const int height) restrict
{
const int width1 = width < mWidth ? width : mWidth;
const int height1 = height < mHeight ? height : mHeight;
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index 458f49d00..750db4e4b 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -105,11 +105,11 @@ class MapLayer final: public ConfigListener
const int scrollX,
const int scrollY) const restrict A_NONNULL(2);
- void drawSDL(Graphics *restrict const graphics) const restrict
+ void drawSDL(Graphics *restrict const graphics) const restrict2
A_NONNULL(2);
#ifdef USE_OPENGL
- void drawOGL(Graphics *restrict const graphics) const restrict
+ void drawOGL(Graphics *restrict const graphics) const restrict2
A_NONNULL(2);
void updateOGL(Graphics *restrict const graphics,
@@ -118,7 +118,7 @@ class MapLayer final: public ConfigListener
int endX,
int endY,
const int scrollX,
- const int scrollY) restrict A_NONNULL(2);
+ const int scrollY) restrict2 A_NONNULL(2);
#endif
void updateSDL(const Graphics *restrict const graphics,
@@ -127,7 +127,7 @@ class MapLayer final: public ConfigListener
int endX,
int endY,
const int scrollX,
- const int scrollY) restrict A_NONNULL(2);
+ const int scrollY) restrict2 A_NONNULL(2);
void drawFringe(Graphics *restrict const graphics,
int startX,