falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

declare M in map.h

This commit is contained in:
Alex Bates 2020-10-21 14:12:24 +01:00
parent ccfe465f3b
commit 1dc8a3583d
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/macros.h
View File

@ -48,4 +48,7 @@
// Fixed-point short literal
#define F16(f) (s16)(f * 327.67f)
#define _NAMESPACE(x, y) x ## _ ## y
#define NAMESPACE(x, y) _NAMESPACE(x, y)
#endif

2
include/map.h
View File

@ -7,6 +7,8 @@
// TODO: consider moving Npc here
#define M(sym) NAMESPACE(MAP_NAME, sym)
#define ENTRY_COUNT(entryList) (sizeof(entryList) / sizeof(Vec4f))
typedef Vec4f EntryList[];

2
src/world/area_kmr/kmr_12/kmr_12.h
View File

@ -1,7 +1,7 @@
#include "common.h"
#include "map.h"
#define M(sym) kmr_12 ## _ ## sym
#define MAP_NAME kmr_12
#define NpcId_GOOMBA 0