Cleanup.

One of the changes, I'm not quite sure about: buildDisplay() used to open
and close the _thisScreen.background_layer_id resource for each layer it
processed. In particular, it used to "release the screen resource before
cacheing the sprites".

I have no idea why, because I can't see any trace of a sprite cache, and I
can't think of any harm in keeping the resource open during the whole
render cycle. The resource is probably loaded into memory already anyway,
though its reference counter may be 0.

svn-id: r13401

1 files changed, 9 insertions, 11 deletions

diff --git a/sword2/sword2.h b/sword2/sword2.h
index 58d8c49fcf..3f0145a533 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -104,18 +104,17 @@ private:
 
 	uint32 _lastPaletteRes;
 
-	void sendBackPar0Frames(void);
-	void sendBackPar1Frames(void);
-	void sendBackFrames(void);
-	void sendSortFrames(void);
-	void sendForeFrames(void);
-	void sendForePar0Frames(void);
-	void sendForePar1Frames(void);
-
-	void sortTheSortList(void);
+	void drawBackPar0Frames(void);
+	void drawBackPar1Frames(void);
+	void drawBackFrames(void);
+	void drawSortFrames(uint8 *file);
+	void drawForeFrames(void);
+	void drawForePar0Frames(void);
+	void drawForePar1Frames(void);
 
 	void startNewPalette(void);
-	void processLayer(uint32 layer_number);
+	void processLayer(uint8 *file, uint32 layer_number);
+	void processImage(BuildUnit *build_unit);
 
 	void getPlayerStructures(void);
 	void putPlayerStructures(void);
@@ -158,7 +157,6 @@ public:
 
 	void resetRenderLists(void);
 	void buildDisplay(void);
-	void processImage(BuildUnit *build_unit);
 	void displayMsg(uint8 *text, int time);
 	void removeMsg(void);
 	void setFullPalette(int32 palRes);