mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 12:00:01 +00:00
Merge branch 'lcs' of github.com:GTAmodding/re3 into lcs
This commit is contained in:
commit
14a5144de7
|
@ -117,8 +117,8 @@ GetModelFromName(const char *name)
|
|||
char playername[32];
|
||||
|
||||
if(strncasecmp(name, "CSplay", 6) == 0 &&
|
||||
strncasecmp(CModelInfo::GetModelInfo(MI_PLAYER)->GetName(), "ig", 2) == 0){
|
||||
strcpy(playername, CModelInfo::GetModelInfo(MI_PLAYER)->GetName());
|
||||
strncasecmp(CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName(), "ig", 2) == 0){
|
||||
strcpy(playername, CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName());
|
||||
playername[0] = 'C';
|
||||
playername[1] = 'S';
|
||||
name = playername;
|
||||
|
@ -127,7 +127,7 @@ GetModelFromName(const char *name)
|
|||
for(i = 0; i < MODELINFOSIZE; i++){
|
||||
mi = CModelInfo::GetModelInfo(i);
|
||||
if(mi && mi->GetRwObject() && RwObjectGetType(mi->GetRwObject()) == rpCLUMP &&
|
||||
strcmpIgnoringDigits(mi->GetName(), name))
|
||||
strcmpIgnoringDigits(mi->GetModelName(), name))
|
||||
return mi;
|
||||
}
|
||||
return nil;
|
||||
|
@ -149,7 +149,7 @@ CAnimBlendAssocGroup::CreateAssociations(const char *name)
|
|||
CAnimBlendHierarchy *anim = CAnimManager::GetAnimation(animBlock->firstIndex + i);
|
||||
CBaseModelInfo *model = GetModelFromName(anim->name);
|
||||
if(model){
|
||||
debug("Associated anim %s with model %s\n", anim->name, model->GetName());
|
||||
debug("Associated anim %s with model %s\n", anim->name, model->GetModelName());
|
||||
RpClump *clump = (RpClump*)model->CreateInstance();
|
||||
RpAnimBlendClumpInit(clump);
|
||||
assocList[i].Init(clump, anim);
|
||||
|
|
|
@ -383,7 +383,7 @@ CCutsceneMgr::CreateCutsceneObject(int modelId)
|
|||
CCutsceneObject *pCutsceneObject;
|
||||
|
||||
CStreaming::ImGonnaUseStreamingMemory();
|
||||
debug("Created cutscene object %s\n", CModelInfo::GetModelInfo(modelId)->GetName());
|
||||
debug("Created cutscene object %s\n", CModelInfo::GetModelInfo(modelId)->GetModelName());
|
||||
if (modelId >= MI_CUTOBJ01 && modelId <= MI_CUTOBJ05) {
|
||||
pModelInfo = CModelInfo::GetModelInfo(modelId);
|
||||
pColModel = &CTempColModels::ms_colModelCutObj[modelId - MI_CUTOBJ01];
|
||||
|
@ -569,7 +569,7 @@ CCutsceneMgr::AttachObjectToParent(CObject *pObject, CEntity *pAttachTo)
|
|||
((CCutsceneObject*)pObject)->m_pAttachmentObject = nil;
|
||||
((CCutsceneObject*)pObject)->m_pAttachTo = RpClumpGetFrame(pAttachTo->GetClump());
|
||||
|
||||
debug("Attach %s to %s\n", CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetName(), CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetName());
|
||||
debug("Attach %s to %s\n", CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(), CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -578,9 +578,9 @@ CCutsceneMgr::AttachObjectToFrame(CObject *pObject, CEntity *pAttachTo, const ch
|
|||
((CCutsceneObject*)pObject)->m_pAttachmentObject = nil;
|
||||
((CCutsceneObject*)pObject)->m_pAttachTo = RpAnimBlendClumpFindFrame(pAttachTo->GetClump(), frame)->frame;
|
||||
debug("Attach %s to component %s of %s\n",
|
||||
CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetName(),
|
||||
CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(),
|
||||
frame,
|
||||
CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetName());
|
||||
CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
|
||||
if (RwObjectGetType(pObject->m_rwObject) == rpCLUMP) {
|
||||
RpClump *clump = (RpClump*)pObject->m_rwObject;
|
||||
if (IsClumpSkinned(clump))
|
||||
|
@ -597,8 +597,8 @@ CCutsceneMgr::AttachObjectToBone(CObject *pObject, CObject *pAttachTo, int bone)
|
|||
((CCutsceneObject*)pObject)->m_pAttachmentObject = pAttachTo;
|
||||
((CCutsceneObject*)pObject)->m_pAttachTo = &matrixArray[id];
|
||||
debug("Attach %s to %s\n",
|
||||
CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetName(),
|
||||
CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetName());
|
||||
CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(),
|
||||
CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -2759,7 +2759,7 @@ void CTheScripts::UpdateObjectIndices()
|
|||
CBaseModelInfo* pModel = CModelInfo::GetModelInfo(j);
|
||||
if (!pModel)
|
||||
continue;
|
||||
strcpy(name, pModel->GetName());
|
||||
strcpy(name, pModel->GetModelName());
|
||||
#ifdef FIX_BUGS
|
||||
for (int k = 0; k < USED_OBJECT_NAME_LENGTH && name[k]; k++)
|
||||
#else
|
||||
|
|
|
@ -625,7 +625,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
|
|||
key[i] = tolower(key[i]);
|
||||
CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
|
||||
script_assert(pPed);
|
||||
UpdateCompareFlag(strcmp(key, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetName()) == 0);
|
||||
UpdateCompareFlag(strcmp(key, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetModelName()) == 0);
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_SET_PLAYER_CAN_DO_DRIVE_BY:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
@ -857,7 +857,7 @@ CFileLoader::LoadVehicleObject(const char *line)
|
|||
&normalSplay);
|
||||
|
||||
mi = CModelInfo::AddVehicleModel(id);
|
||||
mi->SetName(model);
|
||||
mi->SetModelName(model);
|
||||
mi->SetTexDictionary(txd);
|
||||
mi->SetAnimFile(animFile);
|
||||
for(p = gamename; *p; p++)
|
||||
|
@ -938,7 +938,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);
|
||||
|
@ -1208,7 +1208,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();
|
||||
|
@ -1441,7 +1441,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 {
|
||||
|
|
|
@ -6,8 +6,9 @@ enum eLevelName {
|
|||
LEVEL_INDUSTRIAL,
|
||||
LEVEL_COMMERCIAL,
|
||||
LEVEL_SUBURBAN,
|
||||
LEVEL_UNDERGROUND,
|
||||
|
||||
NUM_LEVELS // LCS: should be 5 eventually...
|
||||
NUM_LEVELS
|
||||
};
|
||||
|
||||
enum eAreaName {
|
||||
|
|
110
src/core/KeyGen.cpp
Normal file
110
src/core/KeyGen.cpp
Normal file
|
@ -0,0 +1,110 @@
|
|||
#include "common.h"
|
||||
#include "KeyGen.h"
|
||||
#if defined _WIN32 && !defined __MINGW32__
|
||||
#include "ctype.h"
|
||||
#else
|
||||
#include <cwctype>
|
||||
#endif
|
||||
|
||||
uint32 CKeyGen::keyTable[256] =
|
||||
{
|
||||
0, 0x77073096, 0xEE0E612C, 0x990951BA,
|
||||
0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
|
||||
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
|
||||
0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
|
||||
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
|
||||
0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
|
||||
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
|
||||
0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
|
||||
0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
|
||||
0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
|
||||
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
|
||||
0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
|
||||
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
|
||||
0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
|
||||
0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
|
||||
0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
|
||||
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
|
||||
0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
|
||||
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
|
||||
0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
|
||||
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
|
||||
0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
|
||||
0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
|
||||
0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
|
||||
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
|
||||
0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
|
||||
0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
|
||||
0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
|
||||
0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
|
||||
0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
|
||||
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
|
||||
0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
|
||||
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
|
||||
0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
|
||||
0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
|
||||
0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
|
||||
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
|
||||
0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
|
||||
0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
|
||||
0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
|
||||
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
|
||||
0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
|
||||
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
|
||||
0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
|
||||
0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
|
||||
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
|
||||
0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
|
||||
0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
|
||||
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
|
||||
0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
|
||||
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
|
||||
0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
|
||||
0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
|
||||
0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
|
||||
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
|
||||
0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
|
||||
0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
|
||||
0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
|
||||
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
|
||||
0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
|
||||
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
|
||||
0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
|
||||
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
|
||||
0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
|
||||
};
|
||||
|
||||
uint32
|
||||
CKeyGen::GetKey(const char *str, int size)
|
||||
{
|
||||
uint32 key = 0xffffffff;
|
||||
for (int i = 0; i < size; i++)
|
||||
key = keyTable[(key ^ str[i]) & 0xFF] ^ (key >> 8);
|
||||
return key;
|
||||
}
|
||||
|
||||
uint32
|
||||
CKeyGen::GetKey(const char *str)
|
||||
{
|
||||
uint32 key = 0xffffffff;
|
||||
while(*str != '\0')
|
||||
key = keyTable[(key ^ *(str++)) & 0xFF] ^ (key >> 8);
|
||||
return key;
|
||||
}
|
||||
|
||||
uint32
|
||||
CKeyGen::GetUppercaseKey(const char *str)
|
||||
{
|
||||
uint32 key = 0xffffffff;
|
||||
while (*str != '\0')
|
||||
key = keyTable[(key ^ toupper(*(str++))) & 0xFF] ^ (key >> 8);
|
||||
return key;
|
||||
}
|
||||
|
||||
uint32
|
||||
CKeyGen::AppendStringToKey(uint32 key, const char *str)
|
||||
{
|
||||
while (*str != '\0')
|
||||
key = keyTable[(key ^ *(str++)) & 0xFF] ^ (key >> 8);
|
||||
return key;
|
||||
}
|
11
src/core/KeyGen.h
Normal file
11
src/core/KeyGen.h
Normal file
|
@ -0,0 +1,11 @@
|
|||
#pragma once
|
||||
|
||||
class CKeyGen
|
||||
{
|
||||
static uint32 keyTable[256];
|
||||
public:
|
||||
static uint32 GetKey(const char *str, int size);
|
||||
static uint32 GetKey(const char *str);
|
||||
static uint32 GetUppercaseKey(const char *str);
|
||||
static uint32 AppendStringToKey(uint32 key, const char *str);
|
||||
};
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -497,7 +497,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)
|
||||
|
@ -592,7 +592,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);
|
||||
|
@ -1009,7 +1009,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];
|
||||
|
@ -1017,7 +1017,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;
|
||||
|
@ -1042,8 +1042,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)){
|
||||
|
@ -1842,11 +1842,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;
|
||||
|
@ -3242,7 +3242,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);
|
||||
|
|
|
@ -626,7 +626,7 @@ CEntity::SetupBigBuilding(void)
|
|||
if(mi->m_lodDistances[0] > 2500.0f || mi->m_ignoreDrawDist)
|
||||
m_level = LEVEL_GENERIC;
|
||||
else if(m_level == LEVEL_GENERIC)
|
||||
printf("%s isn't in a level\n", mi->GetName());
|
||||
printf("%s isn't in a level\n", mi->GetModelName());
|
||||
}
|
||||
|
||||
float WindTabel[] = {
|
||||
|
|
36
src/leeds/base/relocatableChunk.cpp
Normal file
36
src/leeds/base/relocatableChunk.cpp
Normal file
|
@ -0,0 +1,36 @@
|
|||
#include "common.h"
|
||||
#include "relocatableChunk.h"
|
||||
|
||||
namespace base
|
||||
{
|
||||
// TODO(LCS): add actual code (all of these are stubs)
|
||||
|
||||
void* cRelocatableChunk::Load(void* data, bool bShrink) { return nil; }
|
||||
void* cRelocatableChunk::Load(const char* name, bool bShrink) { return nil; }
|
||||
void cRelocatableChunk::Fixup(const sChunkHeader& header, void* data) {}
|
||||
void cRelocatableChunk::Fixup(void* data) {}
|
||||
void* cRelocatableChunk::Shrink(const sChunkHeader& header, void* data) { return nil; }
|
||||
void* cRelocatableChunk::Shrink(void* data) { return nil; }
|
||||
|
||||
cRelocatableChunkClassInfo::cRelocatableChunkClassInfo(const char* class_name, const void* pVmt, int size) {}
|
||||
|
||||
cRelocatableChunkWriter::cRelocatableChunkWriter() {}
|
||||
cRelocatableChunkWriter::~cRelocatableChunkWriter() {}
|
||||
|
||||
void cRelocatableChunkWriter::AddPatch(void* addr) {}
|
||||
void cRelocatableChunkWriter::AddPatchWithInfo(const char* str, int unk, void* addr) {}
|
||||
void cRelocatableChunkWriter::AllocateRaw(void* addr, uint32 size, uint32 align, bool a5, bool a6) {}
|
||||
|
||||
void cRelocatableChunkWriter::Clear() {}
|
||||
void cRelocatableChunkWriter::Class(void* ptr, const cRelocatableChunkClassInfo& classInfo) {}
|
||||
void cRelocatableChunkWriter::DebugFileLine(void*) {}
|
||||
|
||||
void cRelocatableChunkWriter::PatchFunc(void* ptr) {}
|
||||
|
||||
bool cRelocatableChunkWriter::IsAllocated(void* addr) { return false; }
|
||||
|
||||
void cRelocatableChunkWriter::Reserve(int, int) {}
|
||||
|
||||
void cRelocatableChunkWriter::Save(const char* filename, uint32 a3, uint32 a4, bool a5) {}
|
||||
void cRelocatableChunkWriter::Save(void* file, uint32 a3, uint32 a4, bool a5, sChunkHeader* pHeader) {}
|
||||
};
|
51
src/leeds/base/relocatableChunk.h
Normal file
51
src/leeds/base/relocatableChunk.h
Normal file
|
@ -0,0 +1,51 @@
|
|||
#pragma once
|
||||
|
||||
namespace base
|
||||
{
|
||||
// TODO(LCS): add actual struct fields
|
||||
|
||||
struct sChunkHeader;
|
||||
struct sDataBlock;
|
||||
struct sFileLine;
|
||||
|
||||
class cRelocatableChunk
|
||||
{
|
||||
public:
|
||||
void* Load(void* data, bool bShrink);
|
||||
void* Load(const char* name, bool bShrink);
|
||||
void Fixup(const sChunkHeader& header, void* data);
|
||||
void Fixup(void* data);
|
||||
void* Shrink(const sChunkHeader& header, void* data);
|
||||
void* Shrink(void* data);
|
||||
};
|
||||
|
||||
class cRelocatableChunkClassInfo
|
||||
{
|
||||
public:
|
||||
cRelocatableChunkClassInfo(const char* class_name, const void* pVmt, int size);
|
||||
};
|
||||
|
||||
class cRelocatableChunkWriter
|
||||
{
|
||||
public:
|
||||
cRelocatableChunkWriter();
|
||||
~cRelocatableChunkWriter();
|
||||
|
||||
void AddPatch(void* addr);
|
||||
void AddPatchWithInfo(const char* str, int unk, void* addr);
|
||||
void AllocateRaw(void* addr, uint32 size, uint32 align, bool a5 = false, bool a6 = false);
|
||||
|
||||
void Clear();
|
||||
void Class(void* ptr, const cRelocatableChunkClassInfo& classInfo);
|
||||
void DebugFileLine(void*);
|
||||
|
||||
void PatchFunc(void* ptr);
|
||||
|
||||
bool IsAllocated(void* addr);
|
||||
|
||||
void Reserve(int, int);
|
||||
|
||||
void Save(const char* filename, uint32 a3, uint32 a4, bool a5);
|
||||
void Save(void* file, uint32 a3, uint32 a4, bool a5, sChunkHeader* pHeader);
|
||||
};
|
||||
};
|
|
@ -50,8 +50,8 @@ public:
|
|||
bool IsBuilding(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; }
|
||||
bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME || m_type == MITYPE_WEAPON; }
|
||||
bool IsClump(void) { return m_type == MITYPE_CLUMP || m_type == MITYPE_PED || m_type == MITYPE_VEHICLE; }
|
||||
char *GetName(void) { return m_name; }
|
||||
void SetName(const char *name) { strncpy(m_name, name, MAX_MODEL_NAME); }
|
||||
char *GetModelName(void) { return m_name; }
|
||||
void SetModelName(const char *name) { strncpy(m_name, name, MAX_MODEL_NAME); }
|
||||
void SetColModel(CColModel *col, bool owns = false){
|
||||
m_colModel = col; m_bOwnsColModel = owns; }
|
||||
CColModel *GetColModel(void) { return m_colModel; }
|
||||
|
|
|
@ -189,7 +189,7 @@ CModelInfo::GetModelInfo(const char *name, int *id)
|
|||
CBaseModelInfo *modelinfo;
|
||||
for(int i = 0; i < MODELINFOSIZE; i++){
|
||||
modelinfo = CModelInfo::ms_modelInfoPtrs[i];
|
||||
if(modelinfo && !CGeneral::faststricmp(modelinfo->GetName(), name)){
|
||||
if(modelinfo && !CGeneral::faststricmp(modelinfo->GetModelName(), name)){
|
||||
if(id)
|
||||
*id = i;
|
||||
return modelinfo;
|
||||
|
@ -207,7 +207,7 @@ CModelInfo::GetModelInfo(const char *name, int minIndex, int maxIndex)
|
|||
CBaseModelInfo *modelinfo;
|
||||
for(int i = minIndex; i <= maxIndex; i++){
|
||||
modelinfo = CModelInfo::ms_modelInfoPtrs[i];
|
||||
if(modelinfo && !CGeneral::faststricmp(modelinfo->GetName(), name))
|
||||
if(modelinfo && !CGeneral::faststricmp(modelinfo->GetModelName(), name))
|
||||
return modelinfo;
|
||||
}
|
||||
return nil;
|
||||
|
|
|
@ -48,7 +48,7 @@ CPedModelInfo::SetClump(RpClump *clump)
|
|||
if(m_hitColModel == nil)
|
||||
CreateHitColModelSkinned(clump);
|
||||
RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPedCB);
|
||||
if(strcmp(GetName(), "player") == 0)
|
||||
if(strcmp(GetModelName(), "player") == 0)
|
||||
RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
|
||||
}
|
||||
|
||||
|
|
|
@ -167,7 +167,7 @@ CSimpleModelInfo::FindRelatedModel(int32 minID, int32 maxID)
|
|||
for(i = minID; i <= maxID; i++){
|
||||
mi = CModelInfo::GetModelInfo(i);
|
||||
if(mi && mi != this &&
|
||||
!CGeneral::faststrcmp(GetName()+3, mi->GetName()+3)){
|
||||
!CGeneral::faststrcmp(GetModelName()+3, mi->GetModelName()+3)){
|
||||
assert(mi->IsSimple());
|
||||
this->SetRelatedModel((CSimpleModelInfo*)mi);
|
||||
return;
|
||||
|
@ -189,7 +189,7 @@ CSimpleModelInfo::SetupBigBuilding(int32 minID, int32 maxID)
|
|||
m_lodDistances[2] = related->GetLargestLodDistance()/TheCamera.LODDistMultiplier;
|
||||
if(m_drawLast){
|
||||
m_drawLast = false;
|
||||
debug("%s was draw last\n", GetName());
|
||||
debug("%s was draw last\n", GetModelName());
|
||||
}
|
||||
}else
|
||||
m_lodDistances[2] = NEAR_DRAW_DIST;
|
||||
|
|
|
@ -11,7 +11,7 @@ CTimeModelInfo::FindOtherTimeModel(void)
|
|||
char *p;
|
||||
int i;
|
||||
|
||||
strcpy(name, GetName());
|
||||
strcpy(name, GetModelName());
|
||||
// change _nt to _dy
|
||||
if(p = strstr(name, "_nt"))
|
||||
strncpy(p, "_dy", 4);
|
||||
|
@ -24,7 +24,7 @@ CTimeModelInfo::FindOtherTimeModel(void)
|
|||
for(i = 0; i < MODELINFOSIZE; i++){
|
||||
CBaseModelInfo *mi = CModelInfo::GetModelInfo(i);
|
||||
if (mi && mi->GetModelType() == MITYPE_TIME &&
|
||||
!CGeneral::faststrncmp(name, mi->GetName(), MAX_MODEL_NAME)){
|
||||
!CGeneral::faststrncmp(name, mi->GetModelName(), MAX_MODEL_NAME)){
|
||||
m_otherTimeModelID = i;
|
||||
return (CTimeModelInfo*)mi;
|
||||
}
|
||||
|
|
|
@ -481,7 +481,7 @@ void CHud::Draw()
|
|||
CBaseModelInfo *weaponModel = CModelInfo::GetModelInfo(weaponInfo->m_nModelId);
|
||||
RwTexDictionary *weaponTxd = CTxdStore::GetSlot(weaponModel->GetTxdSlot())->texDict;
|
||||
if (weaponTxd) {
|
||||
RwTexture *weaponIcon = RwTexDictionaryFindNamedTexture(weaponTxd, weaponModel->GetName());
|
||||
RwTexture *weaponIcon = RwTexDictionaryFindNamedTexture(weaponTxd, weaponModel->GetModelName());
|
||||
if (weaponIcon) {
|
||||
RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
|
||||
#ifndef FIX_BUGS
|
||||
|
|
|
@ -5615,7 +5615,7 @@ CAutomobile::SetBumperDamage(int32 component, ePanels panel, bool noFlyingCompon
|
|||
int status = Damage.GetPanelStatus(panel);
|
||||
if(m_aCarNodes[component] == nil){
|
||||
printf("Trying to damage component %d of %s\n",
|
||||
component, CModelInfo::GetModelInfo(GetModelIndex())->GetName());
|
||||
component, CModelInfo::GetModelInfo(GetModelIndex())->GetModelName());
|
||||
return;
|
||||
}
|
||||
if(status == PANEL_STATUS_SMASHED1){
|
||||
|
@ -5635,7 +5635,7 @@ CAutomobile::SetDoorDamage(int32 component, eDoors door, bool noFlyingComponents
|
|||
int status = Damage.GetDoorStatus(door);
|
||||
if(m_aCarNodes[component] == nil){
|
||||
printf("Trying to damage component %d of %s\n",
|
||||
component, CModelInfo::GetModelInfo(GetModelIndex())->GetName());
|
||||
component, CModelInfo::GetModelInfo(GetModelIndex())->GetModelName());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue