OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

freetrain-exav: Commit


Commit MetaInfo

Revision113 (tree)
Time2010-08-20 23:04:57
Authorriorio

Log Message

(empty log message)

Change Summary

Incremental Difference

--- ALPHA3/trunk/doc/ALPHA_VERSION.txt (revision 112)
+++ ALPHA3/trunk/doc/ALPHA_VERSION.txt (revision 113)
@@ -1,16 +1,19 @@
11 本アーカイブは、FreeTrain EX A-versionのアルファ版です。
22
3-本アーカイブのバージョンはα3.1.1.3です。
4-リリース日 2010/07/22
3+本アーカイブのバージョンはα3.1.1.4です。
4+リリース日 2010/08/20
55
66 ◎既知の不具合
77 ・時間進行軸の値がセーブデータに保存されない
88 ・列車名を表示すると周囲に文字の消え残りゴミが出る
9-　（駅情報ウィンドウを閉じると問題ありません）
109
1110 その他あれば開発スレでご報告ください。
1211
1312
13+○3.1.1.3からの変更点
14+・レジストリを一切使用しないようにした
15+・起動に失敗することがあったのを修正
16+
1417 ○3.1.1.2からの変更点
1518 ・駅に接続するホームの半径を8ボクセルに拡大
1619
--- ALPHA3/trunk/core/AssemblyInfo.cs (revision 112)
+++ ALPHA3/trunk/core/AssemblyInfo.cs (revision 113)
@@ -21,7 +21,7 @@
2121 // 下にあるように、'*' を使って、すべての値を指定するか、
2222 // ビルドおよびリビジョン番号を既定値にすることができます :
2323
24-[assembly: AssemblyVersion("3.1.1.3")]
24+[assembly: AssemblyVersion("3.1.1.4")]
2525
2626 //
2727 // アセンブリに署名するには、使用するキーを指定しなければなりません。
--- ALPHA3/trunk/core/world/rail/Train.cs (revision 112)
+++ ALPHA3/trunk/core/world/rail/Train.cs (revision 113)
@@ -48,23 +48,23 @@
4848 private static readonly SoundEffect thudSound = new RepeatableSoundEffectImpl(
4949 ResourceUtil.loadSystemSound("train.wav"),1,300);
5050
51+ // riorio 2010.03.31
52+ public static long[][] SecondsPerVoxelBank = new long [][] { // Train Speed at Version3
53+ new long [] { 1 , 2 , 3 , 4 , 5 , 6 }, // 3.0.0.4
54+ new long [] { 2 , 4 , 6 , 8 , 10 , 12 }, // 3.0.0.3
55+ new long [] { 3 , 6 , 9 , 12 , 15 , 18 },
56+ new long [] { 4 , 8 , 12 , 16 , 20 , 24 },
57+ new long [] { 5 , 10 , 15 , 20 , 25 , 30 },
58+ new long [] { 60 , 120 , 180 , 240 , 300 , 360 } // Train Speed at Version1,2 conpatible
59+ };
60+
5161 // riorio 2010.03.22
52- public static long[] SecondsPerVoxel = // Train speed need for seconds on 1 Voxel
53- {
54- 1 , 2 , 3 , 4 , 5 , 6
55- };
56- // riorio 2010.03.31
57- public static long[][] SecondsPerVoxelBank = new long [][] { // Train Speed at Version3
58- new long [] { 1 , 2 , 3 , 4 , 5 , 6 }, // 3.0.0.4
59- new long [] { 2 , 4 , 6 , 8 , 10 , 12 }, // 3.0.0.3
60- new long [] { 3 , 6 , 9 , 12 , 15 , 18 },
61- new long [] { 4 , 8 , 12 , 16 , 20 , 24 },
62- new long [] { 5 , 10 , 15 , 20 , 25 , 30 },
63- new long [] { 60 , 120 , 180 , 240 , 300 , 360 } // Train Speed at Version1,2 conpatible
64- };
62+ public static long[] SecondsPerVoxel = // Train speed need for seconds on 1 Voxel
63+ SecondsPerVoxelBank[ Core.options.secondPerVoxelIndex ];
6564
66- public static int SecondsPerVoxelBankKinds = 6;
65+ public static int SecondsPerVoxelBankKinds = 6;
6766
67+
6868 /// <summary>
6969 /// Creates a new train and assigns it to a group.
7070 /// </summary>
--- ALPHA3/trunk/core/world/accounting/AccountSummaryWindow.cs (revision 112)
+++ ALPHA3/trunk/core/world/accounting/AccountSummaryWindow.cs (revision 113)
@@ -1,3 +1,4 @@
1+// 2010.05.29 riorio add context menu last30days/last12months
12 // 2010.05.11 riorio add Yesterday/Last month/Last year
23 using System;
34 using System.Diagnostics;
@@ -157,6 +158,7 @@
157158
158159 #region GUI components
159160 private System.Windows.Forms.MenuItem menuItem_Graph;
161+ private System.Windows.Forms.MenuItem menuItem_DaysAgo;
160162 private System.Windows.Forms.MenuItem menuItem_MonthsAgo;
161163 private System.Windows.Forms.FontDialog fontDialog;
162164 private System.Windows.Forms.Label label1;
@@ -197,6 +199,7 @@
197199 this.menuItem1 = new System.Windows.Forms.MenuItem();
198200 this.menuItem2 = new System.Windows.Forms.MenuItem();
199201 this.menuItem_Graph = new System.Windows.Forms.MenuItem();
202+ this.menuItem_DaysAgo = new System.Windows.Forms.MenuItem();
200203 this.menuItem_MonthsAgo = new System.Windows.Forms.MenuItem();
201204 this.menuItem4 = new System.Windows.Forms.MenuItem();
202205 this.menuItem3 = new System.Windows.Forms.MenuItem();
@@ -235,6 +238,7 @@
235238 this.menuItem1,
236239 this.menuItem2,
237240 this.menuItem_Graph,
241+ this.menuItem_DaysAgo,
238242 this.menuItem_MonthsAgo,
239243 this.menuItem4,
240244 this.menuItem3});
@@ -258,18 +262,24 @@
258262 //
259263 // menuItem_MonthsAgo
260264 //
261- this.menuItem_MonthsAgo.Index = 3;
265+ this.menuItem_DaysAgo.Index = 3;
266+ this.menuItem_DaysAgo.Text = "過去30日";
267+ this.menuItem_DaysAgo.Click += new System.EventHandler(this.menuItem_DaysAgo_Click);
268+ //
269+ // menuItem_MonthsAgo
270+ //
271+ this.menuItem_MonthsAgo.Index = 4;
262272 this.menuItem_MonthsAgo.Text = "過去12ヶ月";
263273 this.menuItem_MonthsAgo.Click += new System.EventHandler(this.menuItem_MonthsAgo_Click);
264274 //
265275 // menuItem4
266276 //
267- this.menuItem4.Index = 4;
277+ this.menuItem4.Index = 5;
268278 this.menuItem4.Text = "-";
269279 //
270280 // menuItem3
271281 //
272- this.menuItem3.Index = 5;
282+ this.menuItem3.Index = 6;
273283 this.menuItem3.Text = "閉じる(&C)";
274284 //
275285 // liquidAsset
@@ -538,10 +548,15 @@
538548
539549 private void menuItem_MonthsAgo_Click(object sender, EventArgs e)
540550 {
541- new HistoryViewMonths();
551+ new HistoryViewMonths().Show(this);
542552 }
543553
554+ private void menuItem_DaysAgo_Click(object sender, EventArgs e)
555+ {
556+ new HistoryViewDays().Show(this);
557+ }
544558
559+
545560
546561 }
547562 }
--- ALPHA3/trunk/core/framework/GlobalOptions.cs (revision 112)
+++ ALPHA3/trunk/core/framework/GlobalOptions.cs (revision 113)
@@ -208,8 +208,6 @@
208208 {
209209 GlobalOptions opt = (GlobalOptions)base.load();
210210 DirectDraw.SurfeceAllocation = opt.SurfaceAlloc;
211- freetrain.world.rail.Train.SecondsPerVoxel
212- = freetrain.world.rail.Train.SecondsPerVoxelBank[ opt.secondPerVoxelIndex ];
213211 return opt;
214212 }
215213
--- ALPHA3/trunk/core/framework/MainWindow.cs (revision 112)
+++ ALPHA3/trunk/core/framework/MainWindow.cs (revision 113)
@@ -161,7 +161,7 @@
161161
162162 // persist window state
163163 new WindowStateTracker( this,
164- new RegistryPersistentWindowState( Core.userRegistry.CreateSubKey("mainWindowState") ) );
164+ new XmlPersistentWindowState( Core.installationDirectory + "\\main_window_state.xml" ));
165165
166166 // spawn file drop handler
167167 fileDropHandler = new FileDropHandler(this,new FileDropEventHandler(onFileDropped));
--- ALPHA3/trunk/core/framework/Core.cs (revision 112)
+++ ALPHA3/trunk/core/framework/Core.cs (revision 113)
@@ -18,7 +18,7 @@
1818 {
1919 private Core() {} // no instantiation
2020
21-
21+/*
2222 /// <summary>
2323 /// Registry key where the per-user application setting
2424 /// should be stored.
@@ -28,16 +28,17 @@
2828 return Registry.CurrentUser.CreateSubKey(@"Software\FreeTrain");
2929 }
3030 }
31-
31+*/
32+
3233 /// <summary>
3334 /// Installation directory of the FreeTrain framework.
3435 /// </summary>
3536 public static string installationDirectory {
3637 get {
37- return (string)userRegistry.GetValue("installationDirectory");
38+ return _installationDirectory;
3839 }
3940 set {
40- userRegistry.SetValue("installationDirectory",value);
41+ _installationDirectory = value;
4142 }
4243 }
4344
@@ -48,7 +49,8 @@
4849 /// <summary> Global options. </summary>
4950 public static readonly GlobalOptions options = new GlobalOptions().load();
5051 public static readonly FontOptions fontoptions = new FontOptions().load( options );
51-
52+
53+
5254 /// <summary> Game mode </summary>
5355 public static bool isConstructionMode {
5456 get {
@@ -72,6 +74,7 @@
7274 private static SoundEffectManager _soundEffectManager;
7375 private static BGMManager _bgmManager;
7476 private static bool _isConstructionMode;
77+ private static string _installationDirectory;
7578
7679
7780
Show on old repository browser