cpp/openttd-patchpack/source Changeset - r8562:1f7710ea9740

Changeset - r8562:1f7710ea9740

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

belugas - 16 years ago 2008-02-14 15:13:36
belugas@openttd.org

(svn r12140) -Codechange: A bit of code style fixes(Geektoo).

2 files changed with 9 insertions and 3 deletions:

src/spritecache.cpp

src/viewport.cpp

0 comments (0 inline, 0 general)

src/spritecache.cpp

➞

Show inline comments

@@ @@ -284,8 +284,9 @@ static uint32 GetSpriteCacheUsage() @@
 	uint32 tot_size = 0;
 	MemBlock* s;
 	for (s = _spritecache_ptr; s->size != 0; s = NextBlock(s))
+	for (s = _spritecache_ptr; s->size != 0; s = NextBlock(s)) {
 		if (!(s->size & S_FREE_MASK)) tot_size += s->size;
+	}
 	return tot_size;
+}
@@ @@ -454,6 +455,7 @@ const void *GetRawSprite(SpriteID sprite @@
 	/* Load the sprite, if it is not loaded, yet */
 	if (p == NULL) p = ReadSprite(sc, sprite, real_sprite);
 	return p;
+}

src/viewport.cpp

➞

Show inline comments

@@ @@ -361,7 +361,7 @@ ViewPort *IsPtInWindowViewport(const Win @@
 	ViewPort *vp = w->viewport;
 	if (vp != NULL &&
-	    IsInsideMM(x, vp->left, vp->left + vp->width) &&
+			IsInsideMM(x, vp->left, vp->left + vp->width) &&
 			IsInsideMM(y, vp->top, vp->top + vp->height))
 		return vp;
@@ @@ -689,6 +689,7 @@ void AddSortableSpriteToDraw(SpriteID im @@
 		top  = ps->top  = (pt.y += spr->y_offs);
 		bottom          = (pt.y +  spr->height);
+	}
 	if (_draw_bounding_boxes && (image != SPR_EMPTY_BOUNDING_BOX)) {
 		/* Compute maximal extents of sprite and it's bounding box */
 		left   = min(left  , RemapCoords(x + w          , y + bb_offset_y, z + bb_offset_z).x);
@@ @@ -696,9 +697,10 @@ void AddSortableSpriteToDraw(SpriteID im @@
 		top    = min(top   , RemapCoords(x + bb_offset_x, y + bb_offset_y, z + dz         ).y);
 		bottom = max(bottom, RemapCoords(x + w          , y + h          , z + bb_offset_z).y + 1);
+	}
 	/* Do not add the sprite to the viewport, if it is outside */
 	if (left   >= vd->dpi.left + vd->dpi.width ||
 	    right  <= vd->dpi.left ||
+	    right  <= vd->dpi.left                 ||
 	    top    >= vd->dpi.top + vd->dpi.height ||
 	    bottom <= vd->dpi.top) {
 		return;
@@ @@ -1592,6 +1594,7 @@ void ViewportDoDraw(const ViewPort *vp, @@
 	ViewportSortParentSprites(parent_list);
 	ViewportDrawParentSprites(parent_list);
 	if (_draw_bounding_boxes) ViewportDrawBoundingBoxes(parent_list);
 	if (vd.first_string != NULL) ViewportDrawStrings(&vd.dpi, vd.first_string);
@@ @@ -1706,6 +1709,7 @@ void UpdateViewportPosition(Window *w) @@
+		}
 		ClampViewportToMap(vp, WP(w, vp_d).scrollpos_x, WP(w, vp_d).scrollpos_y);
 		SetViewportPosition(w, WP(w, vp_d).scrollpos_x, WP(w, vp_d).scrollpos_y);
+	}
+}

0 comments (0 inline, 0 general)