- Fixed: wbstartstruct's lump name fields were only 8 characters long

and not properly zero-terminated when all 8 characters were used.
- Fixed: Local sound sequence definitions caused a crash because a proper
  NULL check was missing. 

SVN r933 (trunk)
This commit is contained in:
Christoph Oelckers 2008-04-23 23:04:00 +00:00
parent 4667bfe46f
commit b129ed3948
5 changed files with 23 additions and 6 deletions

View file

@ -1,3 +1,9 @@
April 23, 2008 (Changes by Graf Zahl)
- Fixed: wbstartstruct's lump name fields were only 8 characters long
and not properly zero-terminated when all 8 characters were used.
- Fixed: Local sound sequence definitions caused a crash because a proper
NULL check was missing.
April 22, 2008 (Changes by Graf Zahl) April 22, 2008 (Changes by Graf Zahl)
- Added translucent blending modes to FMultipatchTexture (not tested yet!) - Added translucent blending modes to FMultipatchTexture (not tested yet!)
- Also changed all true color texture creation functions to use proper alpha - Also changed all true color texture creation functions to use proper alpha

View file

@ -1857,6 +1857,10 @@ void G_DoCompleted (void)
strncpy (wminfo.lname1, nextinfo->pname, 8); strncpy (wminfo.lname1, nextinfo->pname, 8);
} }
} }
wminfo.next[8]=0;
wminfo.lname0[8]=0;
wminfo.lname1[8]=0;
wminfo.current[8]=0;
CheckWarpTransMap (wminfo.next, true); CheckWarpTransMap (wminfo.next, true);

View file

@ -366,11 +366,18 @@ void S_Start ()
if (level.info && level.info->soundinfo) if (level.info && level.info->soundinfo)
{ {
LocalSndInfo = level.info->soundinfo; LocalSndInfo = level.info->soundinfo;
LocalSndSeq = level.info->sndseq;
} }
else else
{ {
LocalSndInfo = ""; LocalSndInfo = "";
}
if (level.info && level.info->sndseq)
{
LocalSndSeq = level.info->sndseq;
}
else
{
LocalSndSeq = ""; LocalSndSeq = "";
} }

View file

@ -47,11 +47,11 @@ typedef struct wbstartstruct_s
int finished_ep; int finished_ep;
int next_ep; int next_ep;
char current[8]; // [RH] Name of map just finished char current[9]; // [RH] Name of map just finished
char next[8]; // next level, [RH] actual map name char next[9]; // next level, [RH] actual map name
char lname0[8]; char lname0[9];
char lname1[8]; char lname1[9];
int maxkills; int maxkills;
int maxitems; int maxitems;

View file

@ -746,7 +746,7 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
SetPriorityClass (GetCurrentProcess (), IDLE_PRIORITY_CLASS); SetPriorityClass (GetCurrentProcess (), IDLE_PRIORITY_CLASS);
} }
//SetSoundPaused (wParam); SetSoundPaused (wParam);
break; break;
case WM_WTSSESSION_CHANGE: case WM_WTSSESSION_CHANGE: