X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tdef.h;h=75ff0f243c5563a72d3cc937e684a9b8dc869c0e;hb=7499dc78fbb151b6daac45f2643a15bf1b40beb7;hp=572149f7279b90510069a41b618e766e62bf4bff;hpb=a565be31ce92d6168ae6983042da75b0b683e52b;p=16.git diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index 572149f7..75ff0f24 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -54,6 +54,25 @@ typedef struct { byte *palette; } planar_buf_t; +#ifndef BITMAPT +#define BITMAPT +typedef struct { + byte *data; + word width; + word height; + byte *palette; + word offset; +} bitmap_t; + +typedef struct { + byte far **data; + word ntiles; // the number of tiles + word twidth; // width of the tiles + word theight; // height of the tiles + byte *palette; // palette for the tile set +} tileset_t; +#endif + //from 16_sprit.h #ifdef __WATCOMC__ #include @@ -188,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 */ @@ -206,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 //========================================================================== @@ -316,8 +338,8 @@ typedef struct //struct sprite *spri; //supposively the sprite sheet data //memptr gr; #endif -// bitmap_t *data; //supposively the sprite sheet data//old format -// bitmap_t bmp; + bitmap_t *data; //supposively the sprite sheet data//old format + bitmap_t bmp; //input byte near pdir; //previous direction~ used in IN_16 in IN_ReadControl()