annotate Engine/Tables/IconFrameTable.cpp @ 2557:bbef1435eb8d

.
author Ritor1
date Wed, 13 May 2015 20:09:00 +0600
parents a902abdfc7f2
children a76d408c5132
rev   line source
2499
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
1 #define _CRTDBG_MAP_ALLOC
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
2 #include <stdlib.h>
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
3 #include <crtdbg.h>
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
4
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
5 #define _CRT_SECURE_NO_WARNINGS
2541
a902abdfc7f2 1. Renamed class Game to class Engine.
a.parshin
parents: 2499
diff changeset
6
a902abdfc7f2 1. Renamed class Game to class Engine.
a.parshin
parents: 2499
diff changeset
7 #include "Engine/Engine.h"
a902abdfc7f2 1. Renamed class Game to class Engine.
a.parshin
parents: 2499
diff changeset
8
2499
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
9 #include "IconFrameTable.h"
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
10 #include "../LOD.h"
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
11 #include "FrameTableInc.h"
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
12
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
13 //----- (00494F3A) --------------------------------------------------------
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
14 unsigned int IconFrameTable::FindIcon(const char *pIconName)
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
15 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
16 for ( uint i = 0; i < (signed int)this->uNumIcons; i++ )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
17 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
18 if ( !_stricmp(pIconName, this->pIcons[i].pAnimationName) )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
19 return i;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
20 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
21 return 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
22 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
23
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
24 //----- (00494F70) --------------------------------------------------------
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
25 IconFrame *IconFrameTable::GetFrame(unsigned int uIconID, unsigned int uFrameID)
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
26 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
27 int v6; // edx@3
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
28 uint i;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
29
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
30 if ( this->pIcons[uIconID].uFlags & 1 && this->pIcons[uIconID].uAnimLength != 0 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
31 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
32 v6 = ((signed int)uFrameID >> 3) % (unsigned __int16)this->pIcons[uIconID].uAnimLength;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
33 for ( i = uIconID; v6 > this->pIcons[i].uAnimTime; i++ )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
34 v6 -= this->pIcons[i].uAnimTime;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
35 return &this->pIcons[i];
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
36 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
37 else
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
38 return &this->pIcons[uIconID];
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
39 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
40
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
41 //----- (00494FBF) --------------------------------------------------------
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
42 void IconFrameTable::InitializeAnimation(unsigned int uIconID)
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
43 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
44 if ( uIconID && (signed int)uIconID <= (signed int)this->uNumIcons )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
45 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
46 for ( uint i = uIconID; ; ++i )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
47 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
48 this->pIcons[i].uTextureID = pIcons_LOD->LoadTexture(this->pIcons[i].pTextureName, TEXTURE_16BIT_PALETTE);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
49 if ( !(this->pIcons[i].uFlags & 1) )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
50 break;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
51 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
52 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
53 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
54
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
55 //----- (0049500A) --------------------------------------------------------
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
56 void IconFrameTable::ToFile()
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
57 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
58 //IconFrameTable *v1; // esi@1
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
59 FILE *v2; // eax@1
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
60 //FILE *v3; // edi@1
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
61
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
62 //IconFrameTable* Str = this;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
63
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
64 //v1 = Str;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
65 v2 = fopen("data\\dift.bin", "wb");
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
66 //v3 = v2;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
67 if ( !v2 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
68 Error("Unable to save dift.bin!");
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
69 fwrite(this, 4, 1, v2);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
70 fwrite(this->pIcons, 0x20u, this->uNumIcons, v2);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
71 fclose(v2);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
72 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
73
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
74 //----- (00495056) --------------------------------------------------------
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
75 void IconFrameTable::FromFile(void *data_mm6, void *data_mm7, void *data_mm8)
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
76 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
77 uint num_mm6_frames = data_mm6 ? *(int *)data_mm6 : 0,
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
78 num_mm7_frames = data_mm7 ? *(int *)data_mm7 : 0,
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
79 num_mm8_frames = data_mm8 ? *(int *)data_mm8 : 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
80
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
81 uNumIcons = num_mm6_frames + num_mm7_frames + num_mm8_frames;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
82 Assert(uNumIcons);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
83 Assert(!num_mm8_frames);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
84
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
85 pIcons = (IconFrame *)malloc(uNumIcons * sizeof(IconFrame));
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
86 memcpy(pIcons, (char *)data_mm7 + 4, num_mm7_frames * sizeof(IconFrame));
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
87 memcpy(pIcons + num_mm7_frames, (char *)data_mm6 + 4, num_mm6_frames * sizeof(IconFrame));
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
88 memcpy(pIcons + num_mm6_frames + num_mm7_frames, (char *)data_mm8 + 4, num_mm8_frames * sizeof(IconFrame));
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
89 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
90
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
91 //----- (0049509D) --------------------------------------------------------
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
92 int IconFrameTable::FromFileTxt(const char *Args)
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
93 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
94 //IconFrameTable *v2; // ebx@1
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
95 FILE *v3; // eax@1
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
96 int v4; // esi@3
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
97 void *v5; // eax@10
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
98 FILE *v6; // ST0C_4@12
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
99 char *i; // eax@12
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
100 const char *v8; // ST00_4@15
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
101 int v9; // eax@16
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
102 int v10; // edx@20
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
103 int v11; // ecx@21
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
104 int v12; // eax@22
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
105 signed int j; // edx@25
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
106 IconFrame *v14; // ecx@26
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
107 int v15; // esi@26
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
108 int k; // eax@27
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
109 signed int result; // eax@11
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
110 char Buf; // [sp+Ch] [bp-2F8h]@3
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
111 FrameTableTxtLine v19; // [sp+200h] [bp-104h]@4
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
112 FrameTableTxtLine v20; // [sp+27Ch] [bp-88h]@4
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
113 int v21; // [sp+2F8h] [bp-Ch]@3
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
114 int v22; // [sp+2FCh] [bp-8h]@3
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
115 FILE *File; // [sp+300h] [bp-4h]@1
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
116 int Argsa; // [sp+30Ch] [bp+8h]@26
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
117
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
118 //v2 = this;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
119 //TileTable::dtor((TileTable *)this);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
120 __debugbreak();//Ritor1: this function not used
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
121 v3 = fopen(Args, "r");
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
122 File = v3;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
123 if ( !v3 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
124 Error("IconFrameTable::load - Unable to open file: %s.", Args);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
125 v4 = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
126 v21 = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
127 v22 = 1;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
128 if ( fgets(&Buf, 490, v3) )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
129 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
130 do
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
131 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
132 *strchr(&Buf, 10) = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
133 memcpy(&v20, frame_table_txt_parser(&Buf, &v19), sizeof(v20));
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
134 if ( v20.uPropCount && *v20.pProperties[0] != 47 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
135 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
136 if ( v20.uPropCount < 3 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
137 Error("IconFrameTable::loadText, too few arguments, %s line %i.", Args, v22);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
138 ++v21;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
139 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
140 ++v22;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
141 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
142 while ( fgets(&Buf, 490, File) );
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
143 v4 = v21;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
144 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
145 this->uNumIcons = v4;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
146 v5 = malloc(32 * v4);//, "I Frames");
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
147 this->pIcons = (IconFrame *)v5;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
148 if ( v5 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
149 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
150 v6 = File;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
151 this->uNumIcons = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
152 fseek(v6, 0, 0);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
153 for ( i = fgets(&Buf, 490, File); i; i = fgets(&Buf, 490, File) )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
154 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
155 *strchr(&Buf, 10) = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
156 memcpy(&v20, frame_table_txt_parser(&Buf, &v19), sizeof(v20));
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
157 if ( v20.uPropCount && *v20.pProperties[0] != 47 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
158 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
159 strcpy(this->pIcons[this->uNumIcons].pAnimationName, v20.pProperties[0]);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
160 strcpy(this->pIcons[this->uNumIcons].pTextureName, v20.pProperties[1]);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
161 v8 = v20.pProperties[2];
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
162 this->pIcons[this->uNumIcons].uFlags = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
163 if ( !_stricmp(v8, "new") )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
164 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
165 v9 = (int)&this->pIcons[this->uNumIcons].uFlags;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
166 *(char *)v9 |= 4u;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
167 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
168 this->pIcons[this->uNumIcons].uAnimTime = atoi(v20.pProperties[3]);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
169 this->pIcons[this->uNumIcons].uAnimLength = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
170 this->pIcons[this->uNumIcons++].uTextureID = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
171 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
172 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
173 fclose(File);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
174 v10 = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
175 if ( (signed int)(this->uNumIcons - 1) > 0 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
176 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
177 v11 = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
178 do
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
179 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
180 v12 = (int)&this->pIcons[v11];
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
181 if ( !(*(char *)(v12 + 60) & 4) )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
182 *(char *)(v12 + 28) |= 1u;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
183 ++v10;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
184 ++v11;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
185 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
186 while ( v10 < (signed int)(this->uNumIcons - 1) );
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
187 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
188 for ( j = 0; j < (signed int)this->uNumIcons; *(short *)(Argsa + 26) = v15 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
189 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
190 v14 = this->pIcons;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
191 Argsa = (int)&v14[j];
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
192 v15 = *(short *)(Argsa + 24);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
193 if ( *(char *)(Argsa + 28) & 1 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
194 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
195 ++j;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
196 for ( k = (int)&v14[j]; *(char *)(k + 28) & 1; k += 32 )
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
197 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
198 v15 += *(short *)(k + 24);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
199 ++j;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
200 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
201 LOWORD(v15) = v14[j].uAnimTime + v15;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
202 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
203 ++j;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
204 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
205 result = 1;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
206 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
207 else
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
208 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
209 fclose(File);
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
210 result = 0;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
211 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
212 return result;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
213 }
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
214 //----- (0042EB78) --------------------------------------------------------
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
215 int IconFrameTable::GetIconAnimLength(unsigned int uIconID)
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
216 {
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
217 return 8 * this->pIcons[uIconID].uAnimLength;
68cdef6879a0 engine folder
Ritor1
parents:
diff changeset
218 }