mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-16 13:58:22 +00:00
Merge upstream/master to incorporate EQEmu fixes
Resolve CMake style conflict in common/CMakeLists.txt by adopting the lowercase CMake command style used consistently throughout the upstream codebase.
This commit is contained in:
+5
-5
@@ -1,8 +1,9 @@
|
||||
#ifndef EQEMU_LUA_MOB_H
|
||||
#define EQEMU_LUA_MOB_H
|
||||
#pragma once
|
||||
|
||||
#ifdef LUA_EQEMU
|
||||
|
||||
#include "lua_entity.h"
|
||||
#include "common/types.h"
|
||||
#include "zone/lua_entity.h"
|
||||
|
||||
class Mob;
|
||||
struct Lua_HateList;
|
||||
@@ -620,5 +621,4 @@ public:
|
||||
void SetPetType(uint8 pet_type);
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
#endif // LUA_EQEMU
|
||||
|
||||
Reference in New Issue
Block a user