projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b131a52
)
fixed embarrassingly high number of x/y typos
author
Holger Schemel
<info@artsoft.org>
Tue, 21 Feb 2017 23:39:11 +0000
(
00:39
+0100)
committer
Holger Schemel
<info@artsoft.org>
Fri, 23 Mar 2018 22:21:09 +0000
(23:21 +0100)
src/files.c
patch
|
blob
|
history
diff --git
a/src/files.c
b/src/files.c
index 4cc8065647a2c5daf566b48f5010b6051931f22a..795aeda2befb595fc04508083404fd91e729275f 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-3896,7
+3896,7
@@
void CopyNativeLevel_RND_to_MM(struct LevelInfo *level)
level_mm->encoding_16bit_field = level->encoding_16bit_field;
level_mm->fieldx = MIN(level->fieldx, MM_MAX_PLAYFIELD_WIDTH);
level_mm->encoding_16bit_field = level->encoding_16bit_field;
level_mm->fieldx = MIN(level->fieldx, MM_MAX_PLAYFIELD_WIDTH);
- level_mm->fieldy = MIN(level->field
x
, MM_MAX_PLAYFIELD_HEIGHT);
+ level_mm->fieldy = MIN(level->field
y
, MM_MAX_PLAYFIELD_HEIGHT);
level_mm->time = level->time;
level_mm->kettles_needed = level->gems_needed;
level_mm->time = level->time;
level_mm->kettles_needed = level->gems_needed;
@@
-3915,8
+3915,8
@@
void CopyNativeLevel_RND_to_MM(struct LevelInfo *level)
level_mm->amoeba_speed = level->amoeba_speed;
level_mm->time_fuse = 0;
level_mm->amoeba_speed = level->amoeba_speed;
level_mm->time_fuse = 0;
- for (
y = 0; y < level_mm->fieldx; y
++)
- for (
x = 0; x < level_mm->fieldy; x
++)
+ for (
x = 0; x < level->fieldx; x
++)
+ for (
y = 0; y < level->fieldy; y
++)
level_mm->field[x][y] = map_element_RND_to_MM(level->field[x][y]);
}
level_mm->field[x][y] = map_element_RND_to_MM(level->field[x][y]);
}
@@
-3930,7
+3930,7
@@
void CopyNativeLevel_MM_to_RND(struct LevelInfo *level)
level->encoding_16bit_field = level_mm->encoding_16bit_field;
level->fieldx = MIN(level_mm->fieldx, MAX_LEV_FIELDX);
level->encoding_16bit_field = level_mm->encoding_16bit_field;
level->fieldx = MIN(level_mm->fieldx, MAX_LEV_FIELDX);
- level->fieldy = MIN(level_mm->field
x
, MAX_LEV_FIELDY);
+ level->fieldy = MIN(level_mm->field
y
, MAX_LEV_FIELDY);
level->time = level_mm->time;
level->gems_needed = level_mm->kettles_needed;
level->time = level_mm->time;
level->gems_needed = level_mm->kettles_needed;
@@
-3944,8
+3944,8
@@
void CopyNativeLevel_MM_to_RND(struct LevelInfo *level)
level->amoeba_speed = level_mm->amoeba_speed;
level->amoeba_speed = level_mm->amoeba_speed;
- for (
y = 0; y < level->fieldx; y
++)
- for (
x = 0; x < level->fieldy; x
++)
+ for (
x = 0; x < level->fieldx; x
++)
+ for (
y = 0; y < level->fieldy; y
++)
level->field[x][y] = map_element_MM_to_RND(level_mm->field[x][y]);
}
level->field[x][y] = map_element_MM_to_RND(level_mm->field[x][y]);
}