Changeset 12957 for lang/d

Timestamp:

06/01/08 02:08:06 (6 months ago)

Author:

omega

Message:

save/loadボタンにした。ログファイルの書き込み周りでエラー処理追加

Location:

lang/d/koke/trunk

Files:

• resource/image/menu.bmp (modified) (previous)
• src/clickable.d (modified) (5 diffs)
• src/gamecore.d (modified) (7 diffs)
• src/hell2.d (modified) (2 diffs)

lang/d/koke/trunk/src/clickable.d

@@ -37 +37 @@
                 ECONOMY,                // エコノミー
                 CHART,                  // チャート
-                SAVE,                   // SAVE
-                LOAD,                   // LOAD
                 
                 STOP,                   // 停止
@@ -44 +42 @@
                 KSK,                    // 加速
                 DANGER,                 // 危
+                
+                SAVE,                   // SAVE
+                LOAD,                   // LOAD
+                RESET,                  // RESET
         }
         
@@ -50 +52 @@
                 SML,    // 小
                 MIN,    // 極小
-        }
-        //                                                  del    he    ray   ni    up   fen   eco   crt  save  load   stp   ply   ksk   dgr 
-        const int type_width[]  = [  80 ,  80 ,  80 ,  80 ,  80 ,  80 ,  64 ,  64 ,  64 ,  64 ,  32 ,  32 ,  32 ,  32 ];
-        const int type_height[] = [  32 ,  32 ,  32 ,  32 ,  32 ,  32 ,  16 ,  16 ,  16 ,  16 ,  16 ,  16 ,  16 ,  16 ];
-        const int type_style[]  = [ LRG , LRG , LRG , LRG , LRG , LRG , SML , SML , SML , SML , MIN , MIN , MIN , MIN ];
+                ICO,    // アイコン
+        }
+        
+        const int type_style[] = [ LRG , LRG , LRG , LRG , LRG , LRG
+                                                        , SML , SML
+                                                        , MIN , MIN , MIN , MIN
+                                                        , ICO , ICO , ICO , ICO ];
+        //                                                      LRG   SML   MIN   ICO
+        const int type_width[] = [   80 ,  64 ,  32 ,  32 ];
+        const int type_height[] = [  32 ,  16 ,  16 ,  24 ];
         
         this(TYPE type){
@@ -64 +71 @@
         }
         
-        int getWidth(){return type_width[type];}
-        int getHeight(){return type_height[type];}
+        int getWidth(){return type_width[type_style[type]];}
+        int getHeight(){return type_height[type_style[type]];}
         
         void draw(bool selected,bool onMouse){
@@ -124 +131 @@
                                 Hell_drawTexture("menu" , x , y
                                                 , 306 , (cast(int)type - TYPE.STOP) * getHeight()
+                                                , getWidth() , getHeight()
+                                                ,1,1,0, 128,128,128,alpha);
+                        }
+                }else if(type_style[type] == ICO){
+                        // イメージボタン アイコン
+                        int alpha = (onMouse || selected) ? 255 : 128;
+                        if(onMouse){                    // マウスon状態
+                                Hell_drawTexture("menu" , x , y
+                                                , 338 , (cast(int)type - TYPE.SAVE) * getHeight()
+                                                , getWidth() , getHeight()
+                                                ,1,1,0, 255,255,255,alpha);
+                        }else{                                  // 非選択状態
+                                Hell_drawTexture("menu" , x , y
+                                                , 338 , (cast(int)type - TYPE.SAVE) * getHeight()
                                                 , getWidth() , getHeight()
                                                 ,1,1,0, 128,128,128,alpha);

lang/d/koke/trunk/src/gamecore.d

@@ -49 +49 @@
         ClickablePool economy_switch;   // エコノミーのON/OFFスイッチ(右上
         ClickablePool speed_switch;             // 速度スイッチ(右上
-        ClickablePool save_switch;              // セーブ
-        ClickablePool load_switch;              // ロード
+        ClickablePool sys_switch;               // システム(セーブ/ロード/リセット)
         
         int cursor_x;                                   // マウス直下の座標x(マップチップ座標系)
@@ -151 +150 @@
                 
                 // save/load
-                save_switch = new ClickablePool();
-                save_switch.add("save" , new Vec3( -32*4 , 32 , 0)
+                sys_switch = new ClickablePool();
+                sys_switch.add("save" , new Vec3( -32*6 - 16 , 0 , 0)
                         , ImageButton.TYPE.SAVE);
-                
-                load_switch = new ClickablePool();
-                load_switch.add("load" , new Vec3( -32*2 , 32 , 0)
+                sys_switch.add("load" , new Vec3( -32*5 - 16 , 0 , 0)
                         , ImageButton.TYPE.LOAD);
                 
@@ -194 +191 @@
                 economy_switch.getMouseClick();
                 speed_switch.getMouseClick();
-                save_switch.getMouseClick();
-                load_switch.getMouseClick();
-                
-                // save&load
-                if(load_switch.getSelected() == "load"){
+                sys_switch.getMouseClick();
+                
+                // システム save&load
+                if(sys_switch.getSelected() == "load"){
                         if( map.loadFile( configparser.get("MAP_LOAD_FILE") ) ){
                                 setMessage("MAP LOAD SUCCESS");
@@ -204 +200 @@
                                 setMessage("** MAP LOAD FAIL **" , MESSAGE_COLOR.ERROR);
                         }
-                        load_switch.setSelected("");
-                }
-                if(save_switch.getSelected() == "save"){
+                        sys_switch.setSelected("");
+                }
+                if(sys_switch.getSelected() == "save"){
                         if( map.saveFile( configparser.get("MAP_SAVE_FILE") ) ){
                                 setMessage("MAP SAVE SUCCESS");
@@ -212 +208 @@
                                 setMessage("** MAP SAVE FAIL **" , MESSAGE_COLOR.ERROR);
                         }
-                        save_switch.setSelected("");
+                        sys_switch.setSelected("");
                 }
                 
@@ -439 +435 @@
                 economy_switch.draw();
                 speed_switch.draw();
-                save_switch.draw();     
-                load_switch.draw();
+                sys_switch.draw();      
                 
                 // チャート
@@ -482 +477 @@
                 if(menu.getMouseOver() == "" && economy_switch.getMouseOver() == ""
                                 && chart_switch.getMouseOver() == "" && speed_switch.getMouseOver() == ""
-                                && save_switch.getMouseOver() == "" && load_switch.getMouseOver() == "") return true;
+                                && sys_switch.getMouseOver() == "" ) return true;
                 
                 return false;

lang/d/koke/trunk/src/hell2.d

@@ -316 +316 @@
         // ログファイル削除(あれば
         if(std.file.exists(g_logname)){
-                std.file.remove(g_logname);
+                try {
+                        std.file.remove(g_logname);
+                } catch ( Exception e ) {
+                        std.stdio.writefln( "log file cant write." );
+                }
         }
 }
@@ -364 +368 @@
 void Hell_write(...)
 {
-        void _putc(dchar c)
-        {
-                fputc(c, stdout);
-                auto tmp = [c];
-                append(g_logname, toUTF8(tmp));
-        }
-        doFormat(&_putc, _arguments, _argptr);
+        try {
+                void _putc(dchar c)
+                {
+                        fputc(c, stdout);
+                        auto tmp = [c];
+                        append(g_logname, toUTF8(tmp));
+                }
+                doFormat(&_putc, _arguments, _argptr);
+        } catch ( Exception e ){
+                std.stdio.writefln( "log file cant write." );
+        }
 }
 
 void Hell_write(Exception e)
 {
-        dout.writeLine(e.toString());
-        append(g_logname, e.toString() ~ "\n");
+        try {
+                dout.writeLine(e.toString());
+                append(g_logname, e.toString() ~ "\n");
+        } catch ( Exception e ){
+                std.stdio.writefln( "log file cant write." );
+        }
 }