Attachment #93751 for bug #132055

Line Link Here

(-)file_not_specified_in_diff (-2 / +2 lines)
0	-- utils/vcc/vcpp/cpp.h 2006-07-20 23:33:51.000000000 +0200	0	++ utils/vcc/vcpp/cpp.h 2006-07-20 23:34:36.000000000 +0200
Lines 155-161 Link Here
155	extern "C" {	155	extern "C" {
156	extern int creat(char *, int);	156	extern int creat(char *, int);
157	extern int open(char *, int);	157	extern int open(char *, int, ...);
158	extern int close(int);	158	extern int close(int);
159	extern int dup2(int, int);	159	extern int dup2(int, int);
160	extern int write(int, const void *, size_t);	160	extern int write(int, const void *, size_t);




#include "gamedefs.h"
#include "s_local.h"

#ifndef AL_VERSION_1_1
typedef ALchar ALubyte;
#endif

class VOpenALDevice : public VSoundDevice
{
private:

	}
	Z_Free(sbuf);

	if (alIsExtensionPresent((ALchar*)"EAX"))
	{
		GCon->Log(NAME_Init, "EAX 2.0 supported");
		pEAXSet = (EAXSet)alGetProcAddress((ALchar*)"EAXSet");
		pEAXGet = (EAXGet)alGetProcAddress((ALchar*)"EAXGet");
		supportEAX = true;
	}


Lines 537-542 Link Here

(-)utils/glvis/level.cpp (+8 lines)
537	subsector_t *sub = &subsectors[line->leaf];	537	subsector_t *sub = &subsectors[line->leaf];
538	if (line->partner)	538	if (line->partner)
539	{	539	{
		540	// Skip self-referencing subsector segs
		541	if (line->leaf == line->partner->leaf)
		542	{
		543	Owner.DisplayMessage("Self-referencing subsector detected\n");
		544	numportals--;
		545	continue;
		546	}
		547
540	// create portal	548	// create portal
541	if (sub->numportals == MAX_PORTALS_ON_LEAF)	549	if (sub->numportals == MAX_PORTALS_ON_LEAF)
542	throw GLVisError("Leaf with too many portals");	550	throw GLVisError("Leaf with too many portals");

Lines 283-288 Link Here

(-)progs/doom/cgame/StatusBarScreen.vc (+8 lines)
283	{	283	{
284	int i;	284	int i;
285		285
		286	// draw something in the blank spaces
		287	// check which version of Doom we are playing
		288	#ifdef DOOM2
		289	R_FillRectWithFlat(0, 448, 640, 32, 'grnrock');
		290	#else
		291	R_FillRectWithFlat(0, 448, 640, 32, 'floor7_2');
		292	#endif
		293
286	// background	294	// background
287	R_DrawPic(ST_BGX, ST_BGY, pic_bar);	295	R_DrawPic(ST_BGX, ST_BGY, pic_bar);
288		296

Lines 271-276 Link Here

(-)progs/heretic/cgame/StatusBarScreen.vc (+4 lines)
271	int i;	271	int i;
272	int health;	272	int health;
273		273
		274	// draw something in the blank spaces
		275	R_FillRectWithFlat(0, 438, 640, 42,
		276	!WadLumpPresent('e2m1') ? 'floor04' : 'flat513');
		277
274	// Background	278	// Background
275	R_DrawPic(BAR_X, BAR_Y, pic_barback);	279	R_DrawPic(BAR_X, BAR_Y, pic_barback);
276		280

Lines 307-312 Link Here

(-)progs/hexen/cgame/StatusBarScreen.vc (+3 lines)
307	sb_health = 100;	307	sb_health = 100;
308	}	308	}
309		309
		310	// draw something in the blank spaces
		311	R_FillRectWithFlat(0, 441, 640, 39, 'f_022');
		312
310	R_DrawPic(BAR_X + 0, BAR_Y - 27, pic_bar);	313	R_DrawPic(BAR_X + 0, BAR_Y - 27, pic_bar);
311	R_DrawPic(BAR_X + 28 + (((sb_health * 196) / 100) % 9), BAR_Y + 32, pic_chain);	314	R_DrawPic(BAR_X + 28 + (((sb_health * 196) / 100) % 9), BAR_Y + 32, pic_chain);
312	R_DrawPic(BAR_X + 7 + ((sb_health * 11) / 5), BAR_Y + 32, pic_lifegem);	315	R_DrawPic(BAR_X + 7 + ((sb_health * 11) / 5), BAR_Y + 32, pic_lifegem);

Lines 261-266 Link Here

(-)progs/strife/cgame/StatusBarScreen.vc (-2 / +85 lines)
261	int i;	261	int i;
262	int NumKeys;	262	int NumKeys;
263		263
		264	// draw something in the blank spaces
		265	R_FillRectWithFlat(0, 448, 640, 32, 'f_pave01');
		266
264	// background	267	// background
265	R_DrawPic(BAR_X + 0, BAR_Y + 168, pic_invback);	268	R_DrawPic(BAR_X + 0, BAR_Y + 168, pic_invback);
266	R_DrawPic(BAR_X + 0, BAR_Y + 160, pic_invtop);	269	R_DrawPic(BAR_X + 0, BAR_Y + 160, pic_invtop);
Lines 430-435 Link Here
430	{	433	{
431	int Idx;	434	int Idx;
432	int i;	435	int i;
		436	int NumKeys;
433		437
434	// health	438	// health
435	SB_DrawTallNum(70, 450, cl.health, 30);	439	SB_DrawTallNum(70, 450, cl.health, 30);
Lines 477-482 Link Here
477	{	481	{
478	R_DrawPic2(530, 450, pic_sigil[cl.Sigil], 40);	482	R_DrawPic2(530, 450, pic_sigil[cl.Sigil], 40);
479	}	483	}
		484
		485	if (bShowWeapons)
		486	{
		487	R_DrawPic2(BAR_X + 0, BAR_Y + 96, pic_invpbak, 33);
		488	R_DrawPic(BAR_X + 0, BAR_Y + 96, pic_invpop);
		489	if (cl.WeaponOwned[StrifeDefs::wp_crossbow])
		490	{
		491	R_DrawPic(BAR_X + 38, BAR_Y + 126, pic_crossbow);
		492	}
		493	if (cl.WeaponOwned[StrifeDefs::wp_riffle])
		494	{
		495	R_DrawPic(BAR_X + 40, BAR_Y + 147, pic_riffle);
		496	}
		497	if (cl.WeaponOwned[StrifeDefs::wp_missile])
		498	{
		499	R_DrawPic(BAR_X + 39, BAR_Y + 171, pic_missile);
		500	}
		501	if (cl.WeaponOwned[StrifeDefs::wp_grenade])
		502	{
		503	R_DrawPic(BAR_X + 78, BAR_Y + 127, pic_grenade);
		504	}
		505	if (cl.WeaponOwned[StrifeDefs::wp_flame])
		506	{
		507	R_DrawPic(BAR_X + 80, BAR_Y + 157, pic_flame);
		508	}
		509	if (cl.WeaponOwned[StrifeDefs::wp_blaster])
		510	{
		511	R_DrawPic(BAR_X + 75, BAR_Y + 182, pic_blaster);
		512	}
		513	for (i = 0; i < StrifeDefs::NUMAMMO; i++)
		514	{
		515	SB_DrawSmallNum(BAR_X + 205, BAR_Y + 40 + AmmoPosY[i], cl.Ammo[i]);
		516	SB_DrawSmallNum(BAR_X + 238, BAR_Y + 40 + AmmoPosY[i], cl.MaxAmmo[i] * (cl.Backpack ? 2 : 1));
		517	}
		518	SB_DrawSmallNum(BAR_X + 267, BAR_Y + 124, cl.Accuracy);
		519	SB_DrawSmallNum(BAR_X + 267, BAR_Y + 148, cl.Stamina);
		520	NumKeys = 0;
		521	for (i = 0; i < StrifeDefs::NUMKEYS; i++)
		522	{
		523	if (cl.Keys & (1 << i))
		524	{
		525	NumKeys++;
		526	}
		527	}
		528	SB_DrawSmallNum(BAR_X + 267, BAR_Y + 172, NumKeys);
		529	if (cl.Communicator)
		530	{
		531	R_DrawPic(BAR_X + 280, BAR_Y + 170, pic_i_comm);
		532	}
		533	}
		534	else if (bShowKeys)
		535	{
		536	R_DrawPic2(BAR_X + 0, BAR_Y + 96, pic_invpbak2, 33);
		537	R_DrawPic(BAR_X + 0, BAR_Y + 96, pic_invpop2);
		538	for (i = 0; i < 10; i++)
		539	{
		540	if (cl.Keys & (1 << (i + KeysPage * 10)))
		541	{
		542	R_DrawPic(BAR_X + 20 + (i / 5) * 140, BAR_Y + 100 + (i % 5) * 18,
		543	pic_key[i + KeysPage * 10]);
		544	T_SetFont(font_yellow);
		545	T_SetAlign(hleft, vtop);
		546	T_DrawText(BAR_X + 40 + (i / 5) * 140, BAR_Y + 104 + (i % 5) * 18,
		547	KeyNames[i + KeysPage * 10]);
548	}
549	}
550	}
551	else if (bShowObjectives)
552	{
553	R_DrawPic2(BAR_X + 0, BAR_Y + 96, pic_invpbak2, 33);
554	R_DrawPic(BAR_X + 0, BAR_Y + 96, pic_invpop2);
555	if (LoadedLog != cl.Objectives)
556	{
557	LogText = LoadTextLump(StrToName(va("log%d", cl.Objectives)));
558	LoadedLog = cl.Objectives;
559	}
560	T_SetFont(font_yellow);
561	T_SetAlign(hleft, vtop);
562	T_DrawTextW(BAR_X + 20, BAR_Y + 100, LogText, 280);
563	}
480	}	564	}
481		565
482	//==========================================================================	566	//==========================================================================
Lines 502-509 Link Here
502		586
503	void SB_Drawer(int sb_view)	587	void SB_Drawer(int sb_view)
504	{	588	{
505	if (sb_view != SB_VIEW_FULLSCREEN \|\|	589	if (sb_view != SB_VIEW_FULLSCREEN)
506	bShowWeapons \|\| bShowKeys \|\| bShowObjectives)
507	{	590	{
508	SB_DrawMainBar();	591	SB_DrawMainBar();
509	}	592	}

Return to bug 132055

Lines 39-44 Link Here

(-)source/s_al.cpp (-3 / +7 lines)
39	#include "gamedefs.h"	39	#include "gamedefs.h"
40	#include "s_local.h"	40	#include "s_local.h"
41		41
		42	#ifndef AL_VERSION_1_1
		43	typedef ALchar ALubyte;
		44	#endif
		45
42	class VOpenALDevice : public VSoundDevice	46	class VOpenALDevice : public VSoundDevice
43	{	47	{
44	private:	48	private:
Lines 165-175 Link Here
165	}	169	}
166	Z_Free(sbuf);	170	Z_Free(sbuf);
167		171
168	if (alIsExtensionPresent((ALubyte *)"EAX"))	172	if (alIsExtensionPresent((ALchar*)"EAX"))
169	{	173	{
170	GCon->Log(NAME_Init, "EAX 2.0 supported");	174	GCon->Log(NAME_Init, "EAX 2.0 supported");
171	pEAXSet = (EAXSet)alGetProcAddress((ALubyte *)"EAXSet");	175	pEAXSet = (EAXSet)alGetProcAddress((ALchar*)"EAXSet");
172	pEAXGet = (EAXGet)alGetProcAddress((ALubyte *)"EAXGet");	176	pEAXGet = (EAXGet)alGetProcAddress((ALchar*)"EAXGet");
173	supportEAX = true;	177	supportEAX = true;
174	}	178	}
175		179