comparison src/lumpdir.cc @ 93:5652866f31eb

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 06 Oct 2014 00:33:26 +0300
parents 99242b34e6dc
children
comparison
equal deleted inserted replaced
92:d65d262bbc32 93:5652866f31eb
166 break; 166 break;
167 } 167 }
168 // Ignore inner labels (X[123]_START, X[123]_END) 168 // Ignore inner labels (X[123]_START, X[123]_END)
169 if (dir->dir.start == 0 || dir->dir.size == 0) 169 if (dir->dir.start == 0 || dir->dir.size == 0)
170 { 170 {
171 if (!(toupper(dir->dir.name[0]) == label 171 if (!(toupper(dir->dir.name[0]) == label &&
172 && (dir->dir.name[1] == '1' 172 (dir->dir.name[1] == '1' || dir->dir.name[1] == '2' || dir->dir.name[1] == '3')
173 || dir->dir.name[1] == '2' 173 && dir->dir.name[2] == '_' &&
174 || dir->dir.name[1] == '3')
175 && dir->dir.name[2] == '_'
176 &&
177 (!y_strnicmp(dir->dir.name + 3, "START", WAD_NAME - 3) 174 (!y_strnicmp(dir->dir.name + 3, "START", WAD_NAME - 3)
178 || !y_strnicmp(dir->dir.name + 3, "END", 175 || !y_strnicmp(dir->dir.name + 3, "END",
179 WAD_NAME - 3)))) 176 WAD_NAME - 3))))
180 { 177 {
181 warn("%.128s: unexpected label \"%.*s\" in %s group\n", 178 warn("%.128s: unexpected label \"%.*s\" in %s group\n",