Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bind "blocked" flag for Lua (bug 1922). 

remove unused region-flags.
This commit is contained in:
Enno Rehling 2014-07-05 10:46:00 -07:00
parent d5e9899544
commit d743d32215
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bind_region.c
View File

@ -62,6 +62,22 @@ static int tolua_region_get_id(lua_State * L)
return 1; return 1;
} }
static int tolua_region_get_blocked(lua_State * L)
{
region *self = (region *)tolua_tousertype(L, 1, 0);
lua_pushboolean(L, (self->flags&RF_BLOCKED)!=0);
return 1;
}
static int tolua_region_set_blocked(lua_State * L)
{
region *self = (region *)tolua_tousertype(L, 1, 0);
bool flag = !!tolua_toboolean(L, 2, 1);
if (flag) self->flags |= BLD_WORKING;
else self->flags &= ~BLD_WORKING;
return 0;
}
static int tolua_region_get_x(lua_State * L) static int tolua_region_get_x(lua_State * L)
{ {
region *self = (region *) tolua_tousertype(L, 1, 0); region *self = (region *) tolua_tousertype(L, 1, 0);
@ -652,6 +668,9 @@ void tolua_region_open(lua_State * L)
tolua_function(L, TOLUA_CAST "destroy", tolua_region_destroy); tolua_function(L, TOLUA_CAST "destroy", tolua_region_destroy);
tolua_function(L, TOLUA_CAST "__tostring", tolua_region_tostring); tolua_function(L, TOLUA_CAST "__tostring", tolua_region_tostring);
/* flags */
tolua_variable(L, TOLUA_CAST "blocked", tolua_region_get_blocked, tolua_region_set_blocked);
tolua_variable(L, TOLUA_CAST "id", tolua_region_get_id, NULL); tolua_variable(L, TOLUA_CAST "id", tolua_region_get_id, NULL);
tolua_variable(L, TOLUA_CAST "x", tolua_region_get_x, NULL); tolua_variable(L, TOLUA_CAST "x", tolua_region_get_x, NULL);
tolua_variable(L, TOLUA_CAST "y", tolua_region_get_y, NULL); tolua_variable(L, TOLUA_CAST "y", tolua_region_get_y, NULL);

43
src/kernel/region.h
View File

@ -27,41 +27,38 @@ extern "C" {
#include "direction.h" #include "direction.h"
/* FAST_CONNECT: regions are directly connected to neighbours, saves doing /* FAST_CONNECT: regions are directly connected to neighbours, saves doing
a hash-access each time a neighbour is needed */ a hash-access each time a neighbour is needed, 6 extra pointers per hex */
#define FAST_CONNECT #define FAST_CONNECT
#define RF_CHAOTIC (1<<0) #define RF_CHAOTIC (1<<0) /* persistent */
#define RF_MALLORN (1<<1) #define RF_MALLORN (1<<1) /* persistent */
#define RF_BLOCKED (1<<2) #define RF_BLOCKED (1<<2) /* persistent */
#define RF_BLOCK_NORTHWEST (1<<3) #define RF_UNUSED_3 (1<<3)
#define RF_BLOCK_NORTHEAST (1<<4) #define RF_UNUSED_4 (1<<4)
#define RF_BLOCK_EAST (1<<5) #define RF_UNUSED_5 (1<<5)
#define RF_BLOCK_SOUTHEAST (1<<6) #define RF_UNUSED_6 (1<<6)
#define RF_BLOCK_SOUTHWEST (1<<7) #define RF_UNUSED_7 (1<<7)
#define RF_BLOCK_WEST (1<<8) #define RF_UNUSED_8 (1<<8)
#define RF_ENCOUNTER (1<<9) #define RF_ENCOUNTER (1<<9) /* persistent */
#define RF_MIGRATION (1<<10) #define RF_MAPPER_HIGHLIGHT (1<<10)
#define RF_UNUSED_1 (1<<11) #define RF_LIGHTHOUSE (1<<11) /* this region may contain a lighthouse */
#define RF_ORCIFIED (1<<12) #define RF_ORCIFIED (1<<12) /* persistent */
#define RF_CURSED (1<<13) #define RF_MIGRATION (1<<13)
/* debug flags */ #define RF_UNUSED_14 (1<<14)
#define RF_COMBATDEBUG (1<<14) #define RF_UNUSED_15 (1<<15)
#define RF_MAPPER_HIGHLIGHT (1<<14) /* only used by mapper, not stored */ #define RF_UNUSED_16 (1<<16)
#define RF_LIGHTHOUSE (1<<15) /* this region may contain a lighthouse */
#define RF_SELECT (1<<17) #define RF_SELECT (1<<17)
#define RF_MARK (1<<18) #define RF_MARK (1<<18)
/* flags that speed up attribute access: */
#define RF_TRAVELUNIT (1<<19) #define RF_TRAVELUNIT (1<<19)
#define RF_GUARDED (1<<20) #define RF_GUARDED (1<<20) /* persistent */
#define RF_ALL 0xFFFFFF #define RF_ALL 0xFFFFFF
#define RF_SAVEMASK (RF_GUARDED|RF_CHAOTIC|RF_MALLORN|RF_BLOCKED|RF_BLOCK_NORTHWEST|RF_BLOCK_NORTHEAST|RF_BLOCK_EAST|RF_BLOCK_SOUTHEAST|RF_BLOCK_SOUTHWEST|RF_BLOCK_WEST|RF_ENCOUNTER|RF_ORCIFIED) #define RF_SAVEMASK (RF_CHAOTIC|RF_MALLORN|RF_BLOCKED|RF_ENCOUNTER|RF_ORCIFIED|RF_GUARDED)
struct message; struct message;
struct message_list; struct message_list;
struct rawmaterial; struct rawmaterial;