home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server: Refactoring of initialization of empty maps.
[plomrogue]
/
src
/
server
/
map.c
diff --git
a/src/server/map.c
b/src/server/map.c
index 833ff98cd1d380bdd97f5b74c9c66f219b5c5225..3a5a0a213d1c6f8f644739f1410a0778bb66a9fa 100644
(file)
--- a/
src/server/map.c
+++ b/
src/server/map.c
@@
-8,6
+8,7
@@
#include "map.h"
#include <stdint.h> /* uint8_t, int8_t, uint16_t, uint32_t, (U)INT*_(MIN|MAX) */
#include <stdlib.h> /* free() */
#include "map.h"
#include <stdint.h> /* uint8_t, int8_t, uint16_t, uint32_t, (U)INT*_(MIN|MAX) */
#include <stdlib.h> /* free() */
+#include <string.h> /* memset() */
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* yx_uint8 */
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* yx_uint8 */
@@
-204,7
+205,7
@@
extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx)
}
char * err = "Too much wrapping in mv_yx_in_dir_legal().";
exit_err( INT8_MIN == wrap_west_east || INT8_MIN == wrap_north_south
}
char * err = "Too much wrapping in mv_yx_in_dir_legal().";
exit_err( INT8_MIN == wrap_west_east || INT8_MIN == wrap_north_south
- || INT8_MAX == wrap_west_east || INT8_MAX == wrap_north_south,
err);
+ || INT8_MAX == wrap_west_east || INT8_MAX == wrap_north_south,err);
struct yx_uint8 original = *yx;
mv_yx_in_dir(dir, yx);
if (('e' == dir || 'd' == dir || 'c' == dir) && yx->x < original.x)
struct yx_uint8 original = *yx;
mv_yx_in_dir(dir, yx);
if (('e' == dir || 'd' == dir || 'c' == dir) && yx->x < original.x)
@@
-230,3
+231,11
@@
extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx)
}
return 0;
}
}
return 0;
}
+
+
+
+extern void init_empty_map(char ** map)
+{
+ *map = try_malloc(world.map.length * world.map.length, __func__);
+ memset(*map, ' ', world.map.length * world.map.length);
+}