Revision 359
corrected strange error
map1.h | ||
---|---|---|
3 | 3 |
|
4 | 4 |
#include "map1.xpm" |
5 | 5 |
#include "map1_collide.xpm" |
6 |
#include "graph.h" |
|
7 | 6 |
|
8 |
#include "xpm_utils.h"
|
|
7 |
#include "libs.h"
|
|
9 | 8 |
|
10 | 9 |
static map_t* get_map1(void){ |
11 |
char **ret = xpm_load_xpm2("maps/map1.xpm2"); |
|
12 |
char **ret_collide = xpm_load_xpm2("maps/map1_collide.xpm2"); |
|
13 |
return map_ctor((const char *const *)ret, (const char *const *)ret_collide); |
|
10 |
char **ret = xpm_load_xpm2("/home/lcom/labs/proj/maps/xpm2/map1.xpm2"); |
|
11 |
char **ret_collide = xpm_load_xpm2("/home/lcom/labs/proj/maps/xpm2/map1_collide.xpm2"); |
|
12 |
map_t *r = NULL; |
|
13 |
if(ret != NULL && ret_collide != NULL){ |
|
14 |
r = map_ctor((const char *const *)ret, (const char *const *)ret_collide); |
|
15 |
}else{ |
|
16 |
if(ret == NULL) printf("%s: map is NULL\n", __func__); |
|
17 |
if(ret_collide == NULL) printf("%s: collide is NULL\n", __func__); |
|
18 |
} |
|
14 | 19 |
free(ret); free(ret_collide); |
20 |
return r; |
|
15 | 21 |
} |
16 | 22 |
|
17 | 23 |
#endif /* end of include guard: MAP_H_INCLUDED */ |
Also available in: Unified diff