add support for SCR files

sound/effect.h

@@ -81,6 +81,7 @@ class Effect {
     BMP,
     PBM,
     Binary, // .BIN
+    SCR,
     UNKNOWN,
   };
 
@@ -98,6 +99,7 @@ class Effect {
   enum class FileType : uint8_t {
     SOUND,
     IMAGE,
+    SCREEN,
     UNKNOWN,
   };
 
@@ -111,6 +113,8 @@ class Effect {
       case PBM:
       case Binary:
 	return FileType::IMAGE;
+      case SCR:
+	return FileType::SCREEN;
       default:
 	return FileType::UNKNOWN;
     }
@@ -123,6 +127,7 @@ class Effect {
     if (endswith(".bmp", filename)) return BMP;
     if (endswith(".pbm", filename)) return PBM;
     if (endswith(".bin", filename)) return Binary;
+    if (endswith(".scr", filename)) return SCR;
     return UNKNOWN;
   }
 
@@ -772,7 +777,7 @@ class EffectFileReader : public FileReader {
 public:
   EffectFileReader() : FileReader(), do_open_(0) {}
 
-  bool Play(Effect* f) {
+  bool PlayInternal(Effect* f) {
     do_open_.set(false);
     Effect::FileID id = f->RandomFile();
     if (!id) {
@@ -783,12 +788,33 @@ class EffectFileReader : public FileReader {
     return true;
   }
 
-  void Play(const char* filename) {
+  bool Play(Effect* f) {
+    if (PlayInternal(f)) {
+      do_open_.set(true);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  void PlayInternal(const char* filename) {
     do_open_.set(false);
     strncpy(filename_, filename, sizeof(filename_));
+  }
+
+  void Play(const char* filename) {
+    PlayInternal(filename);
     do_open_.set(true);
   }
 
+  void do_open() {
+    do_open_.set(true);
+  }
+
+  bool get_do_open() const {
+    return do_open_.get();
+  }
+
   // Returns true if we had been asked to open a file.
   // Check if open succeded or not by calling IsOpen()
   bool OpenFile() {
@@ -801,7 +827,11 @@ class EffectFileReader : public FileReader {
     do_open_.set(false);
     return true;
   }
-private:
+
+  const char* GetFilename() {
+    return filename_;
+  }
+protected:
   POAtomic<bool> do_open_;
   char filename_[128];
 };