[Dunelegacy-commit] SF.net SVN: dunelegacy: [264] branches/dunks

[<dv...@us...>]

Revision: 264
          http://dunelegacy.svn.sourceforge.net/dunelegacy/?rev=264&view=rev
Author:   dvalin
Date:     2008-05-03 20:44:05 -0700 (Sat, 03 May 2008)

Log Message:
-----------
drop creation of wsa based on cps picture (1x1 wsa should be removed eventually as well)

Modified Paths:
--------------
    branches/dunks/include/pakfile/Wsafile.h
    branches/dunks/src/pakfile/Wsafile.cpp

Modified: branches/dunks/include/pakfile/Wsafile.h
===================================================================
--- branches/dunks/include/pakfile/Wsafile.h	2008-05-04 03:17:23 UTC (rev 263)
+++ branches/dunks/include/pakfile/Wsafile.h	2008-05-04 03:44:05 UTC (rev 264)
@@ -19,7 +19,6 @@
 public:
 	Wsafile(uint8_t * bufFiledata, int bufsize, 
                 SDL_Surface* lastframe = NULL, float setFps = 0 );
-	Wsafile(Cpsfile* cpsFile);
 	Wsafile();
 
 	~Wsafile();

Modified: branches/dunks/src/pakfile/Wsafile.cpp
===================================================================
--- branches/dunks/src/pakfile/Wsafile.cpp	2008-05-04 03:17:23 UTC (rev 263)
+++ branches/dunks/src/pakfile/Wsafile.cpp	2008-05-04 03:44:05 UTC (rev 264)
@@ -68,21 +68,6 @@
 	decodeFrames();
 }
 
-Wsafile::Wsafile(Cpsfile* cpsFile) : Decode()
-{
-	WsaFilesize = -2;
-
-    printf("loading cps file as wsa...\n");
-	
-	NumFrames = 1;
-	fps = 0.1;
-
-    printf("FramesPer1024ms = %d\n", FramesPer1024ms);
-    printf("FPS = %.3f\n", fps);
-	decodedFrames = NULL;
-	m_cpsFile = cpsFile;
-}
-
 Wsafile::Wsafile() : Decode()
 {
 	WsaFilesize = -1;
@@ -110,10 +95,6 @@
 		return img;
 	}
 
-	if(WsaFilesize == -2){
-		return m_cpsFile->getPicture();
-	}
-
 	if(FrameNumber >= NumFrames) {
 		return NULL;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.