X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsdl%2Ffiles.c;h=472fa5b1587c0cdc0be37e270aa112dce2a54a31;hb=f3b05d5b038cb8fe4d720d8d43bf89bf94759251;hp=b46856d21fcc8eb63d3697dba10bf37b8d8a58ec;hpb=5c36c02312591f23a38c2d48ecff7f4c6ef5a509;p=flatwaifu.git

diff --git a/src/sdl/files.c b/src/sdl/files.c
index b46856d..472fa5b 100644
--- a/src/sdl/files.c
+++ b/src/sdl/files.c
@@ -90,25 +90,11 @@ void F_getresname (char n[8], int r) {
 }
 
 int F_getsprid (const char n[4], int s, int d, char *dir) {
-  s += 'A';
-  d += '0';
-  for (int i = s_start + 1; i < s_end; i++) {
-    char wn[8];
-    byte a, b;
-    WADRES_getname(i, wn);
-    if (cp866_strncasecmp(wn, n, 4) == 0 && (wn[4] == s || wn[6] == s)) {
-      a = wn[4] == s ? wn[5] : 0;
-      b = wn[6] == s ? wn[7] : 0;
-      if (a == '0' || b == '0' || a == d || b == d) {
-        if (dir != NULL) {
-          *dir = (a != '0' && b == '0') || (a != d && b == d);
-        }
-        return i;
-      }
-    }
+  int i = WADRES_findsprite(n, s, d, dir);
+  if (i == -1) {
+    ERR_fatal("F_getsprid: image %.4s%c%c not found", n, s, d);
   }
-  ERR_fatal("F_getsprid: image %.4s%c%c not found", n, s, d);
-  return -1;
+  return i;
 }
 
 int F_getreslen (int r) {