Changeset 544 for abuse/trunkTweet

Timestamp:

Apr 28, 2011, 1:07:39 AM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: get rid of fast path loading, it was no longer used. We also
delete the old cache file we put in the user's directory.

Location:

abuse/trunk/src

Files:

• game.cpp (modified) (2 diffs)
• imlib/specs.cpp (modified) (4 diffs)

abuse/trunk/src/game.cpp

@@ -1339 +1339 @@
 }
 
-extern void fast_load_start_recording(char *name);
-extern void fast_load_stop_recording();
-extern void fast_load_start_reloading(char *name);
-extern void fast_load_stop_reloading();
-
 Game::Game(int argc, char **argv)
 {
@@ -1384 +1379 @@
   else has_joystick = 0;
 
+    // Clean up that old crap
+    char *fastpath = (char *)malloc(strlen(get_save_filename_prefix()) + 13);
+    sprintf(fastpath, "%sfastload.dat", get_save_filename_prefix());
+    unlink(fastpath);
+    free(fastpath);
+
 //    ProfilerInit(collectDetailed, bestTimeBase, 2000, 200); //prof
-    char *fastpath;
-    fastpath = (char *)malloc(strlen(get_save_filename_prefix()) + 12 + 1);
-    sprintf(fastpath, "%sfastload.dat", get_save_filename_prefix());
-    fast_load_start_recording(fastpath);
     load_data(argc, argv);
-    fast_load_stop_recording();
-    free(fastpath);
 //    ProfilerDump("\pabuse.prof");  //prof
 //    ProfilerTerm();

abuse/trunk/src/imlib/specs.cpp

@@ -68 +68 @@
 static spec_directory spec_main_sd;
 
-static int fast_load_fd = -1;
-static int fast_load_mode = 0;
-
 void set_filename_prefix(char const *prefix)
 {
@@ -280 +277 @@
 }
 
-void fast_load_start_recording(char *filename)
-{
-    fast_load_fd = ::open(filename,O_CREAT|O_RDWR,S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-    fast_load_mode = 1;
-}
-
-void fast_load_stop_recording()
-{
-    fast_load_mode = 0;
-}
-
-void fast_load_start_reloading(char *filename)
-{
-    fast_load_fd = ::open(filename,O_RDONLY);
-    fast_load_mode = 2;
-}
-
-void fast_load_stop_reloading()
-{
-    fast_load_mode = 0;
-}
-
 jFILE::jFILE(FILE *file_pointer)                       // assumes fp is at begining of file
 {
@@ -475 +450 @@
     if (fd == spec_main_fd)
     {
-        switch (fast_load_mode)
-        {
-        case 0:
-            if (current_offset+start_offset != spec_main_offset)
-                spec_main_offset = lseek(fd, start_offset+current_offset, SEEK_SET);
-
-            len = ::read(fd,(char*)buf,count);
-            break;
-        case 1:
-            if (current_offset+start_offset != spec_main_offset)
-                spec_main_offset = lseek(fd, start_offset+current_offset, SEEK_SET);
-
-            len = ::read(fd,(char*)buf,count);
-            ::write(fast_load_fd,(char*)&len,sizeof(len));
-            ::write(fast_load_fd,(char*)buf,len);
-            break;
-        case 2:
-            ::read(fast_load_fd,(char*)&len,sizeof(len));
-            len = ::read(fast_load_fd,(char*)buf,len);
-            break;
-        }
-
+        if (current_offset+start_offset != spec_main_offset)
+            spec_main_offset = lseek(fd, start_offset+current_offset, SEEK_SET);
+
+        len = ::read(fd,(char*)buf,count);
         spec_main_offset += len;
     }
     else
     {
-        switch (fast_load_mode)
-        {
-        case 0:
-          len = ::read(fd,(char*)buf,count);
-          break;
-        case 1:
-          len = ::read(fd,(char*)buf,count);
-            ::write(fast_load_fd,(char*)&len,sizeof(len));
-            ::write(fast_load_fd,(char*)buf,len);
-          break;
-        case 2:
-            ::read(fast_load_fd,(char*)&len,sizeof(len));
-            len = ::read(fast_load_fd,(char*)buf,len);
-            if (count != len)
-                printf("short read! %ld:%ld\n",current_offset,len);
-          break;
-      }
+      len = ::read(fd,(char*)buf,count);
     }
     current_offset += len;
@@ -533 +474 @@
 {
   long ret;
-
-  if (fast_load_mode == 2)
-  {
-    switch (whence)
-    {
-    case SEEK_SET :
-      current_offset = start_offset+offset;
-      break;
-    case SEEK_END :
-      current_offset = start_offset+file_length-offset;
-      break;
-    case SEEK_CUR :
-      current_offset += offset;
-      break;
-    default:
-      ret = -1;
-      break;
-    }
-    return current_offset;
-  }
 
   switch (whence)