merge upstream

This commit is contained in:
Arthur Ice
2014-12-21 13:45:26 -08:00
193 changed files with 4491 additions and 9483 deletions
+3 -2
View File
@@ -18,10 +18,11 @@
#ifndef _TRAP_H
#define _TRAP_H
#include "../common/debug.h"
#include "entity.h"
class Mob;
class NPC;
//ID of the NPC type to spawn when a trap is set off, to do the damage
#define TRAP_NPC_TYPE 1586