From cc45367df91ea39a35d6cb4facb7870e352b457c Mon Sep 17 00:00:00 2001 From: Killery Date: Sat, 25 Jun 2016 01:30:58 +0900 Subject: [PATCH] =?utf8?q?=E3=82=B7=E3=83=8A=E3=83=AA=E3=82=AA=E3=82=A8?= =?utf8?q?=E3=83=86=E3=82=99=E3=82=A3=E3=82=BF=E3=82=A4=E3=83=B3=E3=82=B5?= =?utf8?q?=E3=83=BC=E3=83=88=E3=81=A8=E3=82=A4=E3=83=98=E3=82=99=E3=83=B3?= =?utf8?q?=E3=83=88=E3=82=A8=E3=83=86=E3=82=99=E3=82=A3=E3=82=BF=E3=82=A4?= =?utf8?q?=E3=83=B3=E3=82=B5=E3=83=BC=E3=83=88=E6=94=B9=E5=96=84v0.652?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Awars III.xcodeproj/project.pbxproj | 2 +- Awars III/Awars III-Info.plist | 2 +- Awars III/ScenarioEditor.m | 41 +++++++++++++++++++++++++++++++------ Awars III/en.lproj/MainMenu.xib | 2 +- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/Awars III.xcodeproj/project.pbxproj b/Awars III.xcodeproj/project.pbxproj index 3639d4c..94b8037 100755 --- 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 --- a/Awars III/Awars III-Info.plist +++ b/Awars III/Awars III-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.651 + 0.652 CFBundleSignature ???? CFBundleVersion diff --git a/Awars III/ScenarioEditor.m b/Awars III/ScenarioEditor.m index d92323f..151f9e6 100755 --- 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 --- a/Awars III/en.lproj/MainMenu.xib +++ b/Awars III/en.lproj/MainMenu.xib @@ -466,7 +466,7 @@ - + -- 2.11.0