rnd-19980927

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index bbd282a399dbd1e76e9c984fbf263714600e26cc..e3ad459fb57c59393cf3847fe073add1bcc8bdd6 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -221,8 +221,13 @@ void LoadLevelTape(int level_nr)
   char cookie[MAX_FILENAME];
   FILE *file;
 
+#ifndef MSDOS
   sprintf(filename,"%s/%s/%d.tape",
          level_directory,leveldir[leveldir_nr].filename,level_nr);
+#else
+  sprintf(filename,"%s/%s/%d.tap",
+         level_directory,leveldir[leveldir_nr].filename,level_nr);
+#endif
 
   if ((file=fopen(filename,"r")))
   {
@@ -389,7 +394,7 @@ void LoadPlayerInfo(int mode)
 
   if (!file)
   {
-    player = default_player;
+    *local_player = default_player;
     level_nr = default_player.level_nr;
     return;
   }
@@ -448,19 +453,19 @@ void LoadPlayerInfo(int mode)
 
   if (mode==PLAYER_SETUP)
   {
-    player = new_player;
-    if (player.leveldir_nr < num_leveldirs)
-      leveldir_nr = player.leveldir_nr;
+    *local_player = new_player;
+    if (local_player->leveldir_nr < num_leveldirs)
+      leveldir_nr = local_player->leveldir_nr;
     else
       leveldir_nr = 0;
   }
   else
   {
-    player.handicap = new_player.handicap;
-    player.level_nr = new_player.level_nr;
+    local_player->handicap = new_player.handicap;
+    local_player->level_nr = new_player.level_nr;
   }
 
-  level_nr = player.level_nr;
+  level_nr = local_player->level_nr;
   fclose(file);
 }
 
@@ -521,8 +526,13 @@ void SaveLevelTape(int level_nr)
   FILE *file;
   BOOL new_tape = TRUE;
 
+#ifndef MSDOS
   sprintf(filename,"%s/%s/%d.tape",
          level_directory,leveldir[leveldir_nr].filename,level_nr);
+#else
+  sprintf(filename,"%s/%s/%d.tap",
+         level_directory,leveldir[leveldir_nr].filename,level_nr);
+#endif
 
   /* Testen, ob bereits eine Aufnahme existiert */
   if ((file=fopen(filename,"r")))
@@ -658,26 +668,27 @@ void SavePlayerInfo(int mode)
     if (feof(file))            /* Spieler noch nicht in Liste enthalten */
       break;
     else                       /* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(default_player.login_name,player.login_name,MAX_NAMELEN-1))
+      if (!strncmp(default_player.login_name,
+                  local_player->login_name, MAX_NAMELEN-1))
       {
        fseek(file,-(2*MAX_NAMELEN+1+2+1+(version_10_file ? 0 : 11)),SEEK_CUR);
        break;
       }
   }
 
-  player.level_nr = level_nr;
+  local_player->level_nr = level_nr;
 
   for(i=0;i<MAX_NAMELEN;i++)
-    fputc(player.login_name[i],file);
+    fputc(local_player->login_name[i],file);
   for(i=0;i<MAX_NAMELEN;i++)
-    fputc(player.alias_name[i],file);
-  fputc(player.handicap,file);
-  fputc(player.setup / 256,file);
-  fputc(player.setup % 256,file);
-  fputc(player.leveldir_nr,file);
+    fputc(local_player->alias_name[i],file);
+  fputc(local_player->handicap,file);
+  fputc(local_player->setup / 256,file);
+  fputc(local_player->setup % 256,file);
+  fputc(local_player->leveldir_nr,file);
   if (!version_10_file)
   {
-    fputc(player.level_nr,file);
+    fputc(local_player->level_nr,file);
     for(i=0;i<10;i++)          /* currently unused bytes */
       fputc(0,file);
   }
@@ -694,6 +705,7 @@ void LoadJoystickData()
   if (joystick_status==JOYSTICK_OFF)
     return;
 
+#ifndef MSDOS
   if (!(file=fopen(JOYDAT_FILE,"r")))
     return;
 
@@ -716,6 +728,9 @@ void LoadJoystickData()
   fclose(file);
 
   CheckJoystickData();
+#else
+  load_joystick_data(JOYDAT_FILE);
+#endif
 }
 
 void SaveJoystickData()
@@ -726,6 +741,7 @@ void SaveJoystickData()
   if (joystick_status==JOYSTICK_OFF)
     return;
 
+#ifndef MSDOS
   CheckJoystickData();
 
   if (!(file=fopen(JOYDAT_FILE,"w")))
@@ -746,4 +762,8 @@ void SaveJoystickData()
   fclose(file);
 
   chmod(JOYDAT_FILE, JOYDAT_PERMS);
+#else
+  save_joystick_data(JOYDAT_FILE);
+#endif
+
 }