• R/O
  • HTTP
  • SSH
  • HTTPS

AwarsIV: 提交

AwarsIVのリポジトリです


Commit MetaInfo

修订版3b72e3ebf077dc80e55f4659bff5085a0b8cda8d (tree)
时间2016-08-03 11:36:18
作者Killery <Killery@kiri...>
CommiterKillery

Log Message

立ち絵バグ完全に治したw

更改概述

差异

--- a/Awars III/EventScene.m
+++ b/Awars III/EventScene.m
@@ -757,10 +757,24 @@
757757 return;
758758 }
759759 }
760- data = [[data stringByAppendingFormat:@"%@,%@\n", ST->iNameWall, ST->iNameWallSort] retain];
760+ data = [[data stringByAppendingFormat:@"\n%@,%@", ST->iNameWall, @"取り込んだ画像"] retain];
761761
762762 [data writeToFile:pathDATA atomically:YES encoding:NSUTF8StringEncoding error:nil];
763763
764+ pathDATA = @"data/StringList/preset2.txt";
765+
766+ data = [NSString stringWithContentsOfFile:pathDATA encoding:NSUTF8StringEncoding error:nil];
767+
768+ dataArray = [data componentsSeparatedByString:@"\n"];
769+ for(int i = 0;i < [dataArray count];i++){
770+ NSArray *item = [[dataArray objectAtIndex:i] componentsSeparatedByString:@","];
771+ if([[item objectAtIndex:0] isEqualToString:@"取り込んだ画像"]){
772+ return;
773+ }
774+ }
775+ data = [[data stringByAppendingFormat:@"\n%@", @"取り込んだ画像"] retain];
776+
777+ [data writeToFile:pathDATA atomically:YES encoding:NSUTF8StringEncoding error:nil];
764778 }
765779
766780
--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -21,11 +21,13 @@
2121 #import "SaveDataList.h"
2222 #import "LevelList.h"
2323 #import "LoadChipList.h"
24+#import "ScenarioEditor.h"
2425
2526 #define SAVEDATADATMAX 4096
2627 #define DATAFILE_NAME "data.dat"
2728 #define INSTANT_IMG "image.png"
2829 #define OPTIONFILE_NAME "opData.dat"
30+#define STANDFILE_NAME "stand.dat"
2931
3032 #define FIELD_TYPE_A 0
3133 #define FIELD_TYPE_B 1
@@ -1421,6 +1423,8 @@ int STErow;
14211423
14221424 -(void)loadOptionMenu;
14231425 -(void)saveOptionMenu;
1426+-(void)loadStandImages;
1427+-(void)saveStandImages;
14241428
14251429 @end
14261430
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -866,18 +866,21 @@
866866 return strOut;
867867 }
868868
869--(NSImage*)readNSImage:(FILE*)fp imgOut:(NSImage*)imgOut dcnt:(int)dcnt dfix:(int)dfix{
869+-(NSImage*)readNSImage:(FILE*)fp imgOut:(NSImage*)imgOut dcnt:(int*)dcnt dfix:(int*)dfix{
870870 unsigned char idat[1024];
871871 int size = 0;
872872
873+ *dcnt = [self readInt:fp];
874+ *dfix = [self readInt:fp];
875+
873876 NSMutableData *binaryData = [NSMutableData dataWithCapacity:sizeof(idat)];
874877
875878 fpos_t fpt = 0;
876- for(int i = 0;i < dcnt;i++){
879+ for(int i = 0;i < *dcnt;i++){
877880 size += fread(idat, 1, 1024, fp);
878881
879- if(dcnt-1 == i){
880- fpt += dfix;
882+ if(*dcnt-1 == i){
883+ fpt += *dfix;
881884 fsetpos(fp, &fpt);
882885 }
883886
@@ -906,8 +909,7 @@
906909
907910 sdd2[datRow].dB[r].dead = (int)[self readInt:fp];
908911 /*
909- sdd2[datRow].dB[r].imgAdCnt = (int)[self readInt:fp];
910- sdd2[datRow].dB[r].imgAdFix = (int)[self readInt:fp];
912+
911913 sdd2[datRow].dB[r].img = [self readNSImage:fp imgOut:sdd2[datRow].dB[r].img dcnt:sdd2[datRow].dB[r].imgAdCnt dfix:sdd2[datRow].dB[r].imgAdFix];
912914 */
913915 [self readBuildChipD:fp val:&sdd2[datRow].dB[r].C];
@@ -958,8 +960,7 @@
958960 sdd2[datRow].dU[r].army = [[self readNSString:fp strOut:sdd2[datRow].dU[r].army] retain];
959961
960962 /*
961- sdd2[datRow].dU[r].imgAdCnt = (int)[self readInt:fp];
962- sdd2[datRow].dU[r].imgAdFix = (int)[self readInt:fp];
963+
963964 sdd2[datRow].dU[r].img = [self readNSImage:fp imgOut:sdd2[datRow].dU[r].img dcnt:sdd2[datRow].dU[r].imgAdCnt dfix:sdd2[datRow].dU[r].imgAdFix];
964965 */
965966
@@ -2210,10 +2211,8 @@
22102211
22112212
22122213 sdd2[datRow].name = [[self readNSString:fpi strOut:sdd2[datRow].name] retain];
2213-
2214- sdd2[datRow].imgAdressCnt = (int)[self readInt:fpi];
2215- sdd2[datRow].imgAdressFix = (int)[self readInt:fpi];
2216- sdd2[datRow].img = [[self readNSImage:fpi imgOut:sdd2[datRow].img dcnt:sdd2[datRow].imgAdressCnt dfix:sdd2[datRow].imgAdressFix] retain];
2214+
2215+ sdd2[datRow].img = [[self readNSImage:fpi imgOut:sdd2[datRow].img dcnt:&sdd2[datRow].imgAdressCnt dfix:&sdd2[datRow].imgAdressFix] retain];
22172216
22182217 sdd2[datRow].MFselectedRow = (int)[self readInt:fpi];
22192218 sdd2[datRow].storyNumb = (int)[self readInt:fpi];
@@ -2337,9 +2336,7 @@
23372336 wtfom.onlyOnceOpening = (int)[self readInt:fpi];
23382337 wtfom.newOpeningIsShown = (int)[self readInt:fpi];
23392338
2340- wtfom.adCntIT = (int)[self readInt:fpi];
2341- wtfom.adFixIT = (int)[self readInt:fpi];
2342- wtfom.imgTitle = [[self readNSImage:fpi imgOut:wtfom.imgTitle dcnt:wtfom.adCntIT dfix:wtfom.adFixIT] retain];
2339+ wtfom.imgTitle = [[self readNSImage:fpi imgOut:wtfom.imgTitle dcnt:&wtfom.adCntIT dfix:&wtfom.adFixIT] retain];
23432340
23442341
23452342 directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
@@ -2380,6 +2377,189 @@
23802377 fclose(fpi);
23812378 }
23822379
2380+
2381+
2382+-(void)saveStandImages{
2383+
2384+ int cntSTAND = 0;
2385+ int cntBASE = 0;
2386+ int cntLAYER = 0;
2387+
2388+ I = Itop;
2389+ cntSTAND = 0;
2390+ while (I) {
2391+ IBtop = I->B;
2392+
2393+
2394+
2395+ cntBASE = 0;
2396+ while(I->B){
2397+ IBLtop = I->B->L;
2398+
2399+
2400+
2401+
2402+ cntLAYER = 0;
2403+ while(I->B->L){
2404+
2405+
2406+
2407+
2408+
2409+ I->B->L = I->B->L->next;
2410+ cntLAYER++;
2411+ }I->B->L = IBLtop;
2412+ I->B->cntLAYER = cntLAYER;
2413+ I->B = I->B->next;
2414+ cntBASE++;
2415+ }I->B = IBtop;
2416+ I->cntBASE = cntBASE;
2417+ I = I->next;
2418+ cntSTAND++;
2419+ }I = Itop;
2420+
2421+
2422+ while(I){
2423+ stand.cntSTAND = cntSTAND;
2424+ I = I->next;
2425+ }I = Itop;
2426+
2427+
2428+ NSString *directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
2429+ [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
2430+
2431+
2432+ NSString *Cpath = @"data/Scenario/";
2433+ [[NSFileManager defaultManager] changeCurrentDirectoryPath:Cpath];
2434+
2435+ FILE *fp;
2436+
2437+ fp = fopen(STANDFILE_NAME, "wb");
2438+ if(!fp)
2439+ return;
2440+
2441+ [self writeInt:fp val:stand.cntSTAND];
2442+ while (I) {
2443+ [self writeInt:fp val:I->index];
2444+ [self writeNSString:fp str:I->name];
2445+ [self writeInt:fp val:I->registerNum];
2446+
2447+
2448+ [self writeInt:fp val:I->cntBASE];
2449+ IBtop = I->B;
2450+ while(I->B){
2451+ [self writeInt:fp val:I->B->index];
2452+ [self writeNSString:fp str:I->B->name];
2453+ [self writeNSImage:fp str:I->B->img adCnt:&I->B->imgAdCnt adFix:&I->B->imgAdFix];
2454+ [self writeInt:fp val:I->B->x];
2455+ [self writeInt:fp val:I->B->y];
2456+ [self writeInt:fp val:I->B->z];
2457+
2458+ [self writeInt:fp val:I->B->cntLAYER];
2459+ IBLtop = I->B->L;
2460+ while(I->B->L){
2461+ [self writeInt:fp val:I->B->L->index];
2462+ [self writeNSString:fp str:I->B->L->name];
2463+ [self writeNSImage:fp str:I->B->L->img adCnt:&I->B->L->imgAdCnt adFix:&I->B->L->imgAdFix];
2464+ [self writeInt:fp val:I->B->L->x];
2465+ [self writeInt:fp val:I->B->L->y];
2466+ [self writeInt:fp val:I->B->L->z];
2467+ [self writeInt:fp val:I->B->L->visible];
2468+ [self writeInt:fp val:I->B->L->visibleInstant];
2469+
2470+ I->B->L = I->B->L->next;
2471+ }I->B->L = IBLtop;
2472+ I->B = I->B->next;
2473+ }I->B = IBtop;
2474+ I = I->next;
2475+ }I = Itop;
2476+
2477+ fclose(fp);
2478+}
2479+
2480+-(void)loadStandImages{
2481+
2482+
2483+ NSString *directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
2484+ [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
2485+
2486+
2487+ NSString *Cpath = @"data/Scenario/";
2488+ [[NSFileManager defaultManager] changeCurrentDirectoryPath:Cpath];
2489+
2490+ FILE *fp;
2491+
2492+ fp = fopen(STANDFILE_NAME, "rb");
2493+ if(!fp)
2494+ return;
2495+
2496+ stand.cntSTAND = (int)[self readInt:fp];
2497+ for (int i = 0;i < stand.cntSTAND;i++){
2498+
2499+ if(i == 0){
2500+ stand.S = calloc(1, sizeof(STAND));
2501+ if(i + 1 < stand.cntSTAND)
2502+ stand.S->next = calloc(1, sizeof(STAND));
2503+ Itop = stand.S;
2504+ }else if(i + 1 < stand.cntSTAND)
2505+ stand.S->next = calloc(1, sizeof(STAND));
2506+
2507+ stand.S->index = (int)[self readInt:fp];
2508+ stand.S->name = [[self readNSString:fp strOut:stand.S->name] retain];
2509+ stand.S->registerNum = (int)[self readInt:fp];
2510+
2511+ stand.S->cntBASE = (int)[self readInt:fp];
2512+ IBtop = stand.S->B;
2513+ for (int j = 0;j < stand.S->cntBASE;j++){
2514+ if(j == 0){
2515+ stand.S->B = calloc(1, sizeof(BASE));
2516+ if(j + 1 < stand.S->cntBASE)
2517+ stand.S->B->next = calloc(1, sizeof(BASE));
2518+ IBtop = stand.S->B;
2519+ }else if(j + 1 < stand.S->cntBASE)
2520+ stand.S->B->next = calloc(1, sizeof(BASE));
2521+
2522+ stand.S->B->index = (int)[self readInt:fp];
2523+ stand.S->B->name = [[self readNSString:fp strOut:stand.S->B->name] retain];
2524+ stand.S->B->img = [[self readNSImage:fp imgOut:stand.S->B->img dcnt:&stand.S->B->imgAdCnt dfix:&stand.S->B->imgAdFix] retain];
2525+ stand.S->B->x = (int)[self readInt:fp];
2526+ stand.S->B->y = (int)[self readInt:fp];
2527+ stand.S->B->z = (int)[self readInt:fp];
2528+
2529+ stand.S->B->cntLAYER = (int)[self readInt:fp];
2530+ IBLtop = stand.S->B->L;
2531+ for (int k = 0;k < stand.S->B->cntLAYER;k++){
2532+ if(k == 0){
2533+ stand.S->B->L = calloc(1, sizeof(LAYER));
2534+ if(k + 1 < stand.S->B->cntLAYER)
2535+ stand.S->B->L->next = calloc(1, sizeof(LAYER));
2536+ IBLtop = stand.S->B->L;
2537+ }else if(k + 1 < stand.S->B->cntLAYER)
2538+ stand.S->B->L->next = calloc(1, sizeof(LAYER));
2539+
2540+
2541+ stand.S->B->L->index = (int)[self readInt:fp];
2542+ stand.S->B->L->name = [[self readNSString:fp strOut:stand.S->B->L->name] retain];
2543+ stand.S->B->L->img = [[self readNSImage:fp imgOut:stand.S->B->L->img dcnt:&stand.S->B->L->imgAdCnt dfix:&stand.S->B->L->imgAdFix] retain];
2544+ stand.S->B->L->x = (int)[self readInt:fp];
2545+ stand.S->B->L->y = (int)[self readInt:fp];
2546+ stand.S->B->L->z = (int)[self readInt:fp];
2547+ stand.S->B->L->visible = (int)[self readInt:fp];
2548+ stand.S->B->L->visibleInstant = (int)[self readInt:fp];
2549+
2550+ stand.S->B->L = stand.S->B->L->next;
2551+ }stand.S->B->L = IBLtop;
2552+ stand.S->B = stand.S->B->next;
2553+ }stand.S->B = IBtop;
2554+ stand.S = stand.S->next;
2555+ }stand.S = Itop;
2556+
2557+ I = stand.S;
2558+
2559+ fclose(fp);
2560+}
2561+
2562+
23832563 -(void)openingAVPVfunc{
23842564
23852565 if(openingAVP && openingAVPVisActive){
--- a/Awars III/ScenarioEditor.h
+++ b/Awars III/ScenarioEditor.h
@@ -10,24 +10,26 @@
1010 #import "StringText.h"
1111
1212 typedef struct _STAND{
13+ int cntBASE;
1314 struct _STAND *next;
1415 struct _BASE *B;
1516
1617 NSString *name;
17- NSString *fName;
18+
1819 int index;
1920 int registerNum;
2021 }STAND;
2122
2223 typedef struct _BASE{
24+ int cntLAYER;
2325 struct _BASE *next;
2426 int index;
2527 struct _LAYER *L;
2628
2729 NSString *name;
28- NSString *postName;
29- NSString *iName;
3030 NSImage *img;
31+ int imgAdCnt;
32+ int imgAdFix;
3133
3234 int x;
3335 int y;
@@ -39,9 +41,10 @@ typedef struct _LAYER{
3941 int index;
4042
4143 NSString *name;
42- NSString *postName;
43- NSString *iName;
4444 NSImage *img;
45+ int imgAdCnt;
46+ int imgAdFix;
47+
4548 bool visible;
4649
4750 bool visibleInstant;
@@ -51,6 +54,11 @@ typedef struct _LAYER{
5154 int z;
5255 }LAYER;
5356
57+typedef struct _STANDARRAY{
58+ int cntSTAND;
59+ struct _STAND *S;
60+
61+}STANDARRAY;
5462
5563 typedef struct _TEXT{
5664
@@ -66,6 +74,8 @@ enum{
6674
6775 TEXT TX[TEXTMAX];
6876
77+STANDARRAY stand;
78+
6979 STAND *I;
7080 STAND *Itop;
7181 BASE *IBtop;
@@ -100,10 +110,6 @@ NSInteger st;
100110 NSInteger sl;
101111 struct _STRING *STRtop[TEXTMAX];
102112
103-STANDIMAGE *SItop;
104-STANDIMAGE *si;
105-STANDIMAGE *siPost;
106-
107113 struct _STRING *STRSI;
108114 struct _STRING *STRSItop;
109115
@@ -111,15 +117,16 @@ int siCnt;
111117 int siPostNum;
112118
113119 NSString *STANDADDSTRING;
114-STANDIMAGE *STANDADD;
115120 NSSound *testSnd;
116121 NSSound *testSndEff;
117122
123+bool baseClickedFlag;
124+bool layerClickedFlag;
125+
118126 @interface ScenarioEditor : NSObject
119127 {
120128 IBOutlet NSImageView *testIV;
121-
122-
129+
123130
124131 IBOutlet NSWindow *SEstandWindow;
125132 IBOutlet NSImageView *SEIV;
@@ -285,6 +292,10 @@ NSSound *testSndEff;
285292
286293 -(void)testSEtest;
287294
295+-(void)setTFpos;
296+-(IBAction)TFposXsubmit:(id)sender;
297+-(IBAction)TFposYsubmit:(id)sender;
298+
288299 @end
289300
290301 NSImage *SEstandImg;
@@ -305,9 +316,12 @@ NSImage *SEstandImg;
305316 NSImage *SEstandImgST;
306317 int STSNUM;
307318
319+int txNumb;
320+int txiNumb;
321+bool TXimgCaptured;
322+bool TXimgIsNull;
323+
308324 TEXT TXCPY[TEXTMAX];
309-STRING *TXCPYStop;
310-STANDIMAGE *TXCPYSItop;
311325 bool TXCPYcpy;
312326 bool allowTXcpy;
313327 @interface SEstandViewST: NSView
--- a/Awars III/ScenarioEditor.m
+++ b/Awars III/ScenarioEditor.m
@@ -52,11 +52,13 @@
5252
5353 [TV1 setTarget:self];
5454 [TV1 setAction:@selector(TV1sgl:)];
55+ [TV1 setDoubleAction:@selector(TV1dbl:)];
5556
5657 MA1 = [NSMutableArray new];
5758
5859 [TV2 setTarget:self];
5960 [TV2 setAction:@selector(TV2sgl:)];
61+ [TV2 setDoubleAction:@selector(TV2dbl:)];
6062
6163 MA2 = [NSMutableArray new];
6264
@@ -70,6 +72,9 @@
7072
7173 deletedName = [NSMutableArray new];
7274 baseListDC = @{@"1":baseListMA};
75+
76+ [self loadStandData];
77+ [self loadData];
7378 }
7479
7580 -(id)init{
@@ -101,18 +106,18 @@
101106 TXCPY[i].fileName = NULL;
102107 }
103108
104- OMFGflag = true;
105109 [self initText];
106110 [self addLineList];
107111 [self initFileDirectory];
108- [self loadStandData];
109- [self loadData];
112+
113+ OMFGflag = true;
110114 Irow = -1;
111115 IBrow = -1;
112116 IBLrow = -1;
113117 st = -1;
114118 [textListAC setSelectionIndex:9999];
115119
120+ /*
116121 I = Itop;
117122 while(I){
118123
@@ -137,7 +142,7 @@
137142
138143 I = I->next;
139144 }I = Itop;
140-
145+ */
141146 SEMArow = -1;
142147
143148 TXCPYcpy = true;
@@ -147,6 +152,28 @@
147152 return self;
148153 }
149154
155+-(void)TV1dbl:(id)sender{
156+
157+ TVCrow1 = -1;
158+ TVCrow2 = -1;
159+ IBrow = -1;
160+ IBLrow = -1;
161+ [AC1 setSelectionIndex:9999];
162+
163+}
164+
165+-(void)TV2dbl:(id)sender{
166+
167+ TVCrow2 = -1;
168+ IBLrow = -1;
169+ [AC2 setSelectionIndex:9999];
170+}
171+
172+-(void)setTFpos{
173+
174+ [TFposX setStringValue:[NSString stringWithFormat:@"%d",imgGx]];
175+ [TFposX setStringValue:[NSString stringWithFormat:@"%d",imgGy]];
176+}
150177
151178
152179 -(void)ClickSETV:(id)sender{
@@ -514,37 +541,66 @@
514541
515542 -(void)TV1sgl:(id)sender{
516543
517- static NSInteger postClicedrow;
518- postClicedrow = TVCrow1;
544+ IBrow = (int)[TV1 clickedRow];
519545
546+ if(!b) return;
520547
521- I = Itop;
548+ TV1sglFlag = true;
549+ TV2sglFlag = false;
522550
523- for(int i = 0;i < Irow;i++){
551+ TVCrow1 = [TV1 clickedRow];
552+ TVCrow2 = [TV2 clickedRow];
553+
554+ [self initMA2];
555+
556+ layerClickedFlag = false;
557+ baseClickedFlag = true;
558+
559+ IBrow = (int)[TV1 clickedRow];
560+
561+ I = Itop;
562+ for (int i = 0;i < Irow;i++) {
524563 I = I->next;
525564 }
526565
527- b = I->B;
566+ if(!I)
567+ return;
568+ IBtop = I->B;
569+ for (int j = 0;j < IBrow;j++) {
570+ I->B = I->B->next;
571+ }
528572
529- if(!b) return;
573+ if(!I->B)
574+ return;
575+ [TFposX setStringValue:[NSString stringWithFormat:@"%d", I->B->x]];
576+ [TFposY setStringValue:[NSString stringWithFormat:@"%d", I->B->y]];
530577
531- TV1sglFlag = true;
532- TV2sglFlag = false;
533578
534- TVCrow1 = [TV1 clickedRow];
535- TVCrow2 = [TV2 clickedRow];
579+ I->B = IBtop;
536580
581+ I = Itop;
582+}
583+
584+-(void)initMA2{
537585 [self willChangeValueForKey:@"MA2"];
538586 [MA2 removeAllObjects];
539587 [self didChangeValueForKey:@"MA2"];
540588
541- BASE *bTop = b;
589+ I = Itop;
590+
591+ for(int i = 0;i < Irow;i++){
592+ I = I->next;
593+ }
594+
595+ b = I->B;
596+
597+ BASE *bTop = I->B;
542598
543599 b = bTop;
544- for (int i = 0;i < TVCrow1;i++) {
600+ for (int i = 0;i < IBrow;i++) {
545601 b = b->next;
546602 }
547- if(TVCrow1 >= 0 && b){
603+ if(IBrow >= 0 && b){
548604
549605
550606 LAYER *lTop = b->L;
@@ -565,31 +621,68 @@
565621 }
566622 b = bTop;
567623
624+ [AC2 setSelectionIndex:9999];
568625
569626 I = Itop;
570- if(TVCrow1 != postClicedrow) layerLoadOver = true;
571627 }
572628
573629 -(void)TV2sgl:(id)sender{
574630
631+ IBLrow = (int)[TV2 clickedRow];
632+
575633 TVCrow2 = [TV2 clickedRow];
576634 //if(!b->L) return;
577635
578636 TV2sglFlag = true;
579637 TV1sglFlag = false;
580638
639+ layerClickedFlag = true;
640+ baseClickedFlag = false;
641+
642+ IBLrow = (int)[TV2 clickedRow];
643+
644+ I = Itop;
645+ for (int i = 0;i < Irow;i++) {
646+ I = I->next;
647+ }
648+
649+ if(!I)
650+ return;
651+ IBtop = I->B;
652+ for (int j = 0;j < IBrow;j++) {
653+ I->B = I->B->next;
654+ }
655+ if(!I->B)
656+ return;
657+ IBLtop = I->B->L;
658+ for (int j = 0;j < IBLrow;j++) {
659+ I->B->L = I->B->L->next;
660+ }
661+ if(!I->B->L)
662+ return;
663+
664+ [TFposX setStringValue:[NSString stringWithFormat:@"%d",I->B->L->x]];
665+ [TFposY setStringValue:[NSString stringWithFormat:@"%d",I->B->L->y]];
666+
667+ I->B->L = IBLtop;
668+ I->B = IBtop;
669+ I = Itop;
670+
581671 }
582672
583673 -(void)DoubleClickSTAND:(id)sender{
584674 if(Irow < 0) return;
675+
676+ /*
677+ I = Itop;
678+ for(int i = 0;i < [standListMA count];i++){
679+ I->name = [[standListMA[i] valueForKey:@"name"] retain];
680+
681+ I = I->next;
682+ }I = Itop;
683+ */
585684
586- if(![standListMA[Irow] valueForKey:@"file"])
587- return;
588- if([[standListMA[Irow] valueForKey:@"file"] isEqualToString:@""])
589- return;
590- if([[standListMA[Irow] valueForKey:@"file"] isEqualToString:@"(null)"])
591- return;
592- [self initLineBaseLayer];
685+ //[self initLineBaseLayer];
593686 IBrow = -1;
594687 IBLrow = -1;
595688 [baseListAC setSelectionIndex:9999];
@@ -600,11 +693,15 @@
600693 [self loadStandData];
601694 [self loadData];
602695 [self initMA1MA2];
696+
697+ [AC1 setSelectionIndex:9999];
698+ [AC2 setSelectionIndex:9999];
603699 [standEditorPanel makeKeyAndOrderFront:nil];
604700 }
605701
606702 -(void)ClickSTAND:(id)sender{
607703 Irow = (int)[standListTV clickedRow];
704+
608705 }
609706
610707 -(void)DoubleClickBASE:(id)sender{
@@ -616,6 +713,9 @@
616713 }
617714
618715 -(void)ClickBASE:(id)sender{
716+
717+
718+
619719 /*
620720 IBrow = (int)[baseListTV clickedRow];
621721 [layerListAC setSelectionIndex:9999];
@@ -654,7 +754,112 @@
654754 */
655755 }
656756
757+-(IBAction)TFposXsubmit:(id)sender{
758+
759+ if(baseClickedFlag && IBrow >= 0){
760+
761+ I = Itop;
762+ for (int i = 0;i < Irow;i++) {
763+ I = I->next;
764+ }
765+
766+ IBtop = I->B;
767+ for (int j = 0;j < IBrow;j++) {
768+ I->B = I->B->next;
769+ }
770+
771+ I->B->x = [TFposX intValue];
772+
773+ I->B = IBtop;
774+
775+ I = Itop;
776+
777+ }else if(layerClickedFlag && IBrow >= 0){
778+
779+ I = Itop;
780+ for (int i = 0;i < Irow;i++) {
781+ I = I->next;
782+ }
783+
784+ IBtop = I->B;
785+ for (int j = 0;j < IBrow;j++) {
786+ I->B = I->B->next;
787+ }
788+
789+ IBLtop = I->B->L;
790+ for (int j = 0;j < IBLrow;j++) {
791+ I->B->L = I->B->L->next;
792+ }
793+
794+
795+ I->B->L->x = [TFposX intValue];
796+
797+ I->B->L = IBLtop;
798+ I->B = IBtop;
799+ I = Itop;
800+
801+ }else{
802+
803+
804+
805+ }
806+
807+}
808+-(IBAction)TFposYsubmit:(id)sender{
809+
810+ if(baseClickedFlag && IBrow >= 0){
811+
812+ I = Itop;
813+ for (int i = 0;i < Irow;i++) {
814+ I = I->next;
815+ }
816+
817+ IBtop = I->B;
818+ for (int j = 0;j < IBrow;j++) {
819+ I->B = I->B->next;
820+ }
821+
822+ I->B->y = [TFposY intValue];
823+
824+ I->B = IBtop;
825+
826+ I = Itop;
827+
828+ }else if(layerClickedFlag && IBrow >= 0){
829+
830+ I = Itop;
831+ for (int i = 0;i < Irow;i++) {
832+ I = I->next;
833+ }
834+
835+ IBtop = I->B;
836+ for (int j = 0;j < IBrow;j++) {
837+ I->B = I->B->next;
838+ }
839+
840+ IBLtop = I->B->L;
841+ for (int j = 0;j < IBLrow;j++) {
842+ I->B->L = I->B->L->next;
843+ }
844+
845+
846+ I->B->L->y = [TFposY intValue];
847+
848+ I->B->L = IBLtop;
849+ I->B = IBtop;
850+ I = Itop;
851+
852+ }else{
853+
854+
855+
856+ }
857+}
858+
657859 -(void)ClickLAYER:(id)sender{
860+
861+
862+
658863 /*
659864 IBLrow = (int)[layerListTV clickedRow];
660865
@@ -922,6 +1127,8 @@
9221127 -(void)EventLoop2:(NSTimer *)timer{
9231128
9241129
1130+ [SESTIV setImage:I->B->img];
1131+
9251132 TX[st].S = STRtop[st];
9261133
9271134 if (st >= 0 && LLrow >= 0) {
@@ -947,7 +1154,7 @@
9471154 if(SEstandImgST)
9481155 [SESTIV setImage:SEstandImgST];
9491156
950- if(standEditorFlag){
1157+ while(standEditorFlag){
9511158 I = Itop;
9521159
9531160 for(int i = 0;i < Irow;i++){
@@ -956,7 +1163,7 @@
9561163
9571164 if(!I) {
9581165 I = Itop;
959- return;
1166+ break;
9601167 }
9611168
9621169
@@ -968,7 +1175,10 @@
9681175 b = b->next;
9691176 }
9701177
971- if(TVCrow1 == -1) TVCrow2 = -1;
1178+ if(TVCrow1 == -1) {
1179+ TVCrow2 = -1;
1180+ break;
1181+ }
9721182 if(TVCrow1 >= 0 && b && [MA1 count] > 0){
9731183 int value = [[[MA1 objectAtIndex:TVCrow1] valueForKeyPath:@"z"] intValue];
9741184 b->z = value;
@@ -979,7 +1189,7 @@
9791189 b->img = [IV1 image];
9801190
9811191 }
982- if(TVCrow2 == -1) {b = bTop; return;}
1192+ if(TVCrow2 == -1) {b = bTop; break;}
9831193
9841194 LAYER *lTop;
9851195 if(b) lTop = b->L;
@@ -1024,6 +1234,7 @@
10241234
10251235 I = Itop;
10261236 layerLoadOver = false;
1237+ break;
10271238 }
10281239
10291240 STRtop[st] = STRtop[st];
@@ -1375,6 +1586,12 @@
13751586 [[NSFileManager defaultManager] createDirectoryAtPath:pathFOLDER withIntermediateDirectories:YES attributes:nil error:nil];
13761587 }
13771588
1589+ InitialData = [NSData dataWithContentsOfFile:@"data/StringList/preset2.txt"];
1590+
1591+ if(!InitialData){
1592+ [[NSFileManager defaultManager] createDirectoryAtPath:@"data/StringList/preset2.txt" withIntermediateDirectories:YES attributes:nil error:nil];
1593+ }
1594+
13781595 NSArray *Farray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:pathFOLDER error:nil];
13791596
13801597 NSMutableArray *MA = [NSMutableArray new];
@@ -2054,6 +2271,13 @@
20542271 }
20552272
20562273 -(IBAction)backStand:(id)sender{
2274+ I = Itop;
2275+ for(int i = 0;i < [standListMA count];i++){
2276+ I->name = [[standListMA[i] valueForKey:@"name"] retain];
2277+
2278+ I = I->next;
2279+ }I = Itop;
2280+
20572281 [self saveStandData];
20582282 [self saveData];
20592283 [self loadStandData];
@@ -2069,8 +2293,10 @@
20692293 -(IBAction)submitStand:(id)sender{
20702294 [standEditorPanel close];
20712295 //[self saveDataStand];
2072- [self saveStandData];
2296+ I = Itop;
20732297 [self loadStandData];
2298+ IBrow = -1;
2299+ IBLrow = -1;
20742300 TVCrow1 = -1;
20752301 TVCrow2 = -1;
20762302 [standPanel makeKeyAndOrderFront:nil];
@@ -2245,8 +2471,17 @@
22452471 }
22462472 -(IBAction)removeLineStand:(id)sender{
22472473
2248- /*
2249- Itop = I;
2474+
2475+
2476+
2477+
2478+ NSString *directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
2479+ [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
2480+
2481+ NSString *path = @"data/Scenario/img/";
2482+
2483+
2484+ I = Itop;
22502485
22512486 if(Irow == -1){
22522487 Irow = (int)[standListMA count] - 1;
@@ -2256,18 +2491,66 @@
22562491
22572492 if(Irow == 0){
22582493 I = Itop;
2494+ for(int i = 0;i < Irow;i++){
2495+ I= I->next;
2496+ }
2497+ IBtop = I->B;
2498+ while (I->B) {
2499+
2500+ IBLtop = I->B->L;
2501+ while (I->B->L) {
2502+
2503+
2504+ I->B->L = I->B->L->next;
2505+ }I->B->L = IBLtop;
2506+
2507+ I->B = I->B->next;
2508+ }I->B = IBtop;
2509+
2510+ I = Itop;
2511+
22592512 I = I->next;
22602513 Itop = I;
2514+
22612515 }else if(Irow == [standListMA count] - 1){
22622516 I = Itop;
22632517 while(I->next->next){
22642518 I = I->next;
22652519 }
2520+
2521+ IBtop = I->next->B;
2522+ while (I->next->B) {
2523+
2524+ IBLtop = I->next->B->L;
2525+ while (I->next->B->L) {
2526+
2527+ I->next->B->L = I->next->B->L->next;
2528+ }I->next->B->L = IBLtop;
2529+
2530+ I->next->B = I->next->B->next;
2531+ }I->next->B = IBtop;
2532+
2533+
22662534 I->next = NULL;
22672535 }else{
22682536 I = Itop;
22692537 for (int i = 0; i < Irow - 1;i++)
22702538 I = I->next;
2539+
2540+ IBtop = I->next->B;
2541+ while (I->next->B) {
2542+
2543+ IBLtop = I->next->B->L;
2544+ while (I->next->B->L) {
2545+
2546+
2547+ I->next->B->L = I->next->B->L->next;
2548+ }I->next->B->L = IBLtop;
2549+
2550+
2551+ I->next->B = I->next->B->next;
2552+ }I->next->B = IBtop;
2553+
22712554 I->next = I->next->next;
22722555 }
22732556
@@ -2281,13 +2564,11 @@
22812564 Inumb--;
22822565 }
22832566 I = Itop;
2284- */
22852567
2286- NSString *directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
2287- [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
2568+
22882569
2289- NSString *path = @"data/Scenario/";
22902570
2571+ /*
22912572 I = Itop;
22922573
22932574 if(1){
@@ -2355,7 +2636,7 @@
23552636 }
23562637 Inumb--;
23572638 Irow = -1;
2358-
2639+ */
23592640 [self saveStandData];
23602641 [self saveData];
23612642 [self loadStandData];
@@ -2885,7 +3166,6 @@
28853166 bTop = calloc(1, sizeof(BASE));
28863167 b = bTop;
28873168 b->name = [@"新キャラ" retain];
2888- b->postName = NULL;
28893169 b->z = 100;
28903170 b->L = NULL;
28913171 [dict setValue:[NSString stringWithFormat:@"%@", b->name] forKey:@"name"];
@@ -2895,14 +3175,14 @@
28953175 [MA1 insertObject:dict atIndex:[MA1 count]];
28963176 [self didChangeValueForKey:@"MA1"];
28973177 [AC1 setSelectionIndex:999];
2898- }else if(TVCrow1 == -1){
3178+ }else if(IBrow == -1){
28993179 while (b->next) {
29003180 b = b->next;
29013181 }
29023182 b->next = calloc(1, sizeof(BASE));
29033183 b = b->next;
29043184 b->name = [@"新キャラ" retain];
2905- b->postName = NULL;
3185+
29063186 b->z = 100;
29073187 b->L = NULL;
29083188 [dict setValue:[NSString stringWithFormat:@"%@", b->name] forKey:@"name"];
@@ -2913,8 +3193,8 @@
29133193 [self didChangeValueForKey:@"MA1"];
29143194 [AC1 setSelectionIndex:999];
29153195
2916- }else if(TVCrow1 > 0){
2917- for (int i = 0; i < TVCrow1-1; i++) {
3196+ }else if(IBrow > 0){
3197+ for (int i = 0; i < IBrow-1; i++) {
29183198
29193199 b = b->next;
29203200 }
@@ -2924,16 +3204,16 @@
29243204 b->next->next = tmp;
29253205 b = b->next;
29263206 b->name = [@"新キャラ" retain];
2927- b->postName = NULL;
3207+
29283208 b->z = 100;
29293209 b->L = NULL;
29303210 [dict setValue:[NSString stringWithFormat:@"%@", b->name] forKey:@"name"];
29313211 [dict setValue:[NSString stringWithFormat:@"%d", b->z] forKey:@"z"];
29323212
29333213 [self willChangeValueForKey:@"MA1"];
2934- [MA1 insertObject:dict atIndex:TVCrow1];
3214+ [MA1 insertObject:dict atIndex:IBrow];
29353215 [self didChangeValueForKey:@"MA1"];
2936- [AC1 setSelectionIndex:999];
3216+ [AC1 setSelectionIndex:IBrow];
29373217
29383218 }else{
29393219 bTop = b;
@@ -2941,7 +3221,7 @@
29413221 tmp = *b;
29423222 //LAYER *tmp2 = (LAYER*)malloc(sizeof(LAYER));
29433223 b->name = [@"新キャラ" retain];
2944- b->postName = NULL;
3224+
29453225 b->z = 100;
29463226 b->L = NULL;
29473227 b->next = calloc(1, sizeof(BASE));
@@ -2953,9 +3233,10 @@
29533233 [dict setValue:[NSString stringWithFormat:@"%d", b->z] forKey:@"z"];
29543234
29553235 [self willChangeValueForKey:@"MA1"];
2956- [MA1 insertObject:dict atIndex:TVCrow1];
3236+ [MA1 insertObject:dict atIndex:IBrow];
29573237 [self didChangeValueForKey:@"MA1"];
2958- [AC1 setSelectionIndex:999];
3238+ [AC1 setSelectionIndex:IBrow];
3239+
29593240 }
29603241
29613242 b = bTop;
@@ -2963,6 +3244,8 @@
29633244 I = Itop;
29643245 }
29653246 I = Itop;
3247+
3248+ [self initMA2];
29663249 }
29673250
29683251 -(IBAction)insert2:(id)sender{
@@ -2990,7 +3273,7 @@
29903273 LAYER *l = b->L;
29913274 blTop = l;
29923275
2993- if(TVCrow1 == -1) return;
3276+ if(IBrow == -1) return;
29943277
29953278 if(1){
29963279 NSMutableDictionary *dict = [NSMutableDictionary new];
@@ -2999,7 +3282,7 @@
29993282 blTop = calloc(1, sizeof(LAYER));
30003283 l = blTop;
30013284 l->name = [@"新規レイヤー" retain];
3002- l->postName = NULL;
3285+
30033286 l->z = 150;
30043287
30053288 [dict setValue:[NSString stringWithFormat:@"%@", l->name] forKey:@"name"];
@@ -3009,14 +3292,14 @@
30093292 [MA2 insertObject:dict atIndex:[MA2 count]];
30103293 [self didChangeValueForKey:@"MA2"];
30113294 [AC2 setSelectionIndex:999];
3012- }else if(TVCrow2 == -1){
3295+ }else if(IBLrow == -1){
30133296 while (l->next) {
30143297 l = l->next;
30153298 }
30163299 l->next = calloc(1, sizeof(LAYER));
30173300 l = l->next;
30183301 l->name = [@"新規レイヤー" retain];
3019- l->postName = NULL;
3302+
30203303 l->z = 150;
30213304
30223305 [dict setValue:[NSString stringWithFormat:@"%@", l->name] forKey:@"name"];
@@ -3027,8 +3310,8 @@
30273310 [self didChangeValueForKey:@"MA2"];
30283311 [AC2 setSelectionIndex:999];
30293312
3030- }else if(TVCrow2 > 0){
3031- for (int i = 0; i < TVCrow2-1; i++) {
3313+ }else if(IBLrow > 0){
3314+ for (int i = 0; i < IBLrow-1; i++) {
30323315
30333316 l = l->next;
30343317 }
@@ -3038,22 +3321,22 @@
30383321 l->next->next = tmp;
30393322 l = l->next;
30403323 l->name = [@"新規レイヤー" retain];
3041- l->postName = NULL;
3324+
30423325 l->z = 150;
30433326 [dict setValue:[NSString stringWithFormat:@"%@", l->name] forKey:@"name"];
30443327 [dict setValue:[NSString stringWithFormat:@"%d", l->z] forKey:@"z"];
30453328
30463329 [self willChangeValueForKey:@"MA2"];
3047- [MA2 insertObject:dict atIndex:TVCrow2];
3330+ [MA2 insertObject:dict atIndex:IBLrow];
30483331 [self didChangeValueForKey:@"MA2"];
3049- [AC2 setSelectionIndex:999];
3332+ [AC2 setSelectionIndex:IBLrow];
30503333
30513334 }else{
30523335 blTop = l;
30533336 LAYER tmp = *l;
30543337 l->next = calloc(1, sizeof(LAYER));
30553338 l->name = [@"新規レイヤー" retain];
3056- l->postName = NULL;
3339+
30573340 l->z = 150;
30583341 l = l->next;
30593342 *l = tmp;
@@ -3062,9 +3345,9 @@
30623345 [dict setValue:[NSString stringWithFormat:@"%d", l->z] forKey:@"z"];
30633346
30643347 [self willChangeValueForKey:@"MA2"];
3065- [MA2 insertObject:dict atIndex:TVCrow2];
3348+ [MA2 insertObject:dict atIndex:IBLrow];
30663349 [self didChangeValueForKey:@"MA2"];
3067- [AC2 setSelectionIndex:999];
3350+ [AC2 setSelectionIndex:IBLrow];
30683351 }
30693352
30703353
@@ -3082,6 +3365,8 @@
30823365 }
30833366
30843367 -(IBAction)remove1:(id)sender{
3368+
3369+ /*
30853370 int cnt = 0;
30863371 int coun = 0;
30873372
@@ -3123,9 +3408,81 @@
31233408 }b = bbTop;
31243409 }
31253410
3411+
31263412 BASE *bTop = b;
3413+ */
3414+ if([MA1 count] <= 0)
3415+ return;
3416+
31273417
3418+ NSString *directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
3419+ [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
3420+
3421+ NSString *path = @"data/Scenario/img/";
3422+
3423+ if(Irow == -1){
3424+ Irow = (int)[standListMA count] - 1;
3425+ }
3426+
3427+ for(int i = 0;i < Irow;i++)
3428+ I = I->next;
3429+
3430+ if([MA1 count] > 0){
3431+
3432+ if(IBrow == 0){
3433+ IBtop = I->B;
3434+ for(int i = 0;i < IBrow;i++){
3435+ I->B = I->B->next;
3436+ }
3437+
3438+
3439+ I->B = I->B->next;
3440+ IBtop = I->B;
3441+
3442+ }else if(IBrow == [MA1 count] - 1 || (IBrow < 0 && [MA1 count] > 0)){
3443+ IBtop = I->B;
3444+ if(I->B->next)
3445+ while(I->B->next->next){
3446+ I->B = I->B->next;
3447+ }
3448+
3449+
3450+ I->B->next = NULL;
3451+
3452+ I->B = IBtop;
3453+
3454+ }else{
3455+ IBtop = I->B;
3456+ for (int i = 0; i < IBrow-1;i++)
3457+ I->B = I->B->next;
3458+
3459+ I->B->next = I->B->next->next;
3460+
3461+ I->B = IBtop;
3462+
3463+ }
3464+
3465+ [self willChangeValueForKey:@"MA1"];
3466+ if(IBrow >= 0) [MA1 removeObjectAtIndex:IBrow];
3467+ else
3468+ [MA1 removeObjectAtIndex:[MA1 count] - 1];
3469+ [self didChangeValueForKey:@"MA1"];
3470+ [AC1 setSelectionIndex:IBrow];
3471+
3472+
3473+ if(IBrow >= 0)
3474+ TVCrow1--;
3475+
3476+ [self initMA2];
3477+
3478+ if(IBrow < 0) [AC1 setSelectionIndex:9999];
3479+ if(IBrow == 0) [AC1 setSelectionIndex:0];
3480+ if(IBrow > 0) IBrow--;
3481+ }
3482+ I->B = IBtop;
3483+ I = Itop;
31283484
3485+ /*
31293486 if(1){
31303487 if([MA1 count] == 0){
31313488 return;
@@ -3199,7 +3556,7 @@
31993556 I = Itop;
32003557 }
32013558
3202-
3559+ */
32033560
32043561
32053562
@@ -3211,6 +3568,11 @@
32113568 }
32123569
32133570 -(IBAction)remove2:(id)sender{
3571+
3572+
3573+ if([MA2 count] <= 0)
3574+ return;
3575+ /*
32143576 int cnt = 0;
32153577 int coun = 0;
32163578
@@ -3251,17 +3613,18 @@
32513613 }b = bbTop;
32523614 }
32533615
3616+ /*
32543617 BASE *bTop = b;
32553618 for(int i = 0;i < TVCrow1;i++){
32563619 b = b->next;
32573620 }
32583621
32593622 LAYER *blTop = b->L;
3260- /*
3623+
32613624 for(int i = 0;i < TVCrow2;i++){
32623625 b->L = b->L->next;
32633626 }
3264- */
3627+
32653628 LAYER *l = b->L;
32663629 blTop = l;
32673630
@@ -3327,6 +3690,92 @@
33273690 I->B = b;
33283691 b = bTop;
33293692 I = Itop;
3693+ */
3694+
3695+ NSString *directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
3696+ [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
3697+
3698+ NSString *path = @"data/Scenario/img/";
3699+
3700+
3701+ I = Itop;
3702+
3703+ if(Irow == -1){
3704+ Irow = (int)[standListMA count] - 1;
3705+ }
3706+
3707+ if(Irow < 0)
3708+ return;
3709+
3710+ for(int i = 0;i < Irow;i++)
3711+ I = I->next;
3712+
3713+ if(IBrow == -1){
3714+ IBrow = (int)[MA1 count] - 1;
3715+ }
3716+
3717+ if(IBrow < 0)
3718+ return;
3719+
3720+ IBtop = I->B;
3721+ for(int i = 0;i < IBrow;i++)
3722+ I->B = I->B->next;
3723+
3724+ if([MA2 count] > 0){
3725+
3726+ if(IBLrow == 0){
3727+ IBLtop = I->B->L;
3728+ for(int i = 0;i < IBLrow;i++){
3729+ I->B->L = I->B->L->next;
3730+ }
3731+
3732+
3733+ I->B->L = I->B->L->next;
3734+ IBLtop = I->B->L;
3735+
3736+ }else if(IBLrow == [MA2 count] - 1 || (IBLrow < 0 && [MA2 count] > 0)){
3737+ IBLtop = I->B->L;
3738+ if(I->B->L->next)
3739+ while(I->B->L->next->next){
3740+ I->B->L = I->B->L->next;
3741+ }
3742+
3743+
3744+ I->B->L->next = NULL;
3745+
3746+ I->B->L = IBLtop;
3747+
3748+ }else{
3749+ IBLtop = I->B->L;
3750+ for (int i = 0; i < IBLrow-1;i++)
3751+ I->B->L = I->B->L->next;
3752+
3753+
3754+
3755+ I->B->L->next = I->B->L->next->next;
3756+
3757+ I->B->L = IBLtop;
3758+
3759+ }
3760+
3761+ [self willChangeValueForKey:@"MA2"];
3762+ if(IBLrow >= 0) [MA2 removeObjectAtIndex:IBLrow];
3763+ else
3764+ [MA2 removeObjectAtIndex:[MA2 count] - 1];
3765+ [self didChangeValueForKey:@"MA2"];
3766+ [AC2 setSelectionIndex:IBLrow];
3767+ if(IBLrow < 0) [AC2 setSelectionIndex:9999];
3768+ if(IBLrow == 0) [AC2 setSelectionIndex:0];
3769+ if(IBLrow > 0) IBLrow--;
3770+ }
3771+ I->B->L = IBLtop;
3772+ I->B = IBtop;
3773+ I = Itop;
3774+
3775+ if(IBLrow >= 0)
3776+ TVCrow2--;
3777+
3778+
33303779 }
33313780
33323781 -(IBAction)saveBtn:(id)sender{
@@ -3335,6 +3784,11 @@
33353784
33363785 -(void)saveData{
33373786
3787+
3788+ [fieldScene saveStandImages];
3789+ I = Itop;
3790+
3791+ /*
33383792 NSString *directoryPath;
33393793
33403794 directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
@@ -3344,13 +3798,26 @@
33443798 NSString *fdata = @"data/Scenario/";
33453799 NSString *direct = @"data/Scenario/";
33463800
3347- /*
3801+
3802+
3803+
3804+
3805+
3806+
3807+
3808+
3809+
3810+
3811+
3812+
33483813 [[NSFileManager defaultManager] createDirectoryAtPath:direct
33493814 withIntermediateDirectories:YES
33503815 attributes:nil
33513816 error:nil];
3352- */
3817+
3818+
33533819 NSString *fileData = @"";
3820+ /*
33543821 for(int i = 0;i < [deletedName count];i++){
33553822
33563823 NSString *dlPath = @"data/Scenario/img/";
@@ -3404,12 +3871,12 @@
34043871 f2Data = [brep representationUsingType:NSPNGFileType properties:nil];
34053872
34063873 NSString *dlPath = @"data/Scenario/img/";
3407- dlPath = [dlPath stringByAppendingFormat:@"%@#%d", b->postName, Standcount];
3874+ dlPath = [dlPath stringByAppendingFormat:@"%@", b->postName];
34083875
34093876 [[NSFileManager defaultManager] removeItemAtPath:dlPath error:nil];
34103877
34113878 NSString *bcPath = @"data/Scenario/img/";
3412- bcPath = [bcPath stringByAppendingFormat:@"%@#%d", b->name, Standcount];
3879+ bcPath = [bcPath stringByAppendingFormat:@"%@", b->name];
34133880
34143881 [f2Data writeToFile:bcPath atomically:YES];
34153882
@@ -3427,12 +3894,12 @@
34273894 f2Data = [brep representationUsingType:NSPNGFileType properties:nil];
34283895
34293896 NSString *dlPath = @"data/Scenario/img/";
3430- dlPath = [dlPath stringByAppendingFormat:@"%@#%d", b->L->postName, Standcount];
3897+ dlPath = [dlPath stringByAppendingFormat:@"%@", b->L->postName];
34313898
34323899 [[NSFileManager defaultManager] removeItemAtPath:dlPath error:nil];
34333900
34343901 NSString *bcPath = @"data/Scenario/img/";
3435- bcPath = [bcPath stringByAppendingFormat:@"%@#%d", b->L->name, Standcount];
3902+ bcPath = [bcPath stringByAppendingFormat:@"%@", b->L->name];
34363903
34373904 [f2Data writeToFile:bcPath atomically:YES];
34383905
@@ -3479,12 +3946,12 @@
34793946 f2Data = [brep representationUsingType:NSPNGFileType properties:nil];
34803947
34813948 NSString *dlPath = @"data/Scenario/img/";
3482- dlPath = [dlPath stringByAppendingFormat:@"%@#%d", b->postName, Standcount];
3949+ dlPath = [dlPath stringByAppendingFormat:@"%@", b->postName];
34833950
34843951 [[NSFileManager defaultManager] removeItemAtPath:dlPath error:nil];
34853952
34863953 NSString *bcPath = @"data/Scenario/img/";
3487- bcPath = [bcPath stringByAppendingFormat:@"%@#%d", b->name, Standcount];
3954+ bcPath = [bcPath stringByAppendingFormat:@"%@", b->name];
34883955
34893956 [f2Data writeToFile:bcPath atomically:YES];
34903957
@@ -3502,12 +3969,12 @@
35023969 f2Data = [brep representationUsingType:NSPNGFileType properties:nil];
35033970
35043971 NSString *dlPath = @"data/Scenario/img/";
3505- dlPath = [dlPath stringByAppendingFormat:@"%@#%d", b->L->postName, Standcount];
3972+ dlPath = [dlPath stringByAppendingFormat:@"%@", b->L->postName];
35063973
35073974 [[NSFileManager defaultManager] removeItemAtPath:dlPath error:nil];
35083975
35093976 NSString *bcPath = @"data/Scenario/img/";
3510- bcPath = [bcPath stringByAppendingFormat:@"%@#%d", b->L->name, Standcount];
3977+ bcPath = [bcPath stringByAppendingFormat:@"%@", b->L->name];
35113978
35123979 [f2Data writeToFile:bcPath atomically:YES];
35133980
@@ -3530,7 +3997,7 @@
35303997 }
35313998 I = Itop;
35323999
3533- Standcount = 0;
4000+ Standcount = 0;*/
35344001 }
35354002
35364003 -(void)saveStandData{
@@ -3540,18 +4007,17 @@
35404007 I = Itop;
35414008 for (int i = 0;i < Inumb && I && [standListMA count] > 0;i++) {
35424009 I->name = [standListMA[i] valueForKey:@"name"];
3543- I->fName = [standListMA[i] valueForKey:@"file"];
35444010 I = I->next;
35454011 }I = Itop;
35464012
35474013
4014+ [fieldScene saveStandImages];
4015+ I = Itop;
35484016
35494017
35504018
35514019
3552-
3553-
3554-
4020+ /*
35554021 NSString *directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
35564022 [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
35574023
@@ -3565,11 +4031,12 @@
35654031 }I = Itop;
35664032
35674033 [string writeToFile:pathI atomically:YES encoding:NSUTF8StringEncoding error:nil];
3568-
4034+ */
35694035 }
35704036
35714037 -(void)loadStandData{
35724038
4039+ /*
35734040 NSString *directoryPath;
35744041
35754042 directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
@@ -3591,7 +4058,7 @@
35914058
35924059 NSArray *IList = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:pathID error:nil];
35934060 Inumb = 0;
3594- /*
4061+
35954062 for(NSString *path in IList){
35964063
35974064 if([path isEqualToString:@".DS_Store"]){
@@ -3631,7 +4098,7 @@
36314098 */
36324099
36334100
3634-
4101+ /*
36354102 fileData = [NSString stringWithContentsOfFile:pathI encoding:NSUTF8StringEncoding error:nil];
36364103 fileDataArrayFirst = [fileData componentsSeparatedByString:@"\n"];
36374104
@@ -3664,7 +4131,10 @@
36644131 I = I->next;
36654132 }
36664133 I = Itop;
3667-
4134+*/
4135+
4136+ [fieldScene loadStandImages];
4137+
36684138 I = Itop;
36694139
36704140 [self willChangeValueForKey:@"standListMA"];
@@ -3675,7 +4145,6 @@
36754145 NSMutableDictionary *dict = [NSMutableDictionary new];
36764146
36774147 [dict setValue:[NSString stringWithFormat:@"%@", I->name] forKey:@"name"];
3678- [dict setValue:[NSString stringWithFormat:@"%@", I->fName] forKey:@"file"];
36794148
36804149 [self willChangeValueForKey:@"standListMA"];
36814150 [standListMA addObject:dict];
@@ -3754,7 +4223,9 @@
37544223
37554224 -(void)loadData{
37564225
4226+ [fieldScene loadStandImages];
37574227
4228+ /*
37584229 NSString *directoryPath;
37594230
37604231 directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
@@ -3906,7 +4377,7 @@
39064377 I = I->next;
39074378 } I = Itop;
39084379 Standcount = 0;
3909-
4380+ */
39104381 }
39114382
39124383 -(void)initMA1MA2{
@@ -5485,6 +5956,9 @@ I = Itop;
54855956 I = I->next;
54865957 }
54875958
5959+ if(!I)
5960+ return;
5961+
54885962 b = I->B;
54895963
54905964 int layerIndex = 0;
@@ -5629,6 +6103,8 @@ I = Itop;
56296103 TX[st].S->i = SItop;
56306104 TX[st].S = STRtop[st];
56316105
6106+
6107+
56326108 }
56336109
56346110 - (void)drawRect:(NSRect)dirtyRect
@@ -5703,6 +6179,7 @@ I = Itop;
57036179 -(void)EventLoopSV:(NSTimer*)time{
57046180
57056181
6182+
57066183 if(!initMapFlag){
57076184 static int omfg = 0;
57086185
@@ -5731,54 +6208,26 @@ I = Itop;
57316208
57326209 -(void)IMGfnc{
57336210
5734- static int TXCPYS0 = 0;
5735- static int TXCPYSI0 = 0;
5736-
5737- if(!allowTXcpy){
5738- if(TXCPYS0 == 0){
5739- TXCPY[STSNUM] = TX[STSNUM];
5740- TXCPYStop = TXCPY[STSNUM].S;
5741- }
5742- if(TXCPYS0 > 0){
5743- if(TXCPY[STSNUM].S){
5744-
5745- if(TXCPYSI0 == 0){
5746- TXCPYSItop = TXCPY[STSNUM].S->i;
5747- }
5748-
5749- if(TXCPY[STSNUM].S->i){
5750- TXCPY[STSNUM].S->i = TXCPY[STSNUM].S->i->next;
5751- TXCPYSI0++;
5752- }else{
5753- TXCPY[STSNUM].S->i = TXCPYSItop;
5754- TXCPY[STSNUM].S = TXCPY[STSNUM].S->next;
5755- TXCPYSI0 = 0;
5756- }
6211+ static int initCnt = 0;
57576212
5758- }else{
5759- TXCPY[STSNUM].S = TXCPYStop;
5760- STSNUM++;
5761- TXCPYS0 = -1;
5762- for(int i = 0;i < TEXTMAX;i++){
5763- TX[i] = TXCPY[i];
5764- }
5765- }
5766-
6213+ if(initCnt == 0){
6214+ TXCPY[STSNUM] = TX[STSNUM];
6215+ initCnt++;
57676216 }
5768- TXCPYS0++;
5769-
6217+
57706218 if(!TXCPY[STSNUM].fileName){
57716219 STSNUM = 0;
6220+ txNumb = -1;
57726221 allowTXcpy = true;
57736222 NSLog(@"TXCPY LoadComplete");
57746223 }else if(STSNUM > TEXTMAX){
57756224 STSNUM = 0;
6225+ txNumb = -1;
57766226 allowTXcpy = true;
57776227 NSLog(@"TXCPY LoadComplete");
57786228 }
5779- }
57806229
5781- TXCPY[STSNUM] = TXCPY[STSNUM];
6230+ //TXCPY[STSNUM] = TXCPY[STSNUM];
57826231 }
57836232
57846233 -(void)GetImageFromImageView2{
@@ -5824,9 +6273,42 @@ I = Itop;
58246273
58256274 SEstandImgST = [[NSImage alloc] initWithData:fdata2];
58266275
6276+ STRING *txtop = TXCPY[STSNUM].S;
6277+ for (int i = 0;i < txNumb;i++){
6278+
6279+ TXCPY[STSNUM].S = TXCPY[STSNUM].S->next;
6280+ }
6281+
6282+ STANDIMAGE *txitop = TXCPY[STSNUM].S->i;
6283+ for(int i = 0;i < txiNumb;i++){
6284+
6285+ TXCPY[STSNUM].S->i = TXCPY[STSNUM].S->i->next;
6286+ }
6287+
6288+ if(!TXCPY[STSNUM].fileName){
6289+ TXCPY[STSNUM].S->i = txitop;
6290+ TXCPY[STSNUM].S = txtop;
6291+
6292+ return;
6293+ }
6294+ if(!TXCPY[STSNUM].S){
6295+ TXCPY[STSNUM].S->i = txitop;
6296+ TXCPY[STSNUM].S = txtop;
6297+ return;
6298+ }
6299+ if(!TXCPY[STSNUM].S->i){
6300+ TXCPY[STSNUM].S->i = txitop;
6301+ TXCPY[STSNUM].S = txtop;
6302+ return;
6303+ }
58276304 TXCPY[STSNUM].S->i->imgStand = SEstandImgST;
6305+ TXCPY[STSNUM].S->i = txitop;
6306+ TXCPY[STSNUM].S = txtop;
58286307
58296308 [testScenarioEditor testSEtest];
6309+
6310+ TXimgCaptured = true;
6311+
58306312 return;
58316313 }
58326314
@@ -5864,14 +6346,104 @@ I = Itop;
58646346 {
58656347
58666348
5867- if(TX[STSNUM].fileName)
5868- if(TX[STSNUM].S)
5869- if(TX[STSNUM].S->i){
6349+ if(txNumb < 0)
6350+ return;
6351+
6352+ STRING *txtop = TXCPY[STSNUM].S;
6353+
6354+ if(TXCPY[STSNUM].fileName){
6355+
6356+ if(!TXCPY[STSNUM].S){
6357+ TXCPY[STSNUM].S = txtop;
6358+ STSNUM++;
6359+ txiNumb = 0;
6360+ txNumb = 0;
6361+
6362+ return;
6363+ }
6364+
6365+ for (int i = 0;i < txNumb;i++){
6366+
58706367
5871- if(TX[STSNUM].S->i->SEMA1row-1 < 0)
6368+ TXCPY[STSNUM].S = TXCPY[STSNUM].S->next;
6369+ }
6370+
6371+ if(!TXCPY[STSNUM].S){
6372+ TXCPY[STSNUM].S = txtop;
6373+ STSNUM++;
6374+ txiNumb = 0;
6375+ txNumb = 0;
6376+ return;
6377+ }
6378+
6379+ STANDIMAGE *txitop = TXCPY[STSNUM].S->i;
6380+
6381+ if(!TXCPY[STSNUM].S->i){
6382+ if(TXCPY[STSNUM].S->next){
6383+ txNumb++;
6384+ TXimgIsNull = true;
6385+ TXCPY[STSNUM].S->i = txitop;
6386+ TXCPY[STSNUM].S = txtop;
6387+ return;
6388+ }else{
6389+ TXCPY[STSNUM].S = txtop;
6390+ STSNUM++;
6391+ txNumb = 0;
6392+ TXimgCaptured = false;
6393+ return;
6394+ }
6395+ }else{
6396+ for(int i = 0;i < txiNumb;i++){
6397+
6398+ TXCPY[STSNUM].S->i = TXCPY[STSNUM].S->i->next;
6399+ }
6400+
6401+ if((TXCPY[STSNUM].S->i->imgStand && TXimgCaptured) || (!TXCPY[STSNUM].S->i->name)){
6402+ TXimgCaptured = false;
6403+ if(TXCPY[STSNUM].S->i->next) {
6404+ txiNumb++;
6405+ TXimgIsNull = true;
6406+ TXCPY[STSNUM].S->i = txitop;
6407+ TXCPY[STSNUM].S = txtop;
6408+ return;
6409+ }else{
6410+ txiNumb = 0;
6411+
6412+ if(TXCPY[STSNUM].S->next){
6413+ txNumb++;
6414+ TXimgIsNull = true;
6415+ TXCPY[STSNUM].S->i = txitop;
6416+ TXCPY[STSNUM].S = txtop;
6417+ return;
6418+ }
6419+ else{
6420+ txNumb = 0;
6421+ TXimgIsNull = true;
6422+ TXCPY[STSNUM].S->i = txitop;
6423+ TXCPY[STSNUM].S = txtop;
6424+ STSNUM++;
6425+ return;
6426+ }
6427+ }
6428+ }
6429+ }
6430+
6431+
6432+
6433+ if(TXCPY[STSNUM].fileName)
6434+ if(TXCPY[STSNUM].S)
6435+ if(TXCPY[STSNUM].S->i){
6436+
6437+ if(TXCPY[STSNUM].S->i->SEMA1row-1 < 0){
6438+ TXCPY[STSNUM].S->i = txitop;
6439+ TXCPY[STSNUM].S = txtop;
58726440 return;
5873- if(TX[STSNUM].S->i->SEMA2row-1 < 0)
6441+ }
6442+ if(TXCPY[STSNUM].S->i->SEMA2row-1 < 0){
6443+ TXCPY[STSNUM].S->i = txitop;
6444+ TXCPY[STSNUM].S = txtop;
58746445 return;
6446+ }
58756447
58766448 I = Itop;
58776449 for(int i = 0;i < TXCPY[STSNUM].S->i->SEMA1row-1;i++){
@@ -5879,16 +6451,20 @@ I = Itop;
58796451 }
58806452
58816453 b = I->B;
5882-
6454+
6455+ TXimgIsNull = true;
58836456 int layerIndex = 0;
58846457 BASE *bTop = b;
58856458 while(layerIndex <= 999){
5886-
6459+
58876460 for (int i = 0;b && i <= TXCPY[STSNUM].S->i->SEMA2row-1; i++) {
58886461
5889- if(i == TX[STSNUM].S->i->SEMA2row-1){
6462+ if(i == TXCPY[STSNUM].S->i->SEMA2row-1){
58906463
5891- if(layerIndex == b->z && b->img) [self DrawImage:b->img x:b->x y:b->y];
6464+ if(layerIndex == b->z && b->img) {
6465+ [self DrawImage:b->img x:b->x y:b->y];
6466+ TXimgIsNull = false;
6467+ }
58926468
58936469 if(1){
58946470 LAYER *l = b->L;
@@ -5898,10 +6474,11 @@ I = Itop;
58986474 if(1/*l->visibleInstant*/){
58996475
59006476 //NSLog(@"%d[%d]", i0, *(TX[STSNUM].S->i->SEMA3flag + i0));
5901- if(TX[STSNUM].S->i->SEMA3flag)
5902- if(*(TX[STSNUM].S->i->SEMA3flag + i0) > 1)
6477+ if(TXCPY[STSNUM].S->i->SEMA3flag)
6478+ if(*(TXCPY[STSNUM].S->i->SEMA3flag + i0) > 1)
59036479 if(layerIndex == l->z && l->img){
59046480 [self DrawImage:l->img x:l->x y:l->y];
6481+ TXimgIsNull = false;
59056482 }
59066483
59076484
@@ -5920,11 +6497,12 @@ I = Itop;
59206497 b = bTop;
59216498 layerIndex++;
59226499 }
5923-
6500+
59246501 I = Itop;
59256502 }
5926-
5927-
6503+ TXCPY[STSNUM].S->i = txitop;
6504+ }
6505+ TXCPY[STSNUM].S = txtop;
59286506 }
59296507
59306508 @end
--- a/Awars III/StandView.m
+++ b/Awars III/StandView.m
@@ -214,6 +214,8 @@
214214 I = Itop;
215215 [self setNeedsDisplay:YES];
216216
217+ [testScenarioEditor setTFpos];
218+
217219 }
218220
219221 -(void)mouseUp:(NSEvent *)theEvent{
@@ -264,7 +266,8 @@
264266 layerIndex++;
265267 }
266268 }*/
267-
269+ if(IBrow < 0)
270+ return;
268271
269272 I = Itop;
270273
--- a/Awars III/StringText.h
+++ b/Awars III/StringText.h
@@ -27,7 +27,7 @@ typedef struct _NVALUE{
2727 }NVALUE;
2828
2929 typedef struct _STANDIMAGE{
30-
30+
3131 struct _STANDIMAGE *next;
3232
3333 NSImage *imgStand;
@@ -102,6 +102,15 @@ STRING *ST;
102102
103103 STANDIMAGE *STItop;
104104
105+STANDIMAGE *SItop;
106+STANDIMAGE *si;
107+STANDIMAGE *siPost;
108+
109+STANDIMAGE *STANDADD;
110+
111+STRING *TXCPYStop;
112+STANDIMAGE *TXCPYSItop;
113+
105114 bool mouseClicked;
106115 bool mouseDowned;
107116 bool mouseHolding;
--- a/Awars III/StringText.m
+++ b/Awars III/StringText.m
@@ -210,6 +210,7 @@
210210 ST->wallFadeOut = false;
211211 */
212212 int STIcnt = 0;
213+ int STcnt = 0;
213214 for(int i = 1;i<=[fileDataArray count];i++){
214215 NSString *str = [fileDataArray objectAtIndex:i-1];
215216 NSRange range = NSMakeRange(2, str.length - 2);
@@ -257,12 +258,15 @@
257258 if (rangeSearch2.location != NSNotFound) {commentSwitch = true;
258259
259260 }else if (rangeSearch.location != NSNotFound || rangeSearch10.location != NSNotFound) {commentSwitch = false;
261+ STcnt++;
262+ if(STItop) ST->i = STItop;
263+ STItop = NULL;
260264 if(!ST){
261265 ST = calloc(1, sizeof(STRING));
262266 ST->next = calloc(1, sizeof(STRING));
263267 STtop = ST;
264268 }
265- if(STItop) ST->i = STItop;
269+
266270 STIcnt = 0;
267271 if(ST)
268272 if(ST->S)
@@ -352,7 +356,7 @@
352356
353357 STRING *TXCPYINDEX = TXCPY[fileNameIndex].S;
354358
355- for(int L = 0;L < dialogMax-1;L++){
359+ for(int L = 1;L < STcnt;L++){
356360 TXCPY[fileNameIndex].S = TXCPY[fileNameIndex].S->next;
357361 }
358362
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -11567,13 +11567,13 @@
1156711567 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1156811568 <subviews>
1156911569 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" headerView="2xe-Ys-y8C" id="14153">
11570- <rect key="frame" x="0.0" y="0.0" width="465" height="19"/>
11570+ <rect key="frame" x="0.0" y="0.0" width="468" height="19"/>
1157111571 <autoresizingMask key="autoresizingMask"/>
1157211572 <size key="intercellSpacing" width="3" height="2"/>
1157311573 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
1157411574 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
1157511575 <tableColumns>
11576- <tableColumn width="209.33203125" minWidth="40" maxWidth="1000" id="14157">
11576+ <tableColumn width="464.69921875" minWidth="40" maxWidth="1000" id="14157">
1157711577 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="立ち絵名">
1157811578 <font key="font" metaFont="smallSystem"/>
1157911579 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -11593,27 +11593,6 @@
1159311593 </binding>
1159411594 </connections>
1159511595 </tableColumn>
11596- <tableColumn width="250.18359375" minWidth="40" maxWidth="1000" id="14158">
11597- <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="ファイル名">
11598- <font key="font" metaFont="smallSystem"/>
11599- <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
11600- <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
11601- </tableHeaderCell>
11602- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="14159">
11603- <font key="font" metaFont="system"/>
11604- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
11605- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
11606- </textFieldCell>
11607- <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
11608- <connections>
11609- <binding destination="14319" name="value" keyPath="arrangedObjects.file" id="QXD-E9-NPZ">
11610- <dictionary key="options">
11611- <bool key="NSConditionallySetsEditable" value="YES"/>
11612- <bool key="NSCreatesSortDescriptor" value="NO"/>
11613- </dictionary>
11614- </binding>
11615- </connections>
11616- </tableColumn>
1161711596 </tableColumns>
1161811597 </tableView>
1161911598 </subviews>
@@ -11794,15 +11773,6 @@
1179411773 <action selector="remove2:" target="9720" id="sHK-hz-RtB"/>
1179511774 </connections>
1179611775 </button>
11797- <textField verticalHuggingPriority="750" id="14235">
11798- <rect key="frame" x="62" y="164" width="50" height="22"/>
11799- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
11800- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="14236">
11801- <font key="font" metaFont="system"/>
11802- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
11803- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
11804- </textFieldCell>
11805- </textField>
1180611776 <textField verticalHuggingPriority="750" id="14241">
1180711777 <rect key="frame" x="169" y="164" width="50" height="22"/>
1180811778 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -11811,6 +11781,9 @@
1181111781 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
1181211782 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
1181311783 </textFieldCell>
11784+ <connections>
11785+ <action selector="TFposYsubmit:" target="9720" id="Nls-8O-2WQ"/>
11786+ </connections>
1181411787 </textField>
1181511788 <textField verticalHuggingPriority="750" id="14250">
1181611789 <rect key="frame" x="18" y="167" width="39" height="17"/>
@@ -11880,7 +11853,7 @@
1188011853 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1188111854 <subviews>
1188211855 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" headerView="14194" id="14196">
11883- <rect key="frame" x="0.0" y="0.0" width="199" height="19"/>
11856+ <rect key="frame" x="0.0" y="0.0" width="199" height="82"/>
1188411857 <autoresizingMask key="autoresizingMask"/>
1188511858 <size key="intercellSpacing" width="3" height="2"/>
1188611859 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -11964,6 +11937,18 @@
1196411937 <autoresizingMask key="autoresizingMask"/>
1196511938 </tableHeaderView>
1196611939 </scrollView>
11940+ <textField verticalHuggingPriority="750" id="14235">
11941+ <rect key="frame" x="62" y="164" width="50" height="22"/>
11942+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
11943+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="14236">
11944+ <font key="font" metaFont="system"/>
11945+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
11946+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
11947+ </textFieldCell>
11948+ <connections>
11949+ <action selector="TFposXsubmit:" target="9720" id="oTE-RL-3bj"/>
11950+ </connections>
11951+ </textField>
1196711952 </subviews>
1196811953 </view>
1196911954 </window>
@@ -21832,28 +21817,29 @@
2183221817 <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" animationBehavior="default" id="3Ku-FI-rgF" userLabel="立ち絵バック" customClass="NSPanel">
2183321818 <windowStyleMask key="styleMask" titled="YES" utility="YES"/>
2183421819 <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/>
21835- <rect key="contentRect" x="196" y="112" width="0.0" height="0.0"/>
21820+ <rect key="contentRect" x="196" y="112" width="670" height="506"/>
2183621821 <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
2183721822 <view key="contentView" id="eXV-Dc-9AN">
21823+ <rect key="frame" x="0.0" y="0.0" width="670" height="506"/>
2183821824 <autoresizingMask key="autoresizingMask"/>
2183921825 <subviews>
2184021826 <customView id="uNw-Ue-ALs" customClass="SEstandViewST">
21841- <rect key="frame" x="382" y="-480" width="418" height="480"/>
21827+ <rect key="frame" x="237" y="26" width="418" height="480"/>
2184221828 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
2184321829 </customView>
2184421830 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="oRP-UT-PmY">
21845- <rect key="frame" x="206" y="-489" width="127" height="136"/>
21831+ <rect key="frame" x="61" y="17" width="127" height="136"/>
2184621832 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
2184721833 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" imageFrameStyle="grayBezel" id="D68-hm-Hwt"/>
2184821834 </imageView>
2184921835 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="z4m-ym-FIw">
21850- <rect key="frame" x="177" y="-173" width="156" height="156"/>
21836+ <rect key="frame" x="32" y="333" width="156" height="156"/>
2185121837 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
2185221838 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" imageFrameStyle="grayBezel" id="XYe-Fg-Rbf"/>
2185321839 </imageView>
2185421840 </subviews>
2185521841 </view>
21856- <point key="canvasLocation" x="-82" y="2185"/>
21842+ <point key="canvasLocation" x="-275" y="2229"/>
2185721843 </window>
2185821844 <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="3Dx-MW-c2q" userLabel="シナリオ選択途中から" customClass="NSPanel">
2185921845 <windowStyleMask key="styleMask" utility="YES"/>
Show on old repository browser