Added floppy #2 saving, statistics to makefile.

diff --git a/Makefile b/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index d1f78b5..61658c5
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,8 @@
 # This software is licensed under the GPL v2
 #
 
+FIND = find
+
 # Figure out which system we're compiling for, and set the appropriate variables
 
 ifeq "$(OSTYPE)" "msys"                                                        # Win32
@@ -159,6 +161,12 @@ $(TARGET)$(EXESUFFIX): $(OBJS)
 #      strip --strip-all vj$(EXESUFFIX)
 #      upx -9 vj$(EXESUFFIX)
 
+statistics:
+       @echo -n "Lines in source files: "
+       @-$(FIND) ./src -name "*.cpp" | xargs cat | wc -l
+       @echo -n "Lines in header files: "
+       @-$(FIND) ./src -name "*.h" | xargs cat | wc -l
+
 # Pull in dependencies autogenerated by gcc's -MMD switch
 # The "-" in front in there just in case they haven't been created yet
 

diff --git a/apple2.cfg b/apple2.cfg
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/docs/gpl.txt b/docs/gpl.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/apple2.ico b/res/apple2.ico
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/apple2.rc b/res/apple2.rc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/apple2.cpp b/src/apple2.cpp
old mode 100755 (executable)
new mode 100644 (file)
index f886a7d..a8c9e68
--- a/src/apple2.cpp
+++ b/src/apple2.cpp
@@ -1531,7 +1531,8 @@ SDL_DestroySemaphore(mainSem);
                // Save state here...
                SaveApple2State(settings.autoStatePath);
        }
-floppyDrive.SaveImage();
+floppyDrive.SaveImage(0);
+floppyDrive.SaveImage(1);
 
        SoundDone();
        VideoDone();

diff --git a/src/apple2.h b/src/apple2.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/applevideo.cpp b/src/applevideo.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/applevideo.h b/src/applevideo.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/ay8910.cpp b/src/ay8910.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/ay8910.h b/src/ay8910.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/charset.h b/src/charset.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/dis65c02.cpp b/src/dis65c02.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/dis65c02.h b/src/dis65c02.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/fd-img-128x128.c b/src/fd-img-128x128.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/firmware.cpp b/src/firmware.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/floppy.cpp b/src/floppy.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 61230ae..b2586e8
--- a/src/floppy.cpp
+++ b/src/floppy.cpp
@@ -118,6 +118,7 @@ bool FloppyDrive::LoadImage(const char * filename, uint8_t driveNum/*= 0*/)
 
 bool FloppyDrive::SaveImage(uint8_t driveNum/*= 0*/)
 {
+       // Various sanity checks...
        if (driveNum > 1)
        {
                WriteLog("FLOPPY: Attempted to save image to drive #%u!\n", driveNum);
@@ -136,11 +137,13 @@ bool FloppyDrive::SaveImage(uint8_t driveNum/*= 0*/)
                return false;
        }
 
+       // Handle nybbylization, if necessary
        if (diskType[driveNum] == DT_NYBBLE)
                memcpy(disk[driveNum], nybblizedImage[driveNum], 232960);
        else
                DenybblizeImage(driveNum);
 
+       // Finally, write the damn image
        FILE * fp = fopen(imageName[driveNum], "wb");
 
        if (fp == NULL)

diff --git a/src/floppy.h b/src/floppy.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/font14pt.h b/src/font14pt.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/button.cpp b/src/gui/button.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/button.h b/src/gui/button.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/draggablewindow.cpp b/src/gui/draggablewindow.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/draggablewindow.h b/src/gui/draggablewindow.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/draggablewindow2.cpp b/src/gui/draggablewindow2.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/draggablewindow2.h b/src/gui/draggablewindow2.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/element.cpp b/src/gui/element.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/element.h b/src/gui/element.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/font1.h b/src/gui/font1.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/font14pt.h b/src/gui/font14pt.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/gui.h b/src/gui/gui.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/guielements.h b/src/gui/guielements.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/guimisc.cpp b/src/gui/guimisc.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/guimisc.h b/src/gui/guimisc.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/menu.h b/src/gui/menu.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/textedit.cpp b/src/gui/textedit.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/textedit.h b/src/gui/textedit.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/gui/window.h b/src/gui/window.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/log.cpp b/src/log.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/log.h b/src/log.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/sdlemu_config.cpp b/src/sdlemu_config.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/sdlemu_config.h b/src/sdlemu_config.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/settings.cpp b/src/settings.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/settings.h b/src/settings.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/sound.cpp b/src/sound.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/sound.h b/src/sound.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/timing.cpp b/src/timing.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/timing.h b/src/timing.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/v65c02.cpp b/src/v65c02.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/v65c02.h b/src/v65c02.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/video.cpp b/src/video.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/video.h b/src/video.h
old mode 100755 (executable)
new mode 100644 (file)