src/viewport.cpp
changeset 7931 b0a46cd92225
parent 7929 6c9b25842b0f
child 7951 9df5b61377c7
equal deleted inserted replaced
7930:f12c2437a050 7931:b0a46cd92225
   177 
   177 
   178 	for (vp = _viewports, bit = 0; ; vp++, bit++) {
   178 	for (vp = _viewports, bit = 0; ; vp++, bit++) {
   179 		assert(vp != endof(_viewports));
   179 		assert(vp != endof(_viewports));
   180 		if (vp->width == 0) break;
   180 		if (vp->width == 0) break;
   181 	}
   181 	}
   182 	SETBIT(_active_viewports, bit);
   182 	SetBit(_active_viewports, bit);
   183 
   183 
   184 	vp->left = x + w->left;
   184 	vp->left = x + w->left;
   185 	vp->top = y + w->top;
   185 	vp->top = y + w->top;
   186 	vp->width = width;
   186 	vp->width = width;
   187 	vp->height = height;
   187 	vp->height = height;
   625 
   625 
   626 	assert((image & SPRITE_MASK) < MAX_SPRITES);
   626 	assert((image & SPRITE_MASK) < MAX_SPRITES);
   627 
   627 
   628 	/* make the sprites transparent with the right palette */
   628 	/* make the sprites transparent with the right palette */
   629 	if (transparent) {
   629 	if (transparent) {
   630 		SETBIT(image, PALETTE_MODIFIER_TRANSPARENT);
   630 		SetBit(image, PALETTE_MODIFIER_TRANSPARENT);
   631 		pal = PALETTE_TO_TRANSPARENT;
   631 		pal = PALETTE_TO_TRANSPARENT;
   632 	}
   632 	}
   633 
   633 
   634 	if (vd->combine_sprites == 2) {
   634 	if (vd->combine_sprites == 2) {
   635 		AddCombinedSprite(image, pal, x, y, z, sub);
   635 		AddCombinedSprite(image, pal, x, y, z, sub);
   737 
   737 
   738 	assert((image & SPRITE_MASK) < MAX_SPRITES);
   738 	assert((image & SPRITE_MASK) < MAX_SPRITES);
   739 
   739 
   740 	/* make the sprites transparent with the right palette */
   740 	/* make the sprites transparent with the right palette */
   741 	if (transparent) {
   741 	if (transparent) {
   742 		SETBIT(image, PALETTE_MODIFIER_TRANSPARENT);
   742 		SetBit(image, PALETTE_MODIFIER_TRANSPARENT);
   743 		pal = PALETTE_TO_TRANSPARENT;
   743 		pal = PALETTE_TO_TRANSPARENT;
   744 	}
   744 	}
   745 
   745 
   746 	if (vd->spritelist_mem >= vd->eof_spritelist_mem) {
   746 	if (vd->spritelist_mem >= vd->eof_spritelist_mem) {
   747 		DEBUG(sprite, 0, "Out of sprite memory");
   747 		DEBUG(sprite, 0, "Out of sprite memory");