diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:43:26 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:43:26 -0700 |
| commit | 8f4e4e9a92f6af89820a358ab99b990697117502 (patch) | |
| tree | cb312b5367c71dfe89543a5463be9555177c6445 /src/map/npc.h | |
| parent | f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (diff) | |
| parent | 2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a (diff) | |
| download | tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.gz tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.bz2 tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.xz tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.zip | |
Merge commit '2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a'
Diffstat (limited to 'src/map/npc.h')
| -rw-r--r-- | src/map/npc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index 248bad7..757c7ab 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -33,7 +33,7 @@ int npc_get_new_npc_id (void); * * \param message The message to speak. If message is NULL, the NPC will not do anything at all. */ -struct npc_data *npc_spawn_text (int m, int x, int y, int class, char *name, char *message); // message is strdup'd within +struct npc_data *npc_spawn_text (int m, int x, int y, int class_, char *name, char *message); // message is strdup'd within /** * Uninstalls and frees an NPC |