Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-26 18:06:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pokefirered

Browse Source
This commit is contained in:
GriffinR
2020-03-29 13:15:23 -04:00
committed by GitHub
parent 76a8c0dc44 3ff5483267
commit e9210f96aa
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/map.cpp
View File

@@ -67,7 +67,7 @@ int Map::getBorderHeight() {
return layout->border_height.toInt(nullptr, 0);
}
bool Map::mapBlockChanged(int i, Blockdata *cache) {
bool Map::mapBlockChanged(int i, Blockdata * cache) {
if (!cache)
return true;
if (!layout->blockdata)
@@ -84,7 +84,7 @@ bool Map::mapBlockChanged(int i, Blockdata *cache) {
return layout->blockdata->blocks->value(i) != cache->blocks->value(i);
}
bool Map::borderBlockChanged(int i, Blockdata *cache) {
bool Map::borderBlockChanged(int i, Blockdata * cache) {
if (!cache)
return true;
if (!layout->border)