Skip to content

W
wolf3d
Commit 713dc95c authored by Steven Fuller's avatar Steven Fuller
Browse files
Options

Even more cleanups!

parent 5c51619e
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 124 deletions
src/id_ca.c
View file @ 713dc95c
......@@ -369,7 +369,7 @@ void CAL_OptimizeNodes (huffnode *table)
======================
*/
void CAL_HuffExpand (byte huge *source, byte huge *dest,
void CAL_HuffExpand (byte *source, byte *dest,
long length,huffnode *hufftable, boolean screenhack)
{
// unsigned bit,byte,node,code;
......@@ -628,12 +628,12 @@ void CAL_CarmackExpand (unsigned far *source, unsigned far *dest, unsigned lengt
======================
*/
long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,
long CA_RLEWCompress (unsigned *source, long length, unsigned *dest,
unsigned rlewtag)
{
long complength;
unsigned value,count,i;
unsigned huge *start,huge *end;
unsigned *start, *end;
start = dest;
......@@ -685,11 +685,11 @@ long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,
======================
*/
void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,
void CA_RLEWexpand (unsigned *source, unsigned *dest,long length,
unsigned rlewtag)
{
// unsigned value,count,i;
unsigned huge *end;
unsigned *end;
unsigned sourceseg,sourceoff,destseg,destoff,endseg,endoff;
......@@ -867,7 +867,7 @@ void CAL_SetupGrFile (void)
CAL_GetGrChunkLength(STRUCTPIC); // position file pointer
MM_GetPtr(&compseg,chunkcomplen);
CA_FarRead (grhandle,compseg,chunkcomplen);
CAL_HuffExpand (compseg, (byte huge *)pictable,NUMPICS*sizeof(pictabletype),grhuffman,false);
CAL_HuffExpand (compseg, (byte *)pictable,NUMPICS*sizeof(pictabletype),grhuffman,false);
MM_FreePtr(&compseg);
}
......
src/id_ca.h
View file @ 713dc95c
......@@ -55,10 +55,10 @@ boolean CA_ReadFile (char *filename, memptr *ptr);
boolean CA_LoadFile (char *filename, memptr *ptr);
boolean CA_WriteFile (char *filename, void *ptr, long length);
long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,
long CA_RLEWCompress (unsigned *source, long length, unsigned *dest,
unsigned rlewtag);
void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,
void CA_RLEWexpand (unsigned *source, unsigned *dest,long length,
unsigned rlewtag);
void CA_Startup (void);
......
src/id_in.c
View file @ 713dc95c
......@@ -17,8 +17,7 @@
// DEBUG - there are more globals
//
#include "ID_HEADS.H"
#pragma hdrstop
#include "id_heads.h"
#define KeyInt 9 // The keyboard ISR number
......@@ -68,7 +67,7 @@ boolean JoyPadPresent;
longword MouseDownCount;
Demo DemoMode = demo_Off;
byte _seg *DemoBuffer;
byte *DemoBuffer;
word DemoOffset,DemoSize;
/*
......@@ -78,7 +77,7 @@ boolean JoyPadPresent;
=============================================================================
*/
static byte far ASCIINames[] = // Unshifted ASCII for scan codes
static byte ASCIINames[] = // Unshifted ASCII for scan codes
{
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
0 ,27 ,'1','2','3','4','5','6','7','8','9','0','-','=',8 ,9 , // 0
......@@ -90,7 +89,7 @@ static byte far ASCIINames[] = // Unshifted ASCII for scan codes
0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , // 6
0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 // 7
},
far ShiftNames[] = // Shifted ASCII for scan codes
ShiftNames[] = // Shifted ASCII for scan codes
{
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
0 ,27 ,'!','@','#','$','%','^','&','*','(',')','_','+',8 ,9 , // 0
......@@ -102,7 +101,7 @@ static byte far ASCIINames[] = // Unshifted ASCII for scan codes
0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , // 6
0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 // 7
},
far SpecialNames[] = // ASCII for 0xe0 prefixed codes
SpecialNames[] = // ASCII for 0xe0 prefixed codes
{
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , // 0
......@@ -468,7 +467,7 @@ INL_StartMouse(void)
return(false);
#endif
union REGS regs;
unsigned char far *vector;
unsigned char *vector;
if ((vector=MK_FP(peek(0,0x33*4+2),peek(0,0x33*4)))==NULL)
......
src/id_mm.c
View file @ 713dc95c
......@@ -50,7 +50,7 @@ typedef struct mmblockstruct
unsigned start,length;
unsigned attributes;
memptr *useptr; // pointer to the segment start
struct mmblockstruct far *next;
struct mmblockstruct *next;
} mmblocktype;
......@@ -86,11 +86,10 @@ void (* aftersort) (void);
boolean mmstarted;
void far *farheap;
void *farheap;
void *nearheap;
mmblocktype far mmblocks[MAXBLOCKS]
,far *mmhead,far *mmfree,far *mmrover,far *mmnew;
mmblocktype mmblocks[MAXBLOCKS], *mmhead, *mmfree, *mmrover, *mmnew;
boolean bombonerror;
......@@ -236,7 +235,7 @@ asm call [DWORD PTR XMSaddr]
void MML_UseSpace (unsigned segstart, unsigned seglength)
{
mmblocktype far *scan,far *last;
mmblocktype *scan, *last;
unsigned oldend;
long extra;
......@@ -297,7 +296,7 @@ void MML_UseSpace (unsigned segstart, unsigned seglength)
void MML_ClearBlock (void)
{
mmblocktype far *scan,far *last;
mmblocktype *scan, *last;
scan = mmhead->next;
......@@ -334,7 +333,7 @@ void MM_Startup (void)
{
int i;
unsigned long length;
void far *start;
void *start;
unsigned segstart,seglength,endfree;
if (mmstarted)
......@@ -368,7 +367,7 @@ void MM_Startup (void)
// get all available near conventional memory segments
//
length=coreleft();
start = (void far *)(nearheap = malloc(length));
start = (void *)(nearheap = malloc(length));
length -= 16-(FP_OFF(start)&15);
length -= SAVENEARHEAP;
......@@ -434,8 +433,7 @@ void MM_Shutdown (void)
void MM_GetPtr (memptr *baseptr,unsigned long size)
{
mmblocktype far *scan,far *lastscan,far *endscan
,far *purge,far *next;
mmblocktype *scan, *lastscan, *endscan, *purge, *next;
int search;
unsigned needed,startseg;
......@@ -529,7 +527,7 @@ boolean SetViewSize (unsigned width, unsigned height);
//
if (!insetupscaling && viewsize>10)
{
mmblocktype far *savedmmnew;
mmblocktype *savedmmnew;
savedmmnew = mmnew;
viewsize -= 2;
SetViewSize (viewsize*16,viewsize*16*HEIGHTRATIO);
......@@ -558,7 +556,7 @@ mmblocktype far *savedmmnew;
void MM_FreePtr (memptr *baseptr)
{
mmblocktype far *scan,far *last;
mmblocktype *scan, *last;
last = mmhead;
scan = last->next;
......@@ -593,7 +591,7 @@ void MM_FreePtr (memptr *baseptr)
void MM_SetPurge (memptr *baseptr, int purge)
{
mmblocktype far *start;
mmblocktype *start;
start = mmrover;
......@@ -629,7 +627,7 @@ void MM_SetPurge (memptr *baseptr, int purge)
void MM_SetLock (memptr *baseptr, boolean locked)
{
mmblocktype far *start;
mmblocktype *start;
start = mmrover;
......@@ -665,7 +663,7 @@ void MM_SetLock (memptr *baseptr, boolean locked)
void MM_SortMem (void)
{
mmblocktype far *scan,far *last,far *next;
mmblocktype *scan, *last, *next;
unsigned start,length,source,dest;
int playing;
......@@ -771,7 +769,7 @@ void MM_SortMem (void)
void MM_ShowMemory (void)
{
mmblocktype far *scan;
mmblocktype *scan;
unsigned color,temp,x,y;
long end,owner;
char scratch[80],str[10];
......@@ -821,7 +819,7 @@ void MM_ShowMemory (void)
void MM_DumpData (void)
{
mmblocktype far *scan,far *best;
mmblocktype *scan, *best;
long lowest,oldlowest;
unsigned owner;
char lock,purge;
......@@ -889,7 +887,7 @@ void MM_DumpData (void)
long MM_UnusedMemory (void)
{
unsigned free;
mmblocktype far *scan;
mmblocktype *scan;
free = 0;
scan = mmhead;
......@@ -919,7 +917,7 @@ long MM_UnusedMemory (void)
long MM_TotalFree (void)
{
unsigned free;
mmblocktype far *scan;
mmblocktype *scan;
free = 0;
scan = mmhead;
......
src/id_pm.c
View file @ 713dc95c
......@@ -40,8 +40,7 @@
MainPagesUsed,
PMNumBlocks;
long PMFrameCount;
PageListStruct far *PMPages,
_seg *PMSegPages;
PageListStruct *PMPages, *PMSegPages;
static char *ParmStrings[] = {"nomain","noems","noxms",nil};
......@@ -241,7 +240,7 @@ error:
// Will round an odd-length request up to the next even value
//
void
PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length)
PML_XMSCopy(boolean toxms,byte *addr,word xmspage,word length)
{
longword xoffset;
struct
......@@ -281,7 +280,7 @@ asm pop si
// segment address to the specified XMS page
//
void
PML_CopyToXMS(byte far *source,int targetpage,word length)
PML_CopyToXMS(byte *source,int targetpage,word length)
{
PML_XMSCopy(true,source,targetpage,length);
}
......@@ -291,7 +290,7 @@ PML_CopyToXMS(byte far *source,int targetpage,word length)
// page to the specified real mode address
//
void
PML_CopyFromXMS(byte far *target,int sourcepage,word length)
PML_CopyFromXMS(byte *target,int sourcepage,word length)
{
PML_XMSCopy(false,target,sourcepage,length);
}
......@@ -353,7 +352,7 @@ PM_CheckMainMem(void)
int i,n;
memptr *p;
PMBlockAttr *used;
PageListStruct far *page;
PageListStruct *page;
if (!MainPresent)
return;
......@@ -466,7 +465,7 @@ PML_ShutdownMainMem(void)
// PML_ReadFromFile() - Reads some data in from the page file
//
void
PML_ReadFromFile(byte far *buf,long offset,word length)
PML_ReadFromFile(byte *buf,long offset,word length)
{
if (!buf)
Quit("PML_ReadFromFile: Null pointer");
......@@ -486,10 +485,10 @@ PML_OpenPageFile(void)
{
int i;
long size;
void _seg *buf;
longword far *offsetptr;
word far *lengthptr;
PageListStruct far *page;
void *buf;
longword *offsetptr;
word *lengthptr;
PageListStruct *page;
PageFile = open(PageFileName,O_RDONLY + O_BINARY);
if (PageFile == -1)
......@@ -504,15 +503,15 @@ PML_OpenPageFile(void)
PMNumBlocks = ChunksInFile;
MM_GetPtr(&(memptr)PMSegPages,sizeof(PageListStruct) * PMNumBlocks);
MM_SetLock(&(memptr)PMSegPages,true);
PMPages = (PageListStruct far *)PMSegPages;
PMPages = (PageListStruct *)PMSegPages;
_fmemset(PMPages,0,sizeof(PageListStruct) * PMNumBlocks);
// Read in the chunk offsets
size = sizeof(longword) * ChunksInFile;
MM_GetPtr(&buf,size);
if (!CA_FarRead(PageFile,(byte far *)buf,size))
if (!CA_FarRead(PageFile,(byte *)buf,size))
Quit("PML_OpenPageFile: Offset read failed");
offsetptr = (longword far *)buf;
offsetptr = (longword *)buf;
for (i = 0,page = PMPages;i < ChunksInFile;i++,page++)
page->offset = *offsetptr++;
MM_FreePtr(&buf);
......@@ -520,9 +519,9 @@ PML_OpenPageFile(void)
// Read in the chunk lengths
size = sizeof(word) * ChunksInFile;
MM_GetPtr(&buf,size);
if (!CA_FarRead(PageFile,(byte far *)buf,size))
if (!CA_FarRead(PageFile,(byte *)buf,size))
Quit("PML_OpenPageFile: Length read failed");
lengthptr = (word far *)buf;
lengthptr = (word *)buf;
for (i = 0,page = PMPages;i < ChunksInFile;i++,page++)
page->length = *lengthptr++;
MM_FreePtr(&buf);
......@@ -539,7 +538,7 @@ PML_ClosePageFile(void)
if (PMSegPages)
{
MM_SetLock(&(memptr)PMSegPages,false);
MM_FreePtr(&(void _seg *)PMSegPages);
MM_FreePtr(&(void *)PMSegPages);
}
}
......@@ -627,7 +626,7 @@ PML_GetEMSAddress(int page,PMLockType lock)
memptr
PM_GetPageAddress(int pagenum)
{
PageListStruct far *page;
PageListStruct *page;
page = &PMPages[pagenum];
if (page->mainPage != -1)
......@@ -647,7 +646,7 @@ PML_GiveLRUPage(boolean mainonly)
{
int i,lru;
long last;
PageListStruct far *page;
PageListStruct *page;
for (i = 0,page = PMPages,lru = -1,last = MAXLONG;i < ChunksInFile;i++,page++)
{
......@@ -679,7 +678,7 @@ PML_GiveLRUXMSPage(void)
{
int i,lru;
long last;
PageListStruct far *page;
PageListStruct *page;
for (i = 0,page = PMPages,lru = -1,last = MAXLONG;i < ChunksInFile;i++,page++)
{
......@@ -705,7 +704,7 @@ void
PML_PutPageInXMS(int pagenum)
{
int usexms;
PageListStruct far *page;
PageListStruct *page;
if (!XMSPresent)
return;
......@@ -735,7 +734,7 @@ memptr
PML_TransferPageSpace(int orig,int new)
{
memptr addr;
PageListStruct far *origpage,far *newpage;
PageListStruct *origpage, *newpage;
if (orig == new)
Quit("PML_TransferPageSpace: Identity replacement");
......@@ -776,13 +775,12 @@ PML_TransferPageSpace(int orig,int new)
// If mainonly is true, free EMS will be ignored, and only main pages
// will be looked at by PML_GiveLRUPage().
//
byte far *
PML_GetAPageBuffer(int pagenum,boolean mainonly)
byte *PML_GetAPageBuffer(int pagenum,boolean mainonly)
{
byte far *addr = nil;
byte *addr = nil;
int i,n;
PMBlockAttr *used;
PageListStruct far *page;
PageListStruct *page;
page = &PMPages[pagenum];
if ((EMSPagesUsed < EMSPagesAvail) && !mainonly)
......@@ -831,9 +829,9 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly)
memptr
PML_GetPageFromXMS(int pagenum,boolean mainonly)
{
byte far *checkaddr;
byte *checkaddr;
memptr addr = nil;
PageListStruct far *page;
PageListStruct *page;
page = &PMPages[pagenum];
if (XMSPresent && (page->xmsPage != -1))
......@@ -858,8 +856,8 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly)
void
PML_LoadPage(int pagenum,boolean mainonly)
{
byte far *addr;
PageListStruct far *page;
byte *addr;
PageListStruct *page;
addr = PML_GetAPageBuffer(pagenum,mainonly);
page = &PMPages[pagenum];
......@@ -955,7 +953,7 @@ PM_Preload(boolean (*update)(word current,word total))
emsfree,emstotal,
xmsfree,xmstotal;
memptr addr;
PageListStruct far *p;
PageListStruct *p;
mainfree = (MainPagesAvail - MainPagesUsed) + (EMSPagesAvail - EMSPagesUsed);
xmsfree = (XMSPagesAvail - XMSPagesUsed);
......@@ -1038,8 +1036,8 @@ PM_Preload(boolean (*update)(word current,word total))
if (p->length > PMPageSize)
Quit("PM_Preload: Page too long");
PML_ReadFromFile((byte far *)addr,p->offset,p->length);
PML_CopyToXMS((byte far *)addr,p->xmsPage,p->length);
PML_ReadFromFile((byte *)addr,p->offset,p->length);
PML_CopyToXMS((byte *)addr,p->xmsPage,p->length);
page++;
current++;
......@@ -1048,7 +1046,7 @@ PM_Preload(boolean (*update)(word current,word total))
}
p = &PMPages[oogypage];
PML_ReadFromFile((byte far *)addr,p->offset,p->length);
PML_ReadFromFile((byte *)addr,p->offset,p->length);
}
update(total,total);
......@@ -1114,7 +1112,7 @@ void
PM_Reset(void)
{
int i;
PageListStruct far *page;
PageListStruct *page;
XMSPagesAvail = XMSAvail / PMPageSizeKB;
......
src/id_sd.c
View file @ 713dc95c
......@@ -67,7 +67,7 @@ extern void interrupt SDL_t0ExtremeAsmService(void),
SDSMode DigiMode;
longword TimeCount;
word HackCount;
word *SoundTable; // Really * _seg *SoundTable, but that don't work
word *SoundTable;
boolean ssIsTandy;
word ssPort = 2;
int DigiMap[LASTSOUND];
......@@ -97,7 +97,7 @@ static void (*SoundUserHook)(void);
word TimerRate;
word NumDigi,DigiLeft,DigiPage;
word _seg *DigiList;
word *DigiList;
word DigiLastStart,DigiLastEnd;
boolean DigiPlaying;
static boolean DigiMissed,DigiLastSegment;
......@@ -108,7 +108,7 @@ static word DigiNextLen;
static boolean sbNoCheck,sbNoProCheck;
static volatile boolean sbSamplePlaying;
static byte sbOldIntMask = -1;
static volatile byte huge *sbNextSegPtr;
static volatile byte *sbNextSegPtr;
static byte sbDMA = 1,
sbDMAa1 = 0x83,sbDMAa2 = 2,sbDMAa3 = 3,
sba1Vals[] = {0x87,0x83,0,0x82},
......@@ -117,7 +117,7 @@ static byte sbDMA = 1,
static int sbLocation = -1,sbInterrupt = 7,sbIntVec = 0xf,
sbIntVectors[] = {-1,-1,0xa,0xb,-1,0xd,-1,0xf,-1,-1,-1};
static volatile longword sbNextSegLen;
static volatile SampledSound huge *sbSamples;
static volatile SampledSound *sbSamples;
static void interrupt (*sbOldIntHand)(void);
static byte sbpOldFMMix,sbpOldVOCMix;
......@@ -126,17 +126,17 @@ static byte sbpOldFMMix,sbpOldVOCMix;
boolean ssActive;
word ssControl,ssStatus,ssData;
byte ssOn,ssOff;
volatile byte far *ssSample;
volatile byte *ssSample;
volatile longword ssLengthLeft;
// PC Sound variables
volatile byte pcLastSample,far *pcSound;
volatile byte pcLastSample, *pcSound;
longword pcLengthLeft;
word pcSoundLookup[255];
// AdLib variables
boolean alNoCheck;
byte far *alSound;
byte *alSound;
word alBlock;
longword alLengthLeft;
longword alTimeCount;
......@@ -155,7 +155,7 @@ static word alFXReg;
static ActiveTrack *tracks[sqMaxTracks],
mytracks[sqMaxTracks];
static word sqMode,sqFadeStep;
word far *sqHack,far *sqHackPtr,sqHackLen,sqHackSeqLen;
word *sqHack, *sqHackPtr,sqHackLen,sqHackSeqLen;
long sqHackTime;
// Internal routines
......@@ -279,7 +279,7 @@ asm popf
//
///////////////////////////////////////////////////////////////////////////
static longword
SDL_SBPlaySeg(volatile byte huge *data,longword length)
SDL_SBPlaySeg(volatile byte *data,longword length)
{
unsigned datapage;
longword dataofs,uselen;
......@@ -361,7 +361,7 @@ SDL_SBService(void)
// DMA to play the sound
//
///////////////////////////////////////////////////////////////////////////
static void SDL_SBPlaySample(byte huge *data,longword len)
static void SDL_SBPlaySample(byte *data,longword len)
{
longword used;
......@@ -670,13 +670,13 @@ done:;
// SDL_SSPlaySample() - Plays the specified sample on the Sound Source
//
///////////////////////////////////////////////////////////////////////////
static void SDL_SSPlaySample(byte huge *data,longword len)
static void SDL_SSPlaySample(byte *data,longword len)
{
asm pushf
asm cli
ssLengthLeft = len;
ssSample = (volatile byte far *)data;
ssSample = (volatile byte *)data;
asm popf
}
......@@ -793,7 +793,7 @@ SDL_DetectSoundSource(void)
// SDL_PCPlaySample() - Plays the specified sample on the PC speaker
//
///////////////////////////////////////////////////////////////////////////
static void SDL_PCPlaySample(byte huge *data,longword len)
static void SDL_PCPlaySample(byte *data,longword len)
{
asm pushf
asm cli
......@@ -801,7 +801,7 @@ asm cli
SDL_IndicatePC(true);
pcLengthLeft = len;
pcSound = (volatile byte far *)data;
pcSound = (volatile byte *)data;
asm popf
}
......@@ -832,7 +832,7 @@ asm popf
// SDL_PCPlaySound() - Plays the specified sound on the PC speaker
//
///////////////////////////////////////////////////////////////////////////
static void SDL_PCPlaySound(PCSound far *sound)
static void SDL_PCPlaySound(PCSound *sound)
{
asm pushf
asm cli
......@@ -1186,15 +1186,15 @@ void
SDL_SetupDigi(void)
{
memptr list;
word far *p,
word *p,
pg;
int i;
PM_UnlockMainMem();
MM_GetPtr(&list,PMPageSize);
PM_CheckMainMem();
p = (word far *)MK_FP(PM_GetPage(ChunksInFile - 1),0);
_fmemcpy((void far *)list,(void far *)p,PMPageSize);
p = (word *)MK_FP(PM_GetPage(ChunksInFile - 1),0);
_fmemcpy((void *)list,(void *)p,PMPageSize);
pg = PMSoundStart;
for (i = 0;i < PMPageSize / (sizeof(word) * 2);i++,p += 2)
{
......@@ -1204,7 +1204,7 @@ SDL_SetupDigi(void)
}
PM_UnlockMainMem();
MM_GetPtr((memptr *)&DigiList,i * sizeof(word) * 2);
_fmemcpy((void far *)DigiList,(void far *)list,i * sizeof(word) * 2);
_fmemcpy((void *)DigiList,(void *)list,i * sizeof(word) * 2);
MM_FreePtr(&list);
NumDigi = i;
......@@ -1288,7 +1288,7 @@ asm in al,dx
//
///////////////////////////////////////////////////////////////////////////
static void
SDL_SetInstrument(int track,int which,Instrument far *inst,boolean percussive)
SDL_SetInstrument(int track,int which,Instrument *inst,boolean percussive)
{
byte c,m;
......@@ -1344,7 +1344,7 @@ asm popf
}
static void
SDL_AlSetFXInst(Instrument far *inst)
SDL_AlSetFXInst(Instrument *inst)
{
byte c,m;
......@@ -1371,10 +1371,10 @@ SDL_AlSetFXInst(Instrument far *inst)
// SDL_ALPlaySound() - Plays the specified sound on the AdLib card
//
///////////////////////////////////////////////////////////////////////////
static void SDL_ALPlaySound(AdLibSound far *sound)
static void SDL_ALPlaySound(AdLibSound *sound)
{
Instrument far *inst;
byte huge *data;
Instrument *inst;
byte *data;
SDL_ALStopSound();
......@@ -1385,7 +1385,7 @@ asm cli
data = sound->data;
data++;
data--;
alSound = (byte far *)data;
alSound = (byte *)data;
alBlock = ((sound->block & 7) << 2) | 0x20;
inst = &sound->inst;
......@@ -1457,7 +1457,7 @@ SDL_ALService(void)
alTimeCount++;
if (!sqHackLen)
{
sqHackPtr = (word far *)sqHack;
sqHackPtr = (word *)sqHack;
sqHackLen = sqHackSeqLen;
alTimeCount = sqHackTime = 0;
}
......@@ -2059,7 +2059,7 @@ boolean
SD_PlaySound(soundnames sound)
{
boolean ispos;
SoundCommon far *s;
SoundCommon *s;
int lp,rp;
lp = LeftPosition;
......@@ -2124,10 +2124,10 @@ SD_PlaySound(soundnames sound)
switch (SoundMode)
{
case sdm_PC:
SDL_PCPlaySound((void far *)s);
SDL_PCPlaySound((void *)s);
break;
case sdm_AdLib:
SDL_ALPlaySound((void far *)s);
SDL_ALPlaySound((void *)s);
break;
}
......@@ -2242,7 +2242,7 @@ SD_MusicOff(void)
//
///////////////////////////////////////////////////////////////////////////
void
SD_StartMusic(MusicGroup far *music)
SD_StartMusic(MusicGroup *music)
{
SD_MusicOff();
asm pushf
......
src/wl_debug.c
View file @ 713dc95c
......@@ -138,7 +138,7 @@ void PicturePause (void)
int i;
byte p;
unsigned x;
byte far *dest,far *src;
byte *dest, *src;
memptr buffer;
VW_ColorBorder (15);
......@@ -165,7 +165,7 @@ void PicturePause (void)
for (p=0;p<4;p++)
{
src = MK_FP(0xa000,displayofs);
dest = (byte far *)buffer+p;
dest = (byte *)buffer+p;
VGAREADMAP(p);
for (x=0;x<16000;x++,dest+=4)
*dest = *src++;
......@@ -176,7 +176,7 @@ void PicturePause (void)
for (p=0;p<4;p++)
{
src = MK_FP(0xa000,0);
dest = (byte far *)buffer+51200+p;
dest = (byte *)buffer+51200+p;
VGAREADMAP(p);
for (x=0;x<3200;x++,dest+=4)
*dest = *src++;
......@@ -212,11 +212,10 @@ void PicturePause (void)
================
*/
#pragma warn -pia
void ShapeTest (void)
{
extern word NumDigi;
extern word _seg *DigiList;
extern word *DigiList;
static char buf[10];
boolean done;
......@@ -224,7 +223,7 @@ static char buf[10];
int i,j,k,x;
longword l;
memptr addr;
PageListStruct far *page;
PageListStruct *page;
CenterWindow(20,16);
VW_UpdateScreen();
......@@ -313,7 +312,7 @@ static char buf[10];
}
else
{
byte far *dp = (byte far *)MK_FP(addr,0);
byte *dp = (byte *)MK_FP(addr,0);
for (j = 0;j < NumDigi;j++)
{
k = (DigiList[(j * 2) + 1] + (PMPageSize - 1)) / PMPageSize;
......@@ -396,9 +395,6 @@ static char buf[10];
}
SD_StopDigitized();
}
#pragma warn +pia
//===========================================================================
......
src/wl_draw.c
View file @ 713dc95c
......@@ -397,7 +397,7 @@ long postsource;
unsigned postx;
unsigned postwidth;
void near ScalePost (void) // VGA version
void ScalePost(void)
{
asm mov ax,SCREENSEG
asm mov es,ax
......
src/wl_menu.c
View file @ 713dc95c
......@@ -5,7 +5,6 @@
//
////////////////////////////////////////////////////////////////////
#include "wl_def.h"
#pragma hdrstop
//
// PRIVATE PROTOTYPES
......@@ -3724,7 +3723,7 @@ int GetYorN(int x,int y,int pic)
void Message(char far *string)
{
int h=0,w=0,mw=0,i,x,y,time;
fontstruct _seg *font;
fontstruct *font;
CA_CacheGrChunk (STARTFONT+1);
......
src/wl_scale.c
View file @ 713dc95c
......@@ -13,7 +13,7 @@
=============================================================================
*/
t_compscale _seg *scaledirectory[MAXSCALEHEIGHT+1];
t_compscale *scaledirectory[MAXSCALEHEIGHT+1];
long fullscalefarcall[MAXSCALEHEIGHT+1];
int maxscale,maxscaleshl2;
......@@ -28,7 +28,7 @@ boolean insetupscaling;
=============================================================================
*/
t_compscale _seg *work;
t_compscale *work;
unsigned BuildCompScale (int height, memptr *finalspot);
int stepbytwo;
......@@ -222,7 +222,7 @@ unsigned BuildCompScale (int height, memptr *finalspot)
totalsize = FP_OFF(code);
MM_GetPtr (finalspot,totalsize);
_fmemcpy ((byte _seg *)(*finalspot),(byte _seg *)work,totalsize);
_fmemcpy ((byte *)(*finalspot),(byte *)work,totalsize);
return totalsize;
}
......@@ -246,7 +246,7 @@ extern unsigned maskword;
byte mask1,mask2,mask3;
void near ScaleLine (void)
void ScaleLine (void)
{
asm mov cx,WORD PTR [linescale+2]
asm mov es,cx // segment of scaler
......@@ -420,8 +420,8 @@ static long longtemp;
void ScaleShape (int xcenter, int shapenum, unsigned height)
{
t_compshape _seg *shape;
t_compscale _seg *comptable;
t_compshape *shape;
t_compscale *comptable;
unsigned scale,srcx,stopx,tempx;
int t;
unsigned far *cmdptr;
......@@ -624,8 +624,8 @@ void ScaleShape (int xcenter, int shapenum, unsigned height)
void SimpleScaleShape (int xcenter, int shapenum, unsigned height)
{
t_compshape _seg *shape;
t_compscale _seg *comptable;
t_compshape *shape;
t_compscale *comptable;
unsigned scale,srcx,stopx,tempx;
int t;
unsigned far *cmdptr;
......
src/wl_text.c
View file @ 713dc95c
......@@ -767,11 +767,11 @@ void HelpScreens (void)
#ifdef ARTSEXTERN
artnum = helpextern;
CA_CacheGrChunk (artnum);
text = (char _seg *)grsegs[artnum];
text = (char *)grsegs[artnum];
MM_SetLock (&grsegs[artnum], true);
#else
CA_LoadFile (helpfilename,&layout);
text = (char _seg *)layout;
text = (char *)layout;
MM_SetLock (&layout, true);
#endif
......@@ -828,12 +828,12 @@ void EndText (void)
#ifdef ARTSEXTERN
artnum = endextern+gamestate.episode;
CA_CacheGrChunk (artnum);
text = (char _seg *)grsegs[artnum];
text = (char *)grsegs[artnum];
MM_SetLock (&grsegs[artnum], true);
#else
endfilename[6] = '1'+gamestate.episode;
CA_LoadFile (endfilename,&layout);
text = (char _seg *)layout;
text = (char *)layout;
MM_SetLock (&layout, true);
#endif
......
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