summaryrefslogtreecommitdiff
path: root/src/fieldmap.c
diff options
context:
space:
mode:
authorYamaArashi <YamaArashi@users.noreply.github.com>2016-12-12 19:26:25 -0800
committerGitHub <noreply@github.com>2016-12-12 19:26:25 -0800
commite6c9d717dfad90e5423ebfc6aef53e0b19ef808d (patch)
tree6d18550f086819f3dee2918f9f04dea22ba9a9b1 /src/fieldmap.c
parent36214115534dd9329b5c02d78595967e671b6caf (diff)
parent6a07ab586cb3f472657a8572a6b7270ea8751f6a (diff)
Merge pull request #126 from marijnvdwerf/clean/up-warnings
Increase warnings and turn warnings into errors
Diffstat (limited to 'src/fieldmap.c')
-rw-r--r--src/fieldmap.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c
index cd9baa217..0470d33ff 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -156,8 +156,8 @@ void sub_8056134(int x, int y, struct MapHeader *mapHeader, int x2, int y2, int
void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
int x, y;
- int x2, y2;
- int width, height;
+ int x2;
+ int width;
int cWidth;
if (connectedMapHeader) {
@@ -190,9 +190,9 @@ void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
}
void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
- int x, y;
+ int x;
int x2, y2;
- int width, height;
+ int width;
int cWidth, cHeight;
if (connectedMapHeader) {
@@ -229,9 +229,9 @@ void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
- int x, y;
+ int y;
int x2, y2;
- int width, height;
+ int height;
int cWidth, cHeight;
if (connectedMapHeader) {
cWidth = connectedMapHeader->mapData->width;
@@ -265,9 +265,9 @@ void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connected
void fillEastConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
int x, y;
- int x2, y2;
- int width, height;
- int cWidth, cHeight;
+ int y2;
+ int height;
+ int cHeight;
if (connectedMapHeader) {
cHeight = connectedMapHeader->mapData->height;
x = mapHeader->mapData->width + 7;