Differences From Artifact [a1f9b7cabb9073dd]:
- File
src/gui.d
- 2012-07-15 13:24:12 - part of checkin [b6026abfcf] on branch trunk - Simplified GUI code. (user: kinaba) [annotate]
To Artifact [a6dfca9cc307c324]:
- File
src/gui.d
- 2012-07-15 13:58:47 - part of checkin [68b686ff6d] on branch trunk - memo (user: kinaba) [annotate]
55 55 this.font = new Font("MS Gothic", cell-2, GraphicsUnit.PIXEL);
56 56 this.backColor = Color(255,255,255);
57 57 this.colors['#'] =
58 58 this.colors['.'] = Color(255,191,127);
59 59 this.colors['*'] =
60 60 this.colors['@'] = Color(255,127,127);
61 61 this.colors['R'] = Color(128,128,0);
62 + this.colors['r'] = Color(100,128,255);
62 63 this.colors['d'] = Color(255,0,0);
63 64 this.colors['\\'] =
64 65 this.colors['L'] =
65 66 this.colors['O'] = Color(127,255,127);
66 67 this.colors['w'] = Color(204,229,255);
67 68 this.colors['W'] =
68 69 this.colors['!'] = Color(159,159,159);
................................................................................
70 71 foreach(char c; '1'..':') this.colors[c] = Color(255,142,255);
71 72 this.render['#'] = "■";
72 73 this.render['*'] = "✹";
73 74 this.render['@'] = "❁";
74 75 this.render['.'] = "♒";
75 76 this.render['\\'] = "λ";
76 77 this.render['R'] = "☃";
78 + this.render['r'] = "☃";
77 79 this.render['d'] = "☠";
78 80 this.render['L'] = "☒";
79 81 this.render['O'] = "☐";
80 82 this.render['W'] = "ꔣ";
81 83 this.render['!'] = "✄";
82 84 foreach(c,tp; g.map.tr_target) this.render[c] = [cast(dchar)('☢'+g.map[tp]-'1')].to!string();
83 85 foreach(char c; '1'..':') this.render[c] = [cast(dchar)('☢'+c-'1')].to!string();
................................................................................
100 102
101 103 // Paint map.
102 104 for(int y=1; y<=g.map.H; ++y)
103 105 for(int x=1; x<=g.map.W; ++x) {
104 106 Rect r = Rect(cell*(x-1), scrH-cell*y, cell, cell);
105 107 char c = g.map[y,x];
106 108 if( c != ' ' ) {
107 - if( c == 'R' && g.dead )
108 - c = 'd';
109 + if( c == 'R' )
110 + c = (g.dead ? 'd' : g.cleared ? 'r' : 'R');
109 111 graphicContext.drawText(this.render[c], font, this.colors[c], r);
110 112 }
111 113 }
112 114
113 115 // Update textual info.
114 116 this.text = .text(
115 117 "Score: ", g.score,