Changeset 966

Timestamp:

06/28/08 06:15:29 (3 months ago)

Author:

takkaria

Message:

Remove the "new savefile" code, since it's not suitable for shipping and won't be used because it's not space-efficient enough. This should fix #505, too.

Files:

• trunk/src/Makefile.inc (modified) (4 diffs)
• trunk/src/Makefile.src (modified) (6 diffs)
• trunk/src/compress.c (deleted)
• trunk/src/compress.h (deleted)
• trunk/src/death.c (modified) (1 diff)
• trunk/src/dungeon.c (modified) (1 diff)
• trunk/src/externs.h (modified) (2 diffs)
• trunk/src/files.c (modified) (2 diffs)
• trunk/src/load.c (modified) (1 diff)
• trunk/src/loadsave.c (deleted)
• trunk/src/main.c (modified) (1 diff)
• trunk/src/signals.c (modified) (1 diff)
• trunk/src/variable.c (modified) (1 diff)
• trunk/src/wizard.c (modified) (1 diff)
• trunk/src/z-blockfile.c (deleted)
• trunk/src/z-blockfile.h (deleted)
• trunk/src/z-smap.c (deleted)
• trunk/src/z-smap.h (deleted)

trunk/src/Makefile.inc

@@ -28 +28 @@
-  option.h types.h ui.h z-type.h object.h externs.h tvalsval.h \
-  game-event.h
-compress.o: compress.c compress.h h-basic.h
-cmd0.o: cmd0.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
@@ -95 +94 @@
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h object.h externs.h tvalsval.h
-loadsave.o: loadsave.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h ui.h z-type.h object.h externs.h \
-  z-blockfile.h z-smap.h
-melee1.o: melee1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
@@ -199 +194 @@
-wiz-stats.o: wiz-stats.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
-wizard.o: wizard.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
@@ -227 +223 @@
-z-util.o: z-util.c z-util.h h-basic.h
-z-virt.o: z-virt.c z-virt.h h-basic.h z-util.h
-z-blockfile.o: z-blockfile.c z-virt.h h-basic.h z-blockfile.h z-file.h
-z-smap.o: z-smap.c z-virt.h h-basic.h z-file.h z-smap.h

trunk/src/Makefile.src

@@ -12 +12 @@
-        angband.h \
-        cmds.h \
-        compress.h \
-        config.h \
-        defines.h \
@@ -30 +29 @@
-        ui-menu.h \
-        wizard.h \
-        z-blockfile.h \
-        z-file.h \
-        z-form.h \
@@ -36 +34 @@
-        z-quark.h \
-        z-rand.h \
-        z-smap.h \
-        z-term.h \
-        z-type.h \
@@ -47 +44 @@
-        
-ZFILES = z-file.o z-form.o z-msg.o z-quark.o z-rand.o z-term.o z-type.o \
- z-blockfile.o z-smap.o 
+
-MAINFILES = main.o main-crb.o main-gcu.o $(GTKMAINFILES) \
-            main-ros.o main-sdl.o main-win.o main-x11.o snd-sdl.o
@@ -60 +57 @@
-        button.o \
-        cave.o \
-        compress.o \
-        cmd0.o \
-        cmd1.o \
@@ -81 +77 @@
-        init2.o \
-        load.o \
-        loadsave.o \
-        melee1.o \
-        melee2.o \

trunk/src/death.c

@@ -445 +445 @@
-
-        /* Save dead player */
-new_save ? !save(savefile) : 
+
-        {
-                msg_print("death save failed!");

trunk/src/dungeon.c

@@ -1741 +1741 @@
-        if (savefile[0] && file_exists(savefile))
-        {
-new_save ? load(savefile) : 
+
-                if (!ok) quit("broken savefile");
-

trunk/src/externs.h

@@ -370 +370 @@
-extern bool old_load(void);
-
-/* loadsave.c */
-bool save(char *filename);
-bool load(char *filename);
-
-/* melee1.c */
-bool check_hit(int power, int level);
@@ -687 +683 @@
-#endif /* ALLOW_BORG */
-
-
-
+
+
+
-
-#endif /* !INCLUDED_EXTERNS_H */
-
-
-extern u16b lazymove_delay;

trunk/src/files.c

@@ -2663 +2663 @@
-
-        /* Save the player */
-new_save ? save(savefile) : 
+
-        {
-                prt("Saving game... done.", 0, 0);
@@ -2782 +2782 @@
-
-        /* Panic save, or get worried */
-new_save ? !save(panic_savefile) : 
+
-
-

trunk/src/load.c

@@ -1986 +1986 @@
-                        if (err) what = "Cannot parse savefile";
-                }
-
-                /* Try using the new savefile code instead */
-                if (err)
-                {
-                        if (load(savefile))
-                        {
-                                new_save = TRUE;
-                                return TRUE;
-                        }
-                }
-        }
-

trunk/src/main.c

@@ -291 +291 @@
-                        {
-                                new_game = TRUE;
-                                break;
-                        }
-
-                        case 'L':
-                        {
-                                new_save = TRUE;
-                                break;
-                        }

trunk/src/signals.c

@@ -217 +217 @@
-
-        /* Attempt to save */
-new_save ? save(panic_savefile) : 
+
-        {
-                Term_putstr(45, 23, -1, TERM_RED, "Panic save succeeded!");

trunk/src/variable.c

@@ -771 +771 @@
-u16b inscriptions_count = 0;
-
-/* Use new-type savefiles */
-bool new_save;
-
-
-/* Delay in centiseconds before moving to allow another keypress */

trunk/src/wizard.c

@@ -1675 +1675 @@
-                }
-
-                case 'S':
-                {
-                        save("savefile.new");
-                        break;
-                }
-        
-                /* Teleport */
-                case 't':