Attachment #713325 for bug #787119

Lines 49-55 private: Link Here

(-)/var/tmp/portage/x11-misc/rss-glx-0.9.1-r3/work/rss-glx_0.9.1/src/Implicit/impSurface.h (-1 / +1 lines)
49	std::vector<unsigned int> triStripLengths;	49	std::vector<unsigned int> triStripLengths;
50	std::vector<unsigned int> indices;	50	std::vector<unsigned int> indices;
51	std::vector<float> vertices;	51	std::vector<float> vertices;
52	size_t vertex_data_size;	52	std::size_t vertex_data_size;
53		53
54	inline void addvec(float* dest, float* a, float* b);	54	inline void addvec(float* dest, float* a, float* b);
55	inline void subvec(float* dest, float* a, float* b);	55	inline void subvec(float* dest, float* a, float* b);




		GetExceptionInfo (&exception);
#endif

		if (!pics) {
			LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size)
		}

		if ((text_x != 90) || (text_y != 70)) {
			if (!pic)

			DestroyImage (image);
			DestroyImage (scaled_image);
		} else {
			if (!pics) {
				LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size)
			}

			pic = (unsigned char *)(pics + ((random () & 15) * (text_x * text_y)));
		}

Lines 279-284 void CBuilding::ConstructRoof (float lef Link Here

(-)/var/tmp/portage/x11-misc/rss-glx-0.9.1-r3/work/rss-glx_0.9.1/src/PixelCity/Building.cpp (+3 lines)
279	//See if this building is special and worthy of fancy roof decorations.	279	//See if this building is special and worthy of fancy roof decorations.
280	if (bottom > 35.0f)	280	if (bottom > 35.0f)
281	addon = RandomVal (ADDON_COUNT);	281	addon = RandomVal (ADDON_COUNT);
		282	else
		283	addon = ADDON_NONE; //was implied, but this gets rid of warning
282	//Build the roof slab	284	//Build the roof slab
283	ConstructCube (left, right, front, back, bottom, bottom + (float)height);	285	ConstructCube (left, right, front, back, bottom, bottom + (float)height);
284	//Consider putting a logo on the roof, if it's tall enough	286	//Consider putting a logo on the roof, if it's tall enough
Lines 429-434 float CBuilding::ConstructWall (int star Link Here
429	case SOUTH:	431	case SOUTH:
430	step_z = -1; step_x = 0; break;	432	step_z = -1; step_x = 0; break;
431	case EAST:	433	case EAST:
		434	default:
432	step_z = 0; step_x = 1; break;	435	step_z = 0; step_x = 1; break;
433	}	436	}
434	x = start_x;;	437	x = start_x;;

Return to bug 787119

Lines 248-255 void loadNextImage () Link Here

(-)/var/tmp/portage/x11-misc/rss-glx-0.9.1-r3/work/rss-glx_0.9.1/src/matrixview.c (-2 / +4 lines)
248	GetExceptionInfo (&exception);	248	GetExceptionInfo (&exception);
249	#endif	249	#endif
250		250
251	if (!pics)	251	if (!pics) {
252	LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size)	252	LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size)
		253	}
253		254
254	if ((text_x != 90) \|\| (text_y != 70)) {	255	if ((text_x != 90) \|\| (text_y != 70)) {
255	if (!pic)	256	if (!pic)
Lines 279-286 void loadNextImage () Link Here
279	DestroyImage (image);	280	DestroyImage (image);
280	DestroyImage (scaled_image);	281	DestroyImage (scaled_image);
281	} else {	282	} else {
282	if (!pics)	283	if (!pics) {
283	LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size)	284	LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size)
		285	}
284		286
285	pic = (unsigned char )(pics + ((random () & 15) (text_x * text_y)));	287	pic = (unsigned char )(pics + ((random () & 15) (text_x * text_y)));
286	}	288	}