シナリオエディタインサートとイベントエディタインサート改善v0.652

diff --git a/Awars III.xcodeproj/project.pbxproj b/Awars III.xcodeproj/project.pbxproj
index 3639d4c..94b8037 100755 (executable)
--- a/Awars III.xcodeproj/project.pbxproj
+++ b/Awars III.xcodeproj/project.pbxproj
@@ -817,6 +817,7 @@
                                C691F14F16916CCE000C6CD0 /* StringText.h */,
                                C691F15016916CCE000C6CD0 /* StringText.m */,
                                C6952DBB16957B6C00C6D0F5 /* DialogView.h */,
+                               C6E8DA6F167E787200BFEC32 /* BuildChipList.h */,
                                C6952DBC16957B6C00C6D0F5 /* DialogView.m */,
                                C6825962169CC6D40068BB20 /* ScenarioList.h */,
                                C6825963169CC6D40068BB20 /* ScenarioList.m */,
@@ -1157,7 +1158,6 @@
                                C688AE3B16C06187006E8713 /* CommandView.m */,
                                C6E8DA34167C98D800BFEC32 /* MapChipList.h */,
                                C6E8DA35167C98D800BFEC32 /* MapChipList.m */,
-                               C6E8DA6F167E787200BFEC32 /* BuildChipList.h */,
                                C6E8DA70167E787200BFEC32 /* BuildChipList.m */,
                                C6E8DA76167F34F500BFEC32 /* UnitChipList.h */,
                                C6E8DA77167F34F600BFEC32 /* UnitChipList.m */,

diff --git a/Awars III/Awars III-Info.plist b/Awars III/Awars III-Info.plist
index d169963..7470c81 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.651</string>
+       <string>0.652</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/Awars III/ScenarioEditor.m b/Awars III/ScenarioEditor.m
index d92323f..151f9e6 100755 (executable)
--- a/Awars III/ScenarioEditor.m
+++ b/Awars III/ScenarioEditor.m
@@ -1569,6 +1569,13 @@
             TX[st].S->name = @"";
             TX[st].S->string = @"";
             TX[st].S->next = NULL;
+            
+            [Dname setStringValue:TX[st].S->name];
+            [Dstring setStringValue:TX[st].S->string];
+            [dialogName setStringValue:TX[st].S->name];
+            [dialogString setStringValue:TX[st].S->string];
+            [dialogImage setImage:TX[st].S->img];
+            
             STRtop[st] = TX[st].S;
         }else{
             while(TX[st].S->next) TX[st].S = TX[st].S->next;
@@ -1578,6 +1585,13 @@
             TX[st].S->name = @"";
             TX[st].S->string = @"";
             TX[st].S->next = NULL;
+            
+            [Dname setStringValue:TX[st].S->name];
+            [Dstring setStringValue:TX[st].S->string];
+            [dialogName setStringValue:TX[st].S->name];
+            [dialogString setStringValue:TX[st].S->string];
+            [dialogImage setImage:TX[st].S->img];
+            
             TX[st].S = STRtop[st];
         }
         
@@ -1596,6 +1610,13 @@
             TX[st].S->name = @"";
             TX[st].S->string = @"";
             TX[st].S->next = NULL;
+            
+            [Dname setStringValue:TX[st].S->name];
+            [Dstring setStringValue:TX[st].S->string];
+            [dialogName setStringValue:TX[st].S->name];
+            [dialogString setStringValue:TX[st].S->string];
+            [dialogImage setImage:TX[st].S->img];
+            
             STRtop[st] = TX[st].S;
         }else if(LLrow > 0){
             for (int i = 0; i < LLrow-1;i++)
@@ -1607,6 +1628,13 @@
             TX[st].S->next->name = @"";
             TX[st].S->next->string = @"";
             TX[st].S = TX[st].S->next;
+            
+            [Dname setStringValue:TX[st].S->name];
+            [Dstring setStringValue:TX[st].S->string];
+            [dialogName setStringValue:TX[st].S->name];
+            [dialogString setStringValue:TX[st].S->string];
+            [dialogImage setImage:TX[st].S->img];
+            
             TX[st].S = STRtop[st];
         }else{
             STRING *tmp = calloc(1, sizeof(STRING));
@@ -1615,6 +1643,13 @@
             tmp->name = @"";
             tmp->string = @"";
             STRtop[st] = tmp;
+            
+            [Dname setStringValue:TX[st].S->name];
+            [Dstring setStringValue:TX[st].S->string];
+            [dialogName setStringValue:TX[st].S->name];
+            [dialogString setStringValue:TX[st].S->string];
+            [dialogImage setImage:TX[st].S->img];
+            
             TX[st].S = STRtop[st];
         }
         
@@ -1626,12 +1661,6 @@
         [lineListAC setSelectionIndex:LLrow];
     }
     
-    [Dname setStringValue:TX[st].S->name];
-    [Dstring setStringValue:TX[st].S->string];
-    [dialogName setStringValue:TX[st].S->name];
-    [dialogString setStringValue:TX[st].S->string];
-    [dialogImage setImage:TX[st].S->img];
-    
     TX[st].S = STRtop[st];
 }
 -(IBAction)removeLine:(id)sender{

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index a42fe39..0698f6c 100755 (executable)
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -466,7 +466,7 @@
                     <textField verticalHuggingPriority="750" id="558">
                         <rect key="frame" x="18" y="443" width="126" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.651" id="559">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.652" 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"/>