-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathhelp-overlay
200 lines (166 loc) · 6.29 KB
/
help-overlay
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
diff --git a/gameSource/LivingLifePage.cpp b/gameSource/LivingLifePage.cpp
index a3b8067f7..819cfd4f2 100644
--- a/gameSource/LivingLifePage.cpp
+++ b/gameSource/LivingLifePage.cpp
@@ -4160,6 +4160,59 @@ LiveObject *LivingLifePage::getLiveObject( int inID ) {
}
+void drawHelpInteractionKeys( doublePair messagePos ) {
+ double lineSpacing = 30;
+ double indent = 60;
+ double columnWidth = 400;
+
+ char letters[2];
+ letters[1] = 0;
+
+ messagePos.x += columnWidth/2;
+ mainFont->drawString( "Actions at Cursor",
+ messagePos, alignCenter );
+ messagePos.x -= columnWidth/2;
+ messagePos.y -= lineSpacing;
+
+ for( int command = 0; command < IK_COUNT; command++ ) {
+ letters[0] = interactionKeys[command];
+ mainFont->drawString( letters,
+ messagePos, alignLeft );
+ messagePos.x += indent;
+ mainFontReview->drawString( interactionKeysHelp[command],
+ messagePos, alignLeft );
+ messagePos.x -= indent;
+ messagePos.y -= lineSpacing;
+ }
+ }
+
+
+void drawHelpMarkKeys( doublePair messagePos ) {
+ double lineSpacing = 30;
+ double indent = 60;
+
+ char letters[2];
+ letters[1] = 0;
+
+ letters[0] = playerMarkKey;
+ mainFont->drawString( letters,
+ messagePos, alignLeft );
+ messagePos.x += indent;
+ mainFontReview->drawString( "Mark Player",
+ messagePos, alignLeft );
+ messagePos.x -= indent;
+ messagePos.y -= lineSpacing;
+
+ letters[0] = playerUnmarkKey;
+ mainFont->drawString( letters,
+ messagePos, alignLeft );
+ messagePos.x += indent;
+ mainFontReview->drawString( "Unmark Player",
+ messagePos, alignLeft );
+ messagePos.x -= indent;
+ messagePos.y -= lineSpacing;
+ }
+
SimpleVector<char*> *splitLines( const char *inString,
double inMaxWidth ) {
diff --git a/gameSource/game.cpp b/gameSource/game.cpp
index f0421cc0f..977a142e6 100644
--- a/gameSource/game.cpp
+++ b/gameSource/game.cpp
@@ -951,43 +951,86 @@ void freeFrameDrawer() {
static void drawFrameNoUpdate( char inUpdate );
+void drawPauseEmotionKeys( doublePair messagePos ) {
+ double lineSpacing = 30;
+ char letters[2];
+ letters[1] = 0;
+
+ mainFont->drawString( "Alt+ or Ctrl+",
+ messagePos, alignCenter );
+ messagePos.y -= lineSpacing;
+
+ Emotion *e = getEmotion(0);
+ for( int index = 0; (e = getEmotion(index)) != NULL && e->triggerWord && index < 200; index++ ) {
+ if( e->triggerKey == 0) continue;
+ letters[0] = e->triggerKey;
+ mainFont->drawString( letters,
+ messagePos, alignLeft );
+ messagePos.y -= lineSpacing;
+ }
+ }
+
+void drawPauseSayKeys( doublePair messagePos ) {
+ double lineSpacing = 30;
+ double indent = 60;
+
+ mainFont->drawString( "F1",
+ messagePos, alignLeft );
+ messagePos.x += indent;
+ mainFontReview->drawString( "Close say without clearing",
+ messagePos, alignLeft );
+ messagePos.x -= indent;
+ messagePos.y -= lineSpacing;
+
+ mainFontReview->drawString( "Shift+Backspace Clear and close say",
+ messagePos, alignLeft );
+ messagePos.y -= lineSpacing;
+ }
+
+void drawHelpInteractionKeys( doublePair messagePos );
+void drawHelpMarkKeys( doublePair messagePos );
static void drawPauseScreen() {
double viewHeight = viewHeightFraction * viewWidth;
+ double rectWidth = viewHeight / 3;
+ double rectHeight = viewHeight / 2.2;
setDrawColor( 1, 1, 1, 0.5 * pauseScreenFade );
- drawSquare( lastScreenViewCenter, 1.05 * ( viewHeight / 3 ) );
+ drawRect( lastScreenViewCenter, 1.05 * rectWidth, 1.05 * rectHeight );
setDrawColor( 0.2, 0.2, 0.2, 0.85 * pauseScreenFade );
- drawSquare( lastScreenViewCenter, viewHeight / 3 );
+ drawRect( lastScreenViewCenter, rectWidth, rectHeight );
setDrawColor( 1, 1, 1, pauseScreenFade );
doublePair messagePos = lastScreenViewCenter;
- messagePos.y += 4.5 * (viewHeight / 15);
+ messagePos.y += 6.0 * (viewHeight / 15);
mainFont->drawString( translate( "pauseMessage1" ),
messagePos, alignCenter );
- messagePos.y -= 1.25 * (viewHeight / 15);
+ messagePos.y -= 1 * (viewHeight / 15);
mainFont->drawString( translate( "pauseMessage2" ),
messagePos, alignCenter );
if( currentGamePage == livingLifePage ) {
- doublePair drawPos = { -9, 0 };
+ doublePair drawPos = { -220, 140 };
drawPos = add( drawPos, lastScreenViewCenter );
- drawSprite( instructionsSprite, drawPos );
+ //drawSprite( instructionsSprite, drawPos );
+ drawHelpInteractionKeys( drawPos );
+ drawPos.y -= 400;
+ drawHelpMarkKeys( drawPos );
TextAlignment a = getMessageAlign();
@@ -1016,6 +1059,16 @@ static void drawPauseScreen() {
drawMessage( translate( "commandHintsA" ), drawPos, false,
pauseScreenFade );
+ drawPos.x += 100;
+ drawPos.y -= 52;
+ drawMessage( "F1:Pause say", drawPos, false, pauseScreenFade );
+ drawPos.y -= 100;
+ drawMessage( "Shift+Bksp## Cancel say", drawPos, false, pauseScreenFade );
+
+ drawPos.x += 100;
+ drawPos.y -= 70;
+ drawPauseEmotionKeys( drawPos );
+
drawPos = lastScreenViewCenter;
@@ -1040,7 +1093,7 @@ static void drawPauseScreen() {
setMessageAlign( alignLeft );
drawMessage( translate( "commandHintsB" ), drawPos, false,
pauseScreenFade );
-
+
setMessageAlign( a );
}
@@ -1247,11 +1300,7 @@ static void drawPauseScreen() {
messagePos = lastScreenViewCenter;
- messagePos.y -= 3.75 * ( viewHeight / 15 );
- //mainFont->drawString( translate( "pauseMessage3" ),
- // messagePos, alignCenter );
-
- messagePos.y -= 0.625 * (viewHeight / 15);
+ messagePos.y += 4 * ( viewHeight / 15 );
const char* quitMessageKey = "pauseMessage3";