summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/FileLoader.cpp20
-rw-r--r--src/core/Frontend.h4
-rw-r--r--src/core/Pools.cpp2
-rw-r--r--src/core/Streaming.cpp18
-rw-r--r--src/core/config.h3
5 files changed, 23 insertions, 24 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 9aaba611..b8201400 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -492,7 +492,7 @@ bool
CFileLoader::StartLoadClumpFile(RwStream *stream, uint32 id)
{
if(RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)){
- printf("Start loading %s\n", CModelInfo::GetModelInfo(id)->GetName());
+ printf("Start loading %s\n", CModelInfo::GetModelInfo(id)->GetModelName());
return RpClumpGtaStreamRead1(stream);
}else{
printf("FAILED\n");
@@ -506,7 +506,7 @@ CFileLoader::FinishLoadClumpFile(RwStream *stream, uint32 id)
RpClump *clump;
CClumpModelInfo *mi;
- printf("Finish loading %s\n", CModelInfo::GetModelInfo(id)->GetName());
+ printf("Finish loading %s\n", CModelInfo::GetModelInfo(id)->GetModelName());
clump = RpClumpGtaStreamRead2(stream);
if(clump){
@@ -739,7 +739,7 @@ CFileLoader::LoadObject(const char *line)
}
mi = CModelInfo::AddSimpleModel(id);
- mi->SetName(model);
+ mi->SetModelName(model);
mi->SetNumAtomics(numObjs);
mi->SetLodDistances(dist);
SetModelInfoFlags(mi, flags);
@@ -787,7 +787,7 @@ CFileLoader::LoadTimeObject(const char *line)
}
mi = CModelInfo::AddTimeModel(id);
- mi->SetName(model);
+ mi->SetModelName(model);
mi->SetNumAtomics(numObjs);
mi->SetLodDistances(dist);
SetModelInfoFlags(mi, flags);
@@ -813,7 +813,7 @@ CFileLoader::LoadWeaponObject(const char *line)
sscanf(line, "%d %s %s %s %d %f", &id, model, txd, animFile, &numObjs, &dist);
mi = CModelInfo::AddWeaponModel(id);
- mi->SetName(model);
+ mi->SetModelName(model);
mi->SetNumAtomics(1);
mi->m_lodDistances[0] = dist;
mi->SetTexDictionary(txd);
@@ -832,7 +832,7 @@ CFileLoader::LoadClumpObject(const char *line)
if(sscanf(line, "%d %s %s", &id, model, txd) == 3){
mi = CModelInfo::AddClumpModel(id);
- mi->SetName(model);
+ mi->SetModelName(model);
mi->SetTexDictionary(txd);
mi->SetColModel(&CTempColModels::ms_colModelBBox);
}
@@ -856,7 +856,7 @@ CFileLoader::LoadVehicleObject(const char *line)
&frequency, &level, &comprules, &misc, &wheelScale);
mi = CModelInfo::AddVehicleModel(id);
- mi->SetName(model);
+ mi->SetModelName(model);
mi->SetTexDictionary(txd);
mi->SetAnimFile(animFile);
for(p = gamename; *p; p++)
@@ -935,7 +935,7 @@ CFileLoader::LoadPedObject(const char *line)
animFile, &radio1, &radio2);
mi = CModelInfo::AddPedModel(id);
- mi->SetName(model);
+ mi->SetModelName(model);
mi->SetTexDictionary(txd);
mi->SetAnimFile(animFile);
mi->SetColModel(&CTempColModels::ms_colModelPed1);
@@ -1205,7 +1205,7 @@ CFileLoader::LoadObjectInstance(const char *line)
assert(mi->IsSimple());
if(!CStreaming::IsObjectInCdImage(id))
- debug("Not in cdimage %s\n", mi->GetName());
+ debug("Not in cdimage %s\n", mi->GetModelName());
angle = -RADTODEG(2.0f * acosf(angle));
xform = RwMatrixCreate();
@@ -1438,7 +1438,7 @@ CFileLoader::ReloadObject(const char *line)
#ifdef FIX_BUGS
mi &&
#endif
- mi->GetModelType() == MITYPE_SIMPLE && !strcmp(mi->GetName(), model) && mi->m_numAtomics == numObjs) {
+ mi->GetModelType() == MITYPE_SIMPLE && !strcmp(mi->GetModelName(), model) && mi->m_numAtomics == numObjs) {
mi->SetLodDistances(dist);
SetModelInfoFlags(mi, flags);
} else {
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index b27cccb5..4a812b05 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -661,8 +661,8 @@ public:
int32 m_nSelectedScreenMode;
#endif
#ifdef MULTISAMPLING
- static int8 m_nPrefsMSAALevel;
- static int8 m_nDisplayMSAALevel;
+ int8 m_nPrefsMSAALevel;
+ int8 m_nDisplayMSAALevel;
#endif
enum LANGUAGE
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index dfc7a82f..ee60f316 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -536,7 +536,7 @@ INITSAVEBUF
#endif
CopyToBuf(buf, CWanted::MaximumWantedLevel);
CopyToBuf(buf, CWanted::nMaximumWantedLevel);
- memcpy(buf, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetName(), MAX_MODEL_NAME);
+ memcpy(buf, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetModelName(), MAX_MODEL_NAME);
SkipSaveBuf(buf, MAX_MODEL_NAME);
}
}
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 8a75b636..ec0e8e93 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -482,7 +482,7 @@ GetObjectName(int streamId)
{
static char objname[32];
if(streamId < STREAM_OFFSET_TXD)
- sprintf(objname, "%s.dff", CModelInfo::GetModelInfo(streamId)->GetName());
+ sprintf(objname, "%s.dff", CModelInfo::GetModelInfo(streamId)->GetModelName());
else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL)
sprintf(objname, "%s.txd", CTxdStore::GetTxdName(streamId-STREAM_OFFSET_TXD));
else if(streamId >= STREAM_OFFSET_COL && streamId < STREAM_OFFSET_ANIM)
@@ -577,7 +577,7 @@ CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
}
if(!success){
- debug("Failed to load %s\n", CModelInfo::GetModelInfo(streamId)->GetName());
+ debug("Failed to load %s\n", CModelInfo::GetModelInfo(streamId)->GetModelName());
RemoveModel(streamId);
ReRequestModel(streamId);
RwStreamClose(stream, &mem);
@@ -990,7 +990,7 @@ CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flag
mi = CModelInfo::GetModelInfo(modelId);
if(strncasecmp("CSPlay", modelName, 6) == 0){
- char *curname = CModelInfo::GetModelInfo(MI_PLAYER)->GetName();
+ char *curname = CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName();
for(int i = 0; CSnames[i][0]; i++){
if(strcasecmp(curname, IGnames[i]) == 0){
modelName = CSnames[i];
@@ -998,7 +998,7 @@ CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flag
}
}
}
- if(!CGeneral::faststrcmp(mi->GetName(), modelName)){
+ if(!CGeneral::faststrcmp(mi->GetModelName(), modelName)){
// Already have the correct name, just request it
RequestModel(modelId, flags);
return;
@@ -1023,8 +1023,8 @@ CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flag
}
}
- strcpy(oldName, mi->GetName());
- mi->SetName(modelName);
+ strcpy(oldName, mi->GetModelName());
+ mi->SetModelName(modelName);
// What exactly is going on here?
if(CModelInfo::GetModelInfo(oldName, nil)){
@@ -1795,11 +1795,11 @@ CStreaming::StreamZoneModels(const CVector &pos)
int newMI = CPopulation::ms_pPedGroups[ms_currentPedGrp].models[j];
if(newMI != oldMI){
RequestModel(newMI, STREAMFLAGS_DEPENDENCY);
- debug("Request Ped %s\n", CModelInfo::GetModelInfo(newMI)->GetName());
+ debug("Request Ped %s\n", CModelInfo::GetModelInfo(newMI)->GetModelName());
if(ms_numPedsLoaded == MAXZONEPEDSLOADED){
SetModelIsDeletable(oldMI);
SetModelTxdIsDeletable(oldMI);
- debug("Remove Ped %s\n", CModelInfo::GetModelInfo(oldMI)->GetName());
+ debug("Remove Ped %s\n", CModelInfo::GetModelInfo(oldMI)->GetModelName());
}else
ms_numPedsLoaded++;
timeBeforeNextLoad = 300;
@@ -3195,7 +3195,7 @@ CStreaming::PrintStreamingBufferState()
sprintf(str, "txd %s, refs %d, size %dK, flags 0x%x", CTxdStore::GetTxdName(modelIndex - STREAM_OFFSET_TXD),
CTxdStore::GetNumRefs(modelIndex - STREAM_OFFSET_TXD), 2 * size, streamingInfo->m_flags);
else
- sprintf(str, "model %d,%s, refs%d, size%dK, flags%x", modelIndex, modelInfo->GetName(), modelInfo->GetNumRefs(), 2 * size,
+ sprintf(str, "model %d,%s, refs%d, size%dK, flags%x", modelIndex, modelInfo->GetModelName(), modelInfo->GetNumRefs(), 2 * size,
streamingInfo->m_flags);
AsciiToUnicode(str, wstr);
CFont::PrintString(24.0f, y, wstr);
diff --git a/src/core/config.h b/src/core/config.h
index 38ee9712..8e528a67 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -317,7 +317,7 @@ enum Config {
# define GRAPHICS_MENU_OPTIONS // otherwise Display settings will be scrollable
# define NO_ISLAND_LOADING // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
# define CUTSCENE_BORDERS_SWITCH
-//# define MULTISAMPLING // adds MSAA option
+# define MULTISAMPLING // adds MSAA option
# define INVERT_LOOK_FOR_PAD // enable the hidden option
# endif
#endif
@@ -387,7 +387,6 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
#ifdef LIBRW
// these are not supported with librw yet
-# undef MULTISAMPLING
#endif
// IMG
#define BIG_IMG // allows to read larger img files
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 23:53:45 +0100