[Scummvm-cvs-logs] CVS: scummvm/gob scenery.cpp,1.10,1.11

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15087/gob

Modified Files:
	scenery.cpp 
Log Message:
cleanup


Index: scenery.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/scenery.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- scenery.cpp	11 Apr 2005 11:20:45 -0000	1.10
+++ scenery.cpp	11 Apr 2005 11:25:45 -0000	1.11
@@ -135,24 +135,17 @@
 			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 @@
 			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();