X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=239e69dfe309a2b245186677bc0e805ec1cc5884;hb=9faff683f275abe93daa14b968af0126a21c50e5;hp=fb905910af6e3aa7ab23386a3c405f73f91c48a6;hpb=e62d9fad29bbc049320ec69914aefd43c0f62f78;p=16.git diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index fb905910..239e69df 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * Copyright (C) 2012-2023 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -54,6 +54,8 @@ typedef struct { byte *palette; } planar_buf_t; +#ifndef BITMAPT +#define BITMAPT typedef struct { byte *data; word width; @@ -69,6 +71,7 @@ typedef struct { word theight; // height of the tiles byte *palette; // palette for the tile set } tileset_t; +#endif //from 16_sprit.h #ifdef __WATCOMC__ @@ -204,6 +207,8 @@ typedef struct{ sword tileplayerposscreeny; /* player position on screen */ /* needed for scroll and map system to work accordingly */ } pagetileinfo_t; +#ifndef PAGET +#define PAGET typedef struct { nibble/*word*/ id; /* the Identification number of the page~ For layering~ */ byte far* data; /* the data for the page */ @@ -222,6 +227,7 @@ typedef struct { //TODO: find where they are used sword delta; // How much should we shift the page for smooth scrolling } page_t; +#endif //from 16_in //==========================================================================