Merge branch 'miami' into lcs

# Conflicts:
#	src/render/Timecycle.cpp
This commit is contained in:
Sergeanur
2021-01-08 20:24:43 +02:00
4 changed files with 13 additions and 14 deletions

View File

@ -228,7 +228,7 @@ CTimeCycle::Initialise(void)
for(h = 0; h < NUMHOURS; h++){
li = 0;
while(work_buff[bi] == '/' || work_buff[bi] == '\n' ||
work_buff[bi] == '\0' || work_buff[bi] == '\r'){
work_buff[bi] == '\0' || work_buff[bi] == ' ' || work_buff[bi] == '\r'){
while(work_buff[bi] != '\n' && work_buff[bi] != '\0' && work_buff[bi] != '\r')
bi++;
bi++;