From 79278028737250f58b1b1d166e3fbb77d8b140e1 Mon Sep 17 00:00:00 2001
From: Joost Peters
Date: Mon, 11 Apr 2005 11:25:45 +0000
Subject: cleanup

svn-id: r17539
---
 gob/scenery.cpp | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/gob/scenery.cpp b/gob/scenery.cpp
index b4fa16a1b1..8d7c42d6e2 100644
--- a/gob/scenery.cpp
+++ b/gob/scenery.cpp
@@ -135,24 +135,17 @@ int16 scen_loadStatic(char search) {
 			ptr->pieces[i] =
 			    (Scen_PieceDesc *) game_loadExtData(pictDescId, 0,
 			    0);
-
-			ptr->pieces[i]->left = (int16)READ_LE_UINT16(&ptr->pieces[i]->left);
-			ptr->pieces[i]->right = (int16)READ_LE_UINT16(&ptr->pieces[i]->right);
-			ptr->pieces[i]->top = (int16)READ_LE_UINT16(&ptr->pieces[i]->top);
-			ptr->pieces[i]->bottom = (int16)READ_LE_UINT16(&ptr->pieces[i]->bottom);
-			
 		} else {
 			ptr->pieces[i] =
 			    (Scen_PieceDesc *)
 			    game_loadTotResource(pictDescId);
-		
-			ptr->pieces[i]->left = (int16)READ_LE_UINT16(&ptr->pieces[i]->left);
-			ptr->pieces[i]->right = (int16)READ_LE_UINT16(&ptr->pieces[i]->right);
-			ptr->pieces[i]->top = (int16)READ_LE_UINT16(&ptr->pieces[i]->top);
-			ptr->pieces[i]->bottom = (int16)READ_LE_UINT16(&ptr->pieces[i]->bottom);
-	
 		}
 
+		ptr->pieces[i]->left = (int16)READ_LE_UINT16(&ptr->pieces[i]->left);
+ 		ptr->pieces[i]->right = (int16)READ_LE_UINT16(&ptr->pieces[i]->right);
+		ptr->pieces[i]->top = (int16)READ_LE_UINT16(&ptr->pieces[i]->top);
+		ptr->pieces[i]->bottom = (int16)READ_LE_UINT16(&ptr->pieces[i]->bottom);
+
 		width = inter_load16();
 		height = inter_load16();
 		sprResId = inter_load16();
@@ -454,23 +447,18 @@ int16 scen_loadAnim(char search) {
 			ptr->pieces[i] =
 			    (Scen_PieceDesc *) game_loadExtData(pictDescId, 0,
 			    0);
-
-			ptr->pieces[i]->left = (int16)READ_LE_UINT16(&ptr->pieces[i]->left);
-			ptr->pieces[i]->right = (int16)READ_LE_UINT16(&ptr->pieces[i]->right);
-			ptr->pieces[i]->top = (int16)READ_LE_UINT16(&ptr->pieces[i]->top);
-			ptr->pieces[i]->bottom = (int16)READ_LE_UINT16(&ptr->pieces[i]->bottom);
-
 		} else {
 			ptr->pieces[i] =
 			    (Scen_PieceDesc *)
 			    game_loadTotResource(pictDescId);
-
-			ptr->pieces[i]->left = (int16)READ_LE_UINT16(&ptr->pieces[i]->left);
- 			ptr->pieces[i]->right = (int16)READ_LE_UINT16(&ptr->pieces[i]->right);
- 			ptr->pieces[i]->top = (int16)READ_LE_UINT16(&ptr->pieces[i]->top);
- 			ptr->pieces[i]->bottom = (int16)READ_LE_UINT16(&ptr->pieces[i]->bottom);
 		}
 
+
+ 		ptr->pieces[i]->left = (int16)READ_LE_UINT16(&ptr->pieces[i]->left);
+		ptr->pieces[i]->right = (int16)READ_LE_UINT16(&ptr->pieces[i]->right);
+ 		ptr->pieces[i]->top = (int16)READ_LE_UINT16(&ptr->pieces[i]->top);
+		ptr->pieces[i]->bottom = (int16)READ_LE_UINT16(&ptr->pieces[i]->bottom);
+
 		width = inter_load16();
 		height = inter_load16();
 		sprResId = inter_load16();
-- 
cgit v1.2.3