CPUどうしの時、時々フリーズするのを改善

diff --git a/Awars III/Awars III-Info.plist b/Awars III/Awars III-Info.plist
index adad816..0c58284 100644 (file)
--- a/Awars III/Awars III-Info.plist
+++ b/Awars III/Awars III-Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.68</string>
+       <string>0.681</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 72b8877..0ae1b56 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -4144,8 +4144,6 @@ ahhh:{}
             )
            ){
             
-            if(!Uselected)
-                oopsCnt = 30;
             
             if(!(AVpreview.rate > 0) && !animationFlag1 && !animationFlag2)
                 oopsCnt--;
@@ -8403,6 +8401,7 @@ ahhh:{}
         num++;
     }
     
+        
     mostNumSub = mostNum;
         U->CL.A = aTop2;
         

diff --git a/Awars III/OptionMenu.h b/Awars III/OptionMenu.h
index 99dad9d..edd3c15 100644 (file)
--- a/Awars III/OptionMenu.h
+++ b/Awars III/OptionMenu.h
@@ -11,6 +11,12 @@
 #import "Title.h"
 #import "FieldScene.h"
 
+#define DEFAULT_TNAME "Awars IV"
+#define DEFAULT_TVERNAME "Version Alpha 0.681"
+#define DEFAULT_TOPENINGNAME "SHnoHohoemi.mp4"
+#define DEFAULT_TBGMNAME "sampleTitle.mp3"
+#define DEFAULT_TIMGNAME "タイトル"
+
 typedef struct _OPTIONMENU{
     
     NSString *nameTitle;

diff --git a/Awars III/OptionMenu.m b/Awars III/OptionMenu.m
index 7009315..54753f4 100644 (file)
--- a/Awars III/OptionMenu.m
+++ b/Awars III/OptionMenu.m
@@ -72,11 +72,11 @@
     optionMenu = self;
     
     if(![[NSFileManager defaultManager] fileExistsAtPath:@OPTIONFILE_NAME]){
-    wtfom.nameTitle = [@"Awars IV" retain];
-    wtfom.nameVersion = [@"Version Alpha 0.68" retain];
-    wtfom.nameOpening = [@"SHnoHohoemi.mp4" retain];
-    wtfom.nameBGM = [@"sampleTitle.mp3" retain];
-    wtfom.imgTitle = [[NSImage imageNamed:@"タイトル"] retain];
+    wtfom.nameTitle = [@DEFAULT_TNAME retain];
+    wtfom.nameVersion = [@DEFAULT_TVERNAME retain];
+    wtfom.nameOpening = [@DEFAULT_TOPENINGNAME retain];
+    wtfom.nameBGM = [@DEFAULT_TBGMNAME retain];
+    wtfom.imgTitle = [[NSImage imageNamed:@DEFAULT_TIMGNAME] retain];
     wtfom.allowMapEditor = true;
     wtfom.allowScenarioEditor = true;
     wtfom.onlyOnceOpening = true;

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 9c41274..d87c14f 100755 (executable)
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -464,9 +464,9 @@
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" imageFrameStyle="photo" image="タイトル" id="3836"/>
                     </imageView>
                     <textField verticalHuggingPriority="750" id="558">
-                        <rect key="frame" x="18" y="443" width="118" height="17"/>
+                        <rect key="frame" x="18" y="443" width="553" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.68" id="559">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.681" id="559">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -2389,7 +2389,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="1720">
-                            <rect key="frame" x="466" y="1" width="15" height="480"/>
+                            <rect key="frame" x="465" y="1" width="16" height="480"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
@@ -9045,7 +9045,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="10395">
-                            <rect key="frame" x="466" y="1" width="15" height="480"/>
+                            <rect key="frame" x="465" y="1" width="16" height="480"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>