Merge branch 'master' into aa

zone/CMakeLists.txt

@@ -20,7 +20,7 @@ SET(zone_sources
 	embparser_api.cpp
 	embperl.cpp
 	embxs.cpp
-  encounter.cpp
+	encounter.cpp
 	entity.cpp
 	exp.cpp
 	fearpath.cpp
@@ -36,6 +36,7 @@ SET(zone_sources
 	lua_corpse.cpp
 	lua_client.cpp
 	lua_door.cpp
+	lua_encounter.cpp
 	lua_entity.cpp
 	lua_entity_list.cpp
 	lua_general.cpp
@@ -139,7 +140,7 @@ SET(zone_headers
 	embparser.h
 	embperl.h
 	embxs.h
-  encounter.h
+	encounter.h
 	entity.h
 	errmsg.h
 	event_codes.h
@@ -151,6 +152,7 @@ SET(zone_headers
 	lua_bit.h
 	lua_client.h
 	lua_corpse.h
+	lua_encounter.h
 	lua_entity.h
 	lua_entity_list.h
 	lua_general.h