teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mundane Mapster Maintenance Melee, Part 2

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1797 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-02-15 21:02:43 +00:00
parent 65ad201c39
commit 348474dd14
6 changed files with 541 additions and 718 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
polymer/eduke32/build/include/build.h
View file

@ -60,6 +60,9 @@ extern "C" {
#define CLIPMASK0 (((1L)<<16)+1L)
#define CLIPMASK1 (((256L)<<16)+64L)
// max x/y val (= max editorgridextent in Mapster32)
#define BXY_MAX 524288
//Make all variables in BUILD.H defined in the ENGINE,
//and externed in GAME
#ifdef ENGINE

30
polymer/eduke32/build/src/build.c
View file

@ -346,9 +346,14 @@ static void M32_drawdebug(void)
int x=4, y=8;
begindrawing();
// Bsprintf(tstr, "searchstat=%d, searchsector=%d, searchwall=%d",
// searchstat, searchsector, searchwall);
// printext256(x,y,whitecol,0,tstr,xdimgame>640?0:1);
#if 0
{
static char tstr[128];
Bsprintf(tstr, "searchstat=%d, searchsector=%d, searchwall=%d (%d)",
searchstat, searchsector, searchwall, searchbottomwall);
printext256(x,y,whitecol,0,tstr,xdimgame>640?0:1);
}
#endif
for (i=0; i<m32_numdebuglines; i++)
{
y+=8;
@ -1635,29 +1640,11 @@ static void sideview_filter_keys()
{
switch (i)
{
#if 0
case 0x01: // esc
case 0x10: case 0x11: // q,w
case 0x1e: case 0x2c: // a.z
case 0x2a: case 0x36: // shift
case 0xc8: case 0xcb: case 0xd0: case 0xcd: // arrow keys
case 0x3b: case 0x3c: case 0x3d: case 0x3e: // f1,f2,f3,f4
case 0x3f: case 0x40: case 0x43: case 0x58: // f5,f6,f9,f12
case 0x0f: case 0x29: // tab, `
case 0x22: // g
case 0x9c: // KPENTER
break;
default:
if (!(eitherCTRL && (keystatus[0x2d] || keystatus[0x14]))) // Ctrl-X, Ctrl-T
keystatus[i] = 0;
break;
#else
case 0xd2: case 0xd3: // ins, del
case 0x2e: case 0x39: // c, space
case 0xb8: // ralt
keystatus[i] = 0;
break;
#endif
}
}
}
@ -2033,6 +2020,7 @@ void overheadeditor(void)
}
j--;
}
i++;
}
}

2
polymer/eduke32/build/src/engine.c
View file

@ -1282,7 +1282,7 @@ static void scansector(int16_t sectnum)
if ((gotsector[nextsectnum>>3]&pow2char[nextsectnum&7]) == 0)
{
tempint = x1*y2-x2*y1;
if (((unsigned)tempint+262144) < 524288)
if (((unsigned)tempint+262144) < 524288) // BXY_MAX?
if (mulscale5(tempint,tempint) <= (x2-x1)*(x2-x1)+(y2-y1)*(y2-y1))
sectorborder[sectorbordercnt++] = nextsectnum;
}

1212
polymer/eduke32/source/astub.c
View file

File diff suppressed because it is too large Load diff

8
polymer/eduke32/source/m32def.c
View file

@ -450,8 +450,8 @@ const memberlabel_t SectorLabels[]=
const memberlabel_t WallLabels[]=
{
{ "x", WALL_X, 0, -524288, 524288 },
{ "y", WALL_Y, 0, -524288, 524288 },
{ "x", WALL_X, 0, -BXY_MAX, BXY_MAX },
{ "y", WALL_Y, 0, -BXY_MAX, BXY_MAX },
{ "point2", WALL_POINT2, 1, 0, 0 },
{ "nextwall", WALL_NEXTWALL, 1, 0, 0 },
{ "nextsector", WALL_NEXTSECTOR, 1, 0, 0 },
@ -472,8 +472,8 @@ const memberlabel_t WallLabels[]=
const memberlabel_t SpriteLabels[]=
{
{ "x", SPRITE_X, 0, -524288, 524288 },
{ "y", SPRITE_Y, 0, -524288, 524288 },
{ "x", SPRITE_X, 0, -BXY_MAX, BXY_MAX },
{ "y", SPRITE_Y, 0, -BXY_MAX, BXY_MAX },
{ "z", SPRITE_Z, 0, 0, 0 },
{ "cstat", SPRITE_CSTAT, 0, 0, 0 },
{ "picnum", SPRITE_PICNUM, 0, 0, MAXTILES-1 },

4
polymer/eduke32/source/mapster32.h
View file

@ -76,7 +76,7 @@ static char autospritehelp=0,autosecthelp=0;
static int32_t lastmessagetime=-1;
static char tempbuf[1024];
static int32_t numsprite[MAXSPRITES], multisprite[MAXSPRITES];
static int32_t numsprite[MAXTILES], multisprite[MAXTILES];
static char lo[64];
static char levelname[BMAX_PATH];
static int16_t curwall=0, curwallnum=0;
@ -100,7 +100,7 @@ extern int32_t vel, svel, hvel, angvel;
static void SearchSectors(int32_t dir);
static inline void SpriteName(int16_t spritenum, char *lo2);
static void PrintStatus(const char *string,int32_t num,char x,char y,char color);
//static void PrintStatus(const char *string,int32_t num,char x,char y,char color);
void SetBOSS1Palette();
void SetSLIMEPalette();
void SetWATERPalette();