Merge remote-tracking branch 'upstream/miami' into miami

2020-05-13 17:55:12 +03:00
parent 81ea6f0258 7c2b9478d5
commit d426588496
91 changed files with 1563 additions and 445 deletions
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@ -783,7 +783,7 @@ CFileLoader::LoadClumpObject(const char *line)
 	char model[24], txd[24];
 	CClumpModelInfo *mi;

-	if(sscanf(line, "%d %s %s", &id, &model, &txd) == 3){
+	if(sscanf(line, "%d %s %s", &id, model, txd) == 3){
 		mi = CModelInfo::AddClumpModel(id);
 		mi->SetName(model);
 		mi->SetTexDictionary(txd);