This commit is contained in:
Glenn Maynard
2002-10-20 07:15:52 +00:00
parent 2cd8a7c313
commit 8669f05da3
2 changed files with 27 additions and 29 deletions
+1
View File
@@ -1,4 +1,5 @@
------------------------CVS after 3.00 beta 6rc2---------------- ------------------------CVS after 3.00 beta 6rc2----------------
BUG FIX: Crash handler works better in full screen.
BUG FIX: Crash handler restarts correctly. BUG FIX: Crash handler restarts correctly.
BUG FIX: Fixed choosing song filenames when saving. BUG FIX: Fixed choosing song filenames when saving.
BUG FIX: Fix Endless crash when a song folder has over 99 minutes of songs. BUG FIX: Fix Endless crash when a song folder has over 99 minutes of songs.
+26 -29
View File
@@ -1,4 +1,4 @@
//Microsoft Developer Studio generated resource script. // Microsoft Visual C++ generated resource script.
// //
#include "resource.h" #include "resource.h"
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE // TEXTINCLUDE
// //
1 TEXTINCLUDE MOVEABLE PURE 1 TEXTINCLUDE
BEGIN BEGIN
"resource.h\0" "resource.h\0"
END END
2 TEXTINCLUDE MOVEABLE PURE 2 TEXTINCLUDE
BEGIN BEGIN
"#include ""afxres.h""\r\n" "#include ""afxres.h""\r\n"
"\0" "\0"
END END
3 TEXTINCLUDE MOVEABLE PURE 3 TEXTINCLUDE
BEGIN BEGIN
"\r\n" "\r\n"
"\0" "\0"
@@ -52,7 +52,7 @@ END
// Accelerator // Accelerator
// //
IDR_MAIN_ACCEL ACCELERATORS MOVEABLE PURE IDR_MAIN_ACCEL ACCELERATORS
BEGIN BEGIN
VK_F5, IDM_CHANGEDETAIL, VIRTKEY, NOINVERT VK_F5, IDM_CHANGEDETAIL, VIRTKEY, NOINVERT
"X", IDM_EXIT, VIRTKEY, ALT, NOINVERT "X", IDM_EXIT, VIRTKEY, ALT, NOINVERT
@@ -68,9 +68,8 @@ END
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDI_ICON ICON DISCARDABLE "StepMania.ICO" IDI_ICON ICON "StepMania.ICO"
#ifndef _MAC
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Version // Version
@@ -93,14 +92,14 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "http://www.stepmania.com\0" VALUE "CompanyName", "http://www.stepmania.com"
VALUE "FileDescription", "StepMania\0" VALUE "FileDescription", "StepMania"
VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "FileVersion", "1, 0, 0, 1"
VALUE "InternalName", "StepMania\0" VALUE "InternalName", "StepMania"
VALUE "LegalCopyright", "Copyright © 2001-2002\0" VALUE "LegalCopyright", "Copyright © 2001-2002"
VALUE "OriginalFilename", "StepMania.exe\0" VALUE "OriginalFilename", "StepMania.exe"
VALUE "ProductName", " StepMania\0" VALUE "ProductName", " StepMania"
VALUE "ProductVersion", "1, 0, 0, 1\0" VALUE "ProductVersion", "1, 0, 0, 1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@@ -109,25 +108,23 @@ BEGIN
END END
END END
#endif // !_MAC
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Bitmap // Bitmap
// //
BITMAP_ERROR BITMAP MOVEABLE PURE "error.bmp" BITMAP_ERROR BITMAP "error.bmp"
BITMAP_LOADING BITMAP MOVEABLE PURE "loading.bmp" BITMAP_LOADING BITMAP "loading.bmp"
BITMAP_CRASH BITMAP MOVEABLE PURE "error2.bmp" BITMAP_CRASH BITMAP "error2.bmp"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Dialog // Dialog
// //
IDD_ERROR_DIALOG DIALOG DISCARDABLE 0, 0, 332, 234 IDD_ERROR_DIALOG DIALOG 0, 0, 332, 234
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
CAPTION "StepMania Error" CAPTION "StepMania Error"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
@@ -142,8 +139,8 @@ BEGIN
PUSHBUTTON "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15 PUSHBUTTON "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15
END END
IDD_LOADING_DIALOG DIALOG DISCARDABLE 0, 0, 312, 78 IDD_LOADING_DIALOG DIALOG 0, 0, 312, 78
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
CONTROL 117,IDC_STATIC,"Static",SS_BITMAP,0,0,312,38 CONTROL 117,IDC_STATIC,"Static",SS_BITMAP,0,0,312,38
@@ -153,9 +150,9 @@ BEGIN
END END
IDD_DISASM_CRASH DIALOGEX 0, 0, 399, 286 IDD_DISASM_CRASH DIALOGEX 0, 0, 399, 286
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "StepMania Error" CAPTION "StepMania Error"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,348,270,50,15 DEFPUSHBUTTON "OK",IDOK,348,270,50,15
LISTBOX IDC_ASMBOX,7,58,279,100,LBS_OWNERDRAWVARIABLE | LISTBOX IDC_ASMBOX,7,58,279,100,LBS_OWNERDRAWVARIABLE |
@@ -168,9 +165,9 @@ BEGIN
WS_HSCROLL | WS_TABSTOP WS_HSCROLL | WS_TABSTOP
LTEXT "Program disassembly",IDC_STATIC,7,46,66,8 LTEXT "Program disassembly",IDC_STATIC,7,46,66,8
LTEXT "CPU registers",IDC_STATIC,292,46,44,8 LTEXT "CPU registers",IDC_STATIC,292,46,44,8
LTEXT "StepMania has crashed due to a program error. Please hit Save to dump diagnostic information to a file called 'crashinfo.txt' in the StepMania program directory, and then OK to bring up the normal crash box. Please include this file in all bug reports.", LTEXT "StepMania has crashed due to a program error. Diagnostic information has been saved to a file called ""crashinfo.txt"" in the StepMania program directory. Hit ""View crash dump"" to view it. Please include this file in all bug reports.",
IDC_STATIC,7,238,319,25 IDC_STATIC,7,238,319,25
PUSHBUTTON "Save",IDC_CRASH_SAVE,76,270,70,15 PUSHBUTTON "View crash dump",IDC_CRASH_SAVE,76,270,70,15
LISTBOX IDC_CALL_STACK,7,178,279,38,LBS_NOINTEGRALHEIGHT | LISTBOX IDC_CALL_STACK,7,178,279,38,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
LTEXT "Estimated call stack",IDC_STATIC,7,167,64,8 LTEXT "Estimated call stack",IDC_STATIC,7,167,64,8
@@ -188,7 +185,7 @@ END
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO MOVEABLE PURE GUIDELINES DESIGNINFO
BEGIN BEGIN
IDD_LOADING_DIALOG, DIALOG IDD_LOADING_DIALOG, DIALOG
BEGIN BEGIN