mirror of
https://github.com/GTAmodding/re3.git
synced 2025-07-17 05:04:08 +00:00
Merge branch 'master' into miami
# Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp
This commit is contained in:
commit
7c2b9478d5
49 changed files with 146 additions and 61 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue