Merge branch 'master' of git://factorcode.org/git/factor
commit
9cd518c330
|
@ -4,4 +4,8 @@ using namespace factor;
|
||||||
|
|
||||||
cell cards_offset;
|
cell cards_offset;
|
||||||
cell decks_offset;
|
cell decks_offset;
|
||||||
cell allot_markers_offset;
|
|
||||||
|
namespace factor
|
||||||
|
{
|
||||||
|
cell allot_markers_offset;
|
||||||
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@ inline static card *deck_to_card(card_deck *d)
|
||||||
|
|
||||||
#define INVALID_ALLOT_MARKER 0xff
|
#define INVALID_ALLOT_MARKER 0xff
|
||||||
|
|
||||||
cell allot_markers_offset;
|
extern cell allot_markers_offset;
|
||||||
|
|
||||||
inline static card *addr_to_allot_marker(object *a)
|
inline static card *addr_to_allot_marker(object *a)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue