Cube  Diff

Differences From Artifact [da461b7a90]:

To Artifact [656fe9791c]:


135
136
137
138
139
140
141
142
143


144
145
146
147
148
149
150
135
136
137
138
139
140
141


142
143
144
145
146
147
148
149
150







-
-
+
+







}

void
draw_textf(OFConstantString *format, int left, int top, int gl_num, ...)
{
	va_list arguments;
	va_start(arguments, gl_num);
	OFString *str = [[OFString alloc] initWithFormat:format
	                                       arguments:arguments];
	OFString *str = [[OFString alloc] initWithFormat: format
	                                       arguments: arguments];
	va_end(arguments);
	draw_text(str, left, top, gl_num);
}

void
draw_text(OFString *string, int left, int top, int gl_num)
{
166
167
168
169
170
171
172
173
174
175
176




177
178
179
180
181
182
183
166
167
168
169
170
171
172




173
174
175
176
177
178
179
180
181
182
183







-
-
-
-
+
+
+
+








		if (c == '\t') {
			x = (x - left + PIXELTAB) / PIXELTAB * PIXELTAB + left;
			continue;
		}

		if (c == '\f') {
			[[OFColor colorWithRed:0.25f
					 green:1.0f
					  blue:0.5f
					 alpha:1.0f] cube_setAsGLColor];
			[[OFColor colorWithRed: 0.25f
					 green: 1.0f
					  blue: 0.5f
					 alpha: 1.0f] cube_setAsGLColor];
			continue;
		}

		if (c == ' ') {
			x += FONTH / 2;
			continue;
		}