• R/O
  • HTTP
  • SSH
  • HTTPS

AwarsIV: 提交

AwarsIVのリポジトリです


Commit MetaInfo

修订版430c26f05fb21ce63d80cf2be302da06b0d9b452 (tree)
时间2016-08-03 15:40:52
作者Killery <Killery@kiri...>
CommiterKillery

Log Message

クラッシュ修正

更改概述

差异

--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -307,12 +307,14 @@
307307
308308 if(bclRdy){
309309 U = UTop;
310- int i = 1;
311- while(U && AUN[1] > i){i++;
310+
311+ while(U->number != AUN[1]){
312312 U = U->next;
313313 }
314+
314315
315- buildNum[possionX][possionY] = U->C.S->list[crBCL]-1;
316+ if(U)
317+ buildNum[possionX][possionY] = U->C.S->list[crBCL]-1;
316318
317319 U = UTop;
318320 bclRdy = false;
--- a/Awars III/MapEditor.m
+++ b/Awars III/MapEditor.m
@@ -8849,6 +8849,8 @@
88498849 if(i == 5 && j == 5 && k == 20){
88508850 NSLog(@"いまだー");
88518851 }
8852+
8853+ if([SC[i].nameMAP count] > 0)
88528854 if([MF[k+1].fileName isEqualToString:SC[i].nameMAP[j]]){
88538855 MFselectedRow = k;
88548856
--- a/Awars III/ScenarioList.m
+++ b/Awars III/ScenarioList.m
@@ -10,29 +10,28 @@
1010
1111 @implementation ScenarioList
1212 -(IBAction)startButton:(id)sender{
13- if([scenarioListTV selectedRow] < 0) return;
1413
15- scenarioNumb = (int)[scenarioListTV selectedRow];
16- storyNumb = (int)[PUBscenario indexOfSelectedItem] + 1;
14+ if([scenarioListTV selectedRow] < 0) return;
1715
1816 startES = true;
1917 [stringText InitStringList];
20- /*
21- int k = 0;
22- for(int j = 0;j < [SC[storyNumb].sName count];j++){
23- for (int i = 0;i < [scenarioListMA count];i++) {
24- if([[scenarioListMA[scenarioNumb] valueForKey:@"name"] isEqualToString:SC[storyNumb].sName[j]]){
25- goto zOMG;
26-
27- }
28- }
29- k++;
30- }
31-
32- zOMG:
3318
34- scenarioNumb = k;
35- */
19+ /*
20+ int k = 0;
21+ for(int j = 0;j < [SC[storyNumb].sName count];j++){
22+ for (int i = 0;i < [scenarioListMA count];i++) {
23+ if([[scenarioListMA[scenarioNumb] valueForKey:@"name"] isEqualToString:SC[storyNumb].sName[j]]){
24+ goto zOMG;
25+
26+ }
27+ }
28+ k++;
29+ }
30+
31+ zOMG:
32+
33+ scenarioNumb = k;
34+ */
3635 MFselectedRow = scenarioNumb + 1;
3736 [SLPanel close];
3837 [NSApp stopModal];
@@ -373,6 +372,8 @@
373372 }
374373 }
375374 }
375+
376+ [scenarioListAC setSelectionIndex:9999];
376377
377378 }
378379
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -9065,7 +9065,7 @@
90659065 <autoresizingMask key="autoresizingMask"/>
90669066 </scroller>
90679067 <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="10395">
9068- <rect key="frame" x="465" y="1" width="16" height="480"/>
9068+ <rect key="frame" x="466" y="1" width="15" height="480"/>
90699069 <autoresizingMask key="autoresizingMask"/>
90709070 </scroller>
90719071 </scrollView>
Show on old repository browser