Commit 8e70f4b8 authored by Steven Fuller's avatar Steven Fuller

Removed more old modex junk

parent 0d5404c8
...@@ -103,25 +103,11 @@ typedef struct ...@@ -103,25 +103,11 @@ typedef struct
void Quit (char *error); // defined in user program void Quit (char *error); // defined in user program
//
// replacing refresh manager with custom routines
//
#define PORTTILESWIDE 20 // all drawing takes place inside a
#define PORTTILESHIGH 13 // non displayed port of this size
#define UPDATEWIDE PORTTILESWIDE
#define UPDATEHIGH PORTTILESHIGH
#define MAXTICS 10 #define MAXTICS 10
#define DEMOTICS 4 #define DEMOTICS 4
extern unsigned mapwidth,mapheight,tics; extern unsigned mapwidth,mapheight,tics;
extern byte *updateptr;
extern unsigned uwidthtable[UPDATEHIGH];
extern unsigned blockstarts[UPDATEWIDE*UPDATEHIGH];
extern byte fontcolor,backcolor; extern byte fontcolor,backcolor;
#define SETFONTCOLOR(f,b) fontcolor=f;backcolor=b; #define SETFONTCOLOR(f,b) fontcolor=f;backcolor=b;
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#include "id_heads.h" #include "id_heads.h"
#define PIXTOBLOCK 4 /* 16 pixels to an update block */
/* ======================================================================== */ /* ======================================================================== */
pictabletype *pictable; pictabletype *pictable;
......
...@@ -3832,13 +3832,7 @@ void A_StartDeathCam (objtype *ob) ...@@ -3832,13 +3832,7 @@ void A_StartDeathCam (objtype *ob)
// //
// go back to the game // go back to the game
// //
temp = bufferofs; DrawPlayBorder ();
for (i=0;i<3;i++)
{
bufferofs = screenloc[i];
DrawPlayBorder ();
}
bufferofs = temp;
fizzlein = true; fizzlein = true;
switch (ob->obclass) switch (ob->obclass)
......
...@@ -812,15 +812,11 @@ extern statobj_t statobjlist[MAXSTATS],*laststatobj; ...@@ -812,15 +812,11 @@ extern statobj_t statobjlist[MAXSTATS],*laststatobj;
extern doorobj_t doorobjlist[MAXDOORS],*lastdoorobj; extern doorobj_t doorobjlist[MAXDOORS],*lastdoorobj;
extern unsigned farmapylookup[MAPSIZE]; extern unsigned farmapylookup[MAPSIZE];
extern byte *nearmapylookup[MAPSIZE];
extern byte tilemap[MAPSIZE][MAPSIZE]; // wall values only extern byte tilemap[MAPSIZE][MAPSIZE]; // wall values only
extern byte spotvis[MAPSIZE][MAPSIZE]; extern byte spotvis[MAPSIZE][MAPSIZE];
extern objtype *actorat[MAPSIZE][MAPSIZE]; extern objtype *actorat[MAPSIZE][MAPSIZE];
#define UPDATESIZE (UPDATEWIDE*UPDATEHIGH)
extern byte update[UPDATESIZE];
extern boolean singlestep,godmode,noclip; extern boolean singlestep,godmode,noclip;
extern int extravbls; extern int extravbls;
......
...@@ -779,15 +779,7 @@ void DrawPlayBorderSides (void) ...@@ -779,15 +779,7 @@ void DrawPlayBorderSides (void)
void DrawAllPlayBorderSides (void) void DrawAllPlayBorderSides (void)
{ {
unsigned i,temp; DrawPlayBorderSides ();
temp = bufferofs;
for (i=0;i<3;i++)
{
bufferofs = screenloc[i];
DrawPlayBorderSides ();
}
bufferofs = temp;
} }
/* /*
...@@ -799,15 +791,7 @@ void DrawAllPlayBorderSides (void) ...@@ -799,15 +791,7 @@ void DrawAllPlayBorderSides (void)
*/ */
void DrawAllPlayBorder (void) void DrawAllPlayBorder (void)
{ {
unsigned i,temp; DrawPlayBorder ();
temp = bufferofs;
for (i=0;i<3;i++)
{
bufferofs = screenloc[i];
DrawPlayBorder ();
}
bufferofs = temp;
} }
/* /*
...@@ -848,22 +832,13 @@ void DrawPlayBorder (void) ...@@ -848,22 +832,13 @@ void DrawPlayBorder (void)
void DrawPlayScreen (void) void DrawPlayScreen (void)
{ {
int i,j,p,m; int i,j,p,m;
unsigned temp;
VW_FadeOut (); VW_FadeOut ();
temp = bufferofs;
CA_CacheGrChunk (STATUSBARPIC); CA_CacheGrChunk (STATUSBARPIC);
for (i=0;i<3;i++) DrawPlayBorder ();
{ VWB_DrawPic (0,200-STATUSLINES,STATUSBARPIC);
bufferofs = screenloc[i];
DrawPlayBorder ();
VWB_DrawPic (0,200-STATUSLINES,STATUSBARPIC);
}
bufferofs = temp;
UNCACHEGRCHUNK (STATUSBARPIC); UNCACHEGRCHUNK (STATUSBARPIC);
...@@ -1172,11 +1147,9 @@ void Died (void) ...@@ -1172,11 +1147,9 @@ void Died (void)
// //
FinishPaletteShifts (); FinishPaletteShifts ();
bufferofs += screenofs;
VW_Bar (0,0,viewwidth,viewheight,4); VW_Bar (0,0,viewwidth,viewheight,4);
IN_ClearKeysDown (); IN_ClearKeysDown ();
FizzleFade(bufferofs,displayofs+screenofs,viewwidth,viewheight,70,false); FizzleFade(bufferofs,displayofs+screenofs,viewwidth,viewheight,70,false);
bufferofs -= screenofs;
IN_UserInput(100); IN_UserInput(100);
SD_WaitSoundDone (); SD_WaitSoundDone ();
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
void ClearSplitVWB (void) void ClearSplitVWB (void)
{ {
memset (update,0,sizeof(update));
WindowX = 0; WindowX = 0;
WindowY = 0; WindowY = 0;
WindowW = 320; WindowW = 320;
...@@ -941,13 +940,7 @@ void LevelCompleted (void) ...@@ -941,13 +940,7 @@ void LevelCompleted (void)
#endif #endif
VW_FadeOut (); VW_FadeOut ();
temp = bufferofs; DrawPlayBorder ();
for (i=0;i<3;i++)
{
bufferofs = screenloc[i];
DrawPlayBorder ();
}
bufferofs = temp;
UnCacheLump(LEVELEND_LUMP_START,LEVELEND_LUMP_END); UnCacheLump(LEVELEND_LUMP_START,LEVELEND_LUMP_END);
} }
......
...@@ -1066,15 +1066,9 @@ void InitGame (void) ...@@ -1066,15 +1066,9 @@ void InitGame (void)
for (i=0;i<MAPSIZE;i++) for (i=0;i<MAPSIZE;i++)
{ {
nearmapylookup[i] = &tilemap[0][0]+MAPSIZE*i;
farmapylookup[i] = i*64; farmapylookup[i] = i*64;
} }
for (i=0;i<PORTTILESHIGH;i++)
uwidthtable[i] = UPDATEWIDE*i;
updateptr = &update[0];
ReadConfig (); ReadConfig ();
......
...@@ -20,7 +20,6 @@ objtype objlist[MAXACTORS],*new,*obj,*player,*lastobj, ...@@ -20,7 +20,6 @@ objtype objlist[MAXACTORS],*new,*obj,*player,*lastobj,
*objfreelist,*killerobj; *objfreelist,*killerobj;
unsigned farmapylookup[MAPSIZE]; unsigned farmapylookup[MAPSIZE];
byte *nearmapylookup[MAPSIZE];
boolean singlestep,godmode,noclip; boolean singlestep,godmode,noclip;
int extravbls; int extravbls;
...@@ -33,11 +32,6 @@ objtype *actorat[MAPSIZE][MAPSIZE]; ...@@ -33,11 +32,6 @@ objtype *actorat[MAPSIZE][MAPSIZE];
// replacing refresh manager // replacing refresh manager
// //
unsigned mapwidth,mapheight,tics; unsigned mapwidth,mapheight,tics;
byte *updateptr;
unsigned mapwidthtable[64];
unsigned uwidthtable[UPDATEHIGH];
unsigned blockstarts[UPDATEWIDE*UPDATEHIGH];
byte update[UPDATESIZE];
// //
// control info // control info
...@@ -721,7 +715,6 @@ void CheckKeys (void) ...@@ -721,7 +715,6 @@ void CheckKeys (void)
// //
if (Paused) if (Paused)
{ {
bufferofs = displayofs;
LatchDrawPic (20-4,80-2*8,PAUSEDPIC); LatchDrawPic (20-4,80-2*8,PAUSEDPIC);
SD_MusicOff(); SD_MusicOff();
IN_Ack(); IN_Ack();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment