Commit: 18 - hunton_client (svn)

密猟オンラインクライアントプログラム JAVAベース

Commit MetaInfo

• Revision: 18 (tree)
• Time: 2016-12-23 22:39:00
• Author: manjihq

Log Message

メインビューソースを整形
コマンドプレフィックスキー入力の処理方法を改善
メッセージ入力領域へ移行するプレフィックスを追加

Change Summary

• modified: trunk/src/hunton/HuntMainView.java

Incremental Difference

--- trunk/src/hunton/HuntMainView.java	(revision 17)
+++ trunk/src/hunton/HuntMainView.java	(revision 18)
@@ -203,19 +203,23 @@
         if (playEffect > 0) {
             Color c = null;
             switch (playEffect) {
-                case 1:	/* for damage */
+                case 1:
+                    /* for damage */
 
                     c = Color.pink;
                     break;
-                case 2:	/* for death */
+                case 2:
+                    /* for death */
 
                     c = Color.red;
                     break;
-                case 3:	/* for digging */
+                case 3:
+                    /* for digging */
 
                     c = Color.gray;
                     break;
-                case 4:	/* for fall in hole */
+                case 4:
+                    /* for fall in hole */
 
                     c = Color.blue;
                     break;
@@ -568,7 +572,8 @@
                     case Hunt.HCLIT_PLAYER_S:
                         img = ovImgHunter[np];
                         switch (statbuffer[idx]) {
-                            case 1:	/* crime less than 1000 */
+                            case 1:
+                                /* crime less than 1000 */
 
                                 if (viewbuffer[idx] != 0) {
                                     bgcolor = Color.gray;
@@ -576,15 +581,18 @@
                                     bgcolor = Color.darkGray;
                                 }
                                 break;
-                            case 2:	/* crime less than 5000 */
+                            case 2:
+                                /* crime less than 5000 */
 
                                 bgcolor = Color.magenta;
                                 break;
-                            case 3:	/* murder ! */
+                            case 3:
+                                /* murder ! */
 
                                 bgcolor = Color.red;
                                 break;
-                            case 4:	/* friendly */
+                            case 4:
+                                /* friendly */
 
                                 bgcolor = Color.cyan;
                                 break;
@@ -648,23 +656,28 @@
                     case Hunt.HCLIT_MAP_ANIMAL:
                         img = ovImgObject[8];
                         switch (statbuffer[idx]) {
-                            case 1:	/* stun */
+                            case 1:
+                                /* stun */
 
                                 bgcolor = Color.darkGray;
                                 break;
-                            case 2:	/* panic */
+                            case 2:
+                                /* panic */
 
                                 bgcolor = Color.yellow;
                                 break;
-                            case 3:	/* charm */
+                            case 3:
+                                /* charm */
 
                                 bgcolor = Color.green;
                                 break;
-                            case 4:	/* angry */
+                            case 4:
+                                /* angry */
 
                                 bgcolor = Color.red;
                                 break;
-                            case 5:	/* friendly */
+                            case 5:
+                                /* friendly */
 
                                 bgcolor = Color.cyan;
                                 break;
@@ -722,13 +735,11 @@
                 vtimer = new HuntMainViewTimer(this, nspan);
                 vtimer.start();
             }
-        } else {
-            if (playEffect == 0) {
-                playEffect = n;
-                repaint();
-                vtimer = new HuntMainViewTimer(this, nspan);
-                vtimer.start();
-            }
+        } else if (playEffect == 0) {
+            playEffect = n;
+            repaint();
+            vtimer = new HuntMainViewTimer(this, nspan);
+            vtimer.start();
         }
     }
 
@@ -825,10 +836,6 @@
             case KeyEvent.VK_Z:
                 Hunt.getSendTask().doFire(2);
                 break;
-            case KeyEvent.VK_SLASH:
-                hview = (HuntMessageView) Hunt.getMessageView();
-                hview.setFocus("/");
-                break;
             case KeyEvent.VK_ENTER:
                 hview = (HuntMessageView) Hunt.getMessageView();
                 hview.setFocus();
@@ -835,6 +842,23 @@
                 break;
         }
     }
+
+    @Override
+    public void keyTyped(KeyEvent e) {
+        HuntMessageView hview;
+        hview = (HuntMessageView) Hunt.getMessageView();
+        switch (e.getKeyChar()) {
+            case '/':
+                hview.setFocus("/");
+                break;
+            case '!':
+                hview.setFocus("!");
+                break;
+            default:
+                break;
+        }
+        super.keyTyped(e);
+    }
 }
 
 /* EOF */