From d9e41cb094d76877059be2129583ade05d390e36 Mon Sep 17 00:00:00 2001
From: Mig Reyes <spigumus@users.sourceforge.net>
Date: Wed, 25 Sep 2002 23:10:59 +0000
Subject: [PATCH] FINALLY! Finally fixed the darn alignment of the health bars.
 However, it may seem to "bounce" a bit much when the chamber is moving to the
 right, so you guys may wanna check into that. I have the default frames
 almost done as well. Also changed ONI stage title from "Challenge Mode" to
 "Challenging Mode" as it is Challenging in the arcade.

---
 stepmania/src/StepMania.ICO | Bin 7406 -> 7406 bytes
 stepmania/src/StepMania.RC  |  51 +++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/stepmania/src/StepMania.ICO b/stepmania/src/StepMania.ICO
index 09ecd2db8c85b4f1451c5f5fe937e98113567c97..f3ed61755519cb1b16a7be1030a3d20114cc3497 100644
GIT binary patch
delta 193
zcmaE7`Ob2~CqAYImdS}M5*t$-SX9_RfB`}>F!c5^paQVO<N{$S77%N4pRhCwNcH5k
zAO=X}jIaz7ka{I72coz{z?7DV93$IgPZ4<_nF%I4!Q@Ji_~sKLZcK)M1d{*%U||0L
lfr0V=3kHV&2N)RaPcSgZ18IIJW(U&DP|Ubsv%UCwRsc=LDmefE

delta 158
zcmaE7`Ob2~Cq5<ymW@7XEKI$<lM`7)Cl?A!PR?gxo!l=h#liptlh+DMLl|d-Wtf2c
zSHf~2ic17cX^F@&GEDXqkq45QV6qcTt^|p1J|W`9WcdF>^8f!0%>Vx}F#i9;!0`VE
d1A{#f%YR^C;C}$Y>_D0siWwhlwijQ|3IKAxEYAP{

diff --git a/stepmania/src/StepMania.RC b/stepmania/src/StepMania.RC
index a28ab247a5..a3a16d3bce 100644
--- a/stepmania/src/StepMania.RC
+++ b/stepmania/src/StepMania.RC
@@ -1,4 +1,4 @@
-// Microsoft Visual C++ generated resource script.
+//Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
 
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE MOVEABLE PURE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE MOVEABLE PURE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE MOVEABLE PURE 
 BEGIN
     "\r\n"
     "\0"
@@ -52,7 +52,7 @@ END
 // Accelerator
 //
 
-IDR_MAIN_ACCEL ACCELERATORS 
+IDR_MAIN_ACCEL ACCELERATORS MOVEABLE PURE 
 BEGIN
     VK_F5,          IDM_CHANGEDETAIL,       VIRTKEY, NOINVERT
     "X",            IDM_EXIT,               VIRTKEY, ALT, NOINVERT
@@ -68,8 +68,9 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON                ICON                    "StepMania.ICO"
+IDI_ICON                ICON    DISCARDABLE     "StepMania.ICO"
 
+#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -92,14 +93,14 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "http://www.stepmania.com"
-            VALUE "FileDescription", "StepMania"
-            VALUE "FileVersion", "1, 0, 0, 1"
-            VALUE "InternalName", "StepMania"
-            VALUE "LegalCopyright", "Copyright © 2001-2002"
-            VALUE "OriginalFilename", "StepMania.exe"
-            VALUE "ProductName", "  StepMania"
-            VALUE "ProductVersion", "1, 0, 0, 1"
+            VALUE "CompanyName", "http://www.stepmania.com\0"
+            VALUE "FileDescription", "StepMania\0"
+            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "InternalName", "StepMania\0"
+            VALUE "LegalCopyright", "Copyright © 2001-2002\0"
+            VALUE "OriginalFilename", "StepMania.exe\0"
+            VALUE "ProductName", "  StepMania\0"
+            VALUE "ProductVersion", "1, 0, 0, 1\0"
         END
     END
     BLOCK "VarFileInfo"
@@ -108,23 +109,25 @@ BEGIN
     END
 END
 
+#endif    // !_MAC
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
 //
 
-BITMAP_ERROR            BITMAP                  "error.bmp"
-BITMAP_LOADING          BITMAP                  "loading.bmp"
-BITMAP_CRASH            BITMAP                  "error2.bmp"
+BITMAP_ERROR            BITMAP  MOVEABLE PURE   "error.bmp"
+BITMAP_LOADING          BITMAP  MOVEABLE PURE   "loading.bmp"
+BITMAP_CRASH            BITMAP  MOVEABLE PURE   "error2.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
-IDD_ERROR_DIALOG DIALOG  0, 0, 332, 234
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+IDD_ERROR_DIALOG DIALOG DISCARDABLE  0, 0, 332, 234
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "StepMania Error"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -139,8 +142,8 @@ BEGIN
     PUSHBUTTON      "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15
 END
 
-IDD_LOADING_DIALOG DIALOG  0, 0, 312, 78
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
+IDD_LOADING_DIALOG DIALOG DISCARDABLE  0, 0, 312, 78
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         117,IDC_STATIC,"Static",SS_BITMAP,0,0,312,38
@@ -150,9 +153,9 @@ BEGIN
 END
 
 IDD_DISASM_CRASH DIALOGEX 0, 0, 399, 286
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "StepMania Error"
-FONT 8, "MS Sans Serif", 0, 0, 0x0
+FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,348,270,50,15
     LISTBOX         IDC_ASMBOX,7,58,279,100,LBS_OWNERDRAWVARIABLE | 
@@ -185,7 +188,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO MOVEABLE PURE 
 BEGIN
     IDD_LOADING_DIALOG, DIALOG
     BEGIN