Collapsed the pager into a single file, removing lua hooks
I need to re-add the lua hooks, but it'll be easy.
This commit is contained in:
@@ -23,8 +23,6 @@
|
||||
#define ROOMDATA_HPP_
|
||||
|
||||
//map system
|
||||
#include "map_allocator.hpp"
|
||||
#include "map_file_format.hpp"
|
||||
#include "region_pager.hpp"
|
||||
|
||||
struct RoomData {
|
||||
@@ -37,7 +35,7 @@ struct RoomData {
|
||||
};
|
||||
|
||||
//members
|
||||
RegionPager<LuaAllocator, LuaFormat> pager;
|
||||
RegionPager pager;
|
||||
RoomType type;
|
||||
|
||||
//TODO: collision map
|
||||
|
||||
@@ -35,7 +35,6 @@ public:
|
||||
|
||||
//public access methods
|
||||
//TODO
|
||||
//TODO: setup the pagers and functors of each room object
|
||||
|
||||
//accessors and mutators
|
||||
RoomData* GetRoom(int uid);
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
#include "sql_utility.hpp"
|
||||
#include "serial.hpp"
|
||||
#include "utility.hpp"
|
||||
|
||||
#include <stdexcept>
|
||||
#include <iostream>
|
||||
|
||||
Reference in New Issue
Block a user