Skip to content

Commit 0e03a42

Browse files
qaisjpqaisjp
authored
Revert "Add engineSet/GetModelTime (#752)" (#1588)
This reverts commit 429c0b7.
1 parent c5ebd7f commit 0e03a42

File tree

10 files changed

+1
-142
lines changed

10 files changed

+1
-142
lines changed

‎Client/game_sa/CGameSA.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -836,11 +836,6 @@ void CGameSA::ResetModelLodDistances()
836836
CModelInfoSA::StaticResetLodDistances();
837837
}
838838

839-
void CGameSA::ResetModelTimes()
840-
{
841-
CModelInfoSA::StaticResetModelTimes();
842-
}
843-
844839
void CGameSA::ResetAlphaTransparencies()
845840
{
846841
CModelInfoSA::StaticResetAlphaTransparencies();

‎Client/game_sa/CGameSA.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ class CGameSA : public CGame
417417
void ResetModelLodDistances();
418418
void ResetAlphaTransparencies();
419419
void DisableVSync();
420-
void ResetModelTimes();
421420

422421
void OnPedContextChange(CPed* pPedContext);
423422
CPed* GetPedContext();

‎Client/game_sa/CModelInfoSA.cpp

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ std::map<unsigned short, int> CModelInfo
2020
std::map<DWORD, float> CModelInfoSA::ms_ModelDefaultLodDistanceMap;
2121
std::map<DWORD, BYTE> CModelInfoSA::ms_ModelDefaultAlphaTransparencyMap;
2222
std::unordered_map<std::uint32_t, std::map<eVehicleDummies, CVector>> CModelInfoSA::ms_ModelDefaultDummiesPosition;
23-
std::map<TimeInfo*, TimeInfo*> CModelInfoSA::ms_ModelDefaultModelTimeInfo;
2423
std::unordered_map<DWORD, unsigned short> CModelInfoSA::ms_OriginalObjectPropertiesGroups;
2524

2625
CModelInfoSA::CModelInfoSA()
@@ -563,51 +562,6 @@ float CModelInfoSA::GetLODDistance()
563562
return 0.0f;
564563
}
565564

566-
bool CModelInfoSA::SetTime(char cHourOn, char cHourOff)
567-
{
568-
m_pInterface = ppModelInfo[m_dwModelID];
569-
if (!m_pInterface)
570-
return false;
571-
572-
TimeInfo* pTime = ((TimeInfo*(*)(void))m_pInterface->VFTBL->GetTimeInfo)();
573-
if (!pTime)
574-
return false;
575-
576-
if (!MapContains(ms_ModelDefaultModelTimeInfo, pTime))
577-
MapSet(ms_ModelDefaultModelTimeInfo, pTime, new TimeInfo(pTime->m_nTimeOn, pTime->m_nTimeOff, pTime->m_wOtherTimeModel));
578-
579-
pTime->m_nTimeOn = cHourOn;
580-
pTime->m_nTimeOff = cHourOff;
581-
return true;
582-
}
583-
584-
bool CModelInfoSA::GetTime(char& cHourOn, char& cHourOff)
585-
{
586-
m_pInterface = ppModelInfo[m_dwModelID];
587-
if (!m_pInterface)
588-
return false;
589-
590-
TimeInfo* time = ((TimeInfo*(*)(void))m_pInterface->VFTBL->GetTimeInfo)();
591-
if (!time)
592-
return false;
593-
594-
cHourOn = time->m_nTimeOn;
595-
cHourOff = time->m_nTimeOff;
596-
return true;
597-
}
598-
599-
void CModelInfoSA::StaticResetModelTimes()
600-
{
601-
// Restore default values
602-
for (std::map<TimeInfo*, TimeInfo*>::const_iterator iter = ms_ModelDefaultModelTimeInfo.begin(); iter != ms_ModelDefaultModelTimeInfo.end(); ++iter)
603-
{
604-
iter->first->m_nTimeOn = iter->second->m_nTimeOn;
605-
iter->first->m_nTimeOff = iter->second->m_nTimeOff;
606-
}
607-
608-
ms_ModelDefaultModelTimeInfo.clear();
609-
}
610-
611565
float CModelInfoSA::GetOriginalLODDistance()
612566
{
613567
// Return default LOD distance value (if doesn't exist, LOD distance hasn't been changed)

‎Client/game_sa/CModelInfoSA.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ class CModelInfoSA : public CModelInfo
268268
static std::map<DWORD, float> ms_ModelDefaultLodDistanceMap;
269269
static std::map<DWORD, BYTE> ms_ModelDefaultAlphaTransparencyMap;
270270
static std::unordered_map<std::uint32_t, std::map<eVehicleDummies, CVector>> ms_ModelDefaultDummiesPosition;
271-
static std::map<TimeInfo*, TimeInfo*> ms_ModelDefaultModelTimeInfo;
272271
static std::unordered_map<DWORD, unsigned short> ms_OriginalObjectPropertiesGroups;
273272
bool m_bAddedRefForCollision;
274273
SVehicleSupportedUpgrades m_ModelSupportedUpgrades;
@@ -320,9 +319,6 @@ class CModelInfoSA : public CModelInfo
320319
void RestreamIPL();
321320
static void StaticFlushPendingRestreamIPL();
322321
static void StaticSetHooks();
323-
bool GetTime(char& cHourOn, char& cHourOff);
324-
bool SetTime(char cHourOn, char cHourOff);
325-
static void StaticResetModelTimes();
326322

327323
void SetAlphaTransparencyEnabled(BOOL bEnabled);
328324
bool IsAlphaTransparencyEnabled();

‎Client/mods/deathmatch/logic/CClientGame.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3560,7 +3560,6 @@ void CClientGame::Event_OnIngame()
35603560

35613561
g_pGame->ResetModelLodDistances();
35623562
g_pGame->ResetAlphaTransparencies();
3563-
g_pGame->ResetModelTimes();
35643563

35653564
// Make sure we can access all areas
35663565
g_pGame->GetStats()->ModifyStat(CITIES_PASSED, 2.0);

‎Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ void CLuaEngineDefs::LoadFunctions()
3737
{"engineGetModelIDFromName", EngineGetModelIDFromName},
3838
{"engineGetModelTextureNames", EngineGetModelTextureNames},
3939
{"engineGetVisibleTextureNames", EngineGetVisibleTextureNames},
40-
{"engineSetModelVisibleTime", EngineSetModelVisibleTime},
41-
{"engineGetModelVisibleTime", EngineGetModelVisibleTime},
4240
{"engineGetModelTextures", EngineGetModelTextures},
4341
{"engineGetSurfaceProperties", EngineGetSurfaceProperties},
4442
{"engineSetSurfaceProperties", EngineSetSurfaceProperties},
@@ -72,15 +70,13 @@ void CLuaEngineDefs::AddClass(lua_State* luaVM)
7270
lua_classfunction(luaVM, "setAsynchronousLoading", "engineSetAsynchronousLoading");
7371
lua_classfunction(luaVM, "setModelLODDistance", "engineSetModelLODDistance");
7472
lua_classfunction(luaVM, "resetModelLODDistance", "engineResetModelLODDistance");
75-
lua_classfunction(luaVM, "setModelVisibleTime", "engineSetModelVisibleTime");
7673

7774
lua_classfunction(luaVM, "getVisibleTextureNames", "engineGetVisibleTextureNames");
7875
lua_classfunction(luaVM, "getModelLODDistance", "engineGetModelLODDistance");
7976
lua_classfunction(luaVM, "getModelTextureNames", "engineGetModelTextureNames");
8077
lua_classfunction(luaVM, "getModelTextures", "engineGetModelTextures");
8178
lua_classfunction(luaVM, "getModelIDFromName", "engineGetModelIDFromName");
8279
lua_classfunction(luaVM, "getModelNameFromID", "engineGetModelNameFromID");
83-
lua_classfunction(luaVM, "getModelVisibleTime", "engineGetModelVisibleTime");
8480
lua_classfunction(luaVM, "getModelPhysicalPropertiesGroup", "engineGetModelPhysicalPropertiesGroup");
8581
lua_classfunction(luaVM, "setModelPhysicalPropertiesGroup", "engineSetModelPhysicalPropertiesGroup");
8682
lua_classfunction(luaVM, "restoreModelPhysicalPropertiesGroup", "engineRestoreModelPhysicalPropertiesGroup");
@@ -775,7 +771,7 @@ int CLuaEngineDefs::EngineResetModelLODDistance(lua_State* luaVM)
775771

776772
if (argStream.HasErrors())
777773
return luaL_error(luaVM, argStream.GetFullErrorMessage());
778-
774+
779775
unsigned short usModelID = CModelNames::ResolveModelID(strModel);
780776
CModelInfo* pModelInfo = g_pGame->GetModelInfo(usModelID);
781777
if (pModelInfo)
@@ -1099,74 +1095,6 @@ int CLuaEngineDefs::EngineGetVisibleTextureNames(lua_State* luaVM)
10991095
return 1;
11001096
}
11011097

1102-
int CLuaEngineDefs::EngineSetModelVisibleTime(lua_State* luaVM)
1103-
{
1104-
// bool engineSetModelVisibleTime ( int/string modelID, int hourOn, int hourOff )
1105-
SString strModelId;
1106-
char cHourOn,cHourOff;
1107-
CScriptArgReader argStream(luaVM);
1108-
argStream.ReadString(strModelId);
1109-
argStream.ReadNumber(cHourOn);
1110-
argStream.ReadNumber(cHourOff);
1111-
1112-
if (!argStream.HasErrors())
1113-
{
1114-
ushort usModelID = CModelNames::ResolveModelID(strModelId);
1115-
CModelInfo* pModelInfo = g_pGame->GetModelInfo(usModelID);
1116-
if (pModelInfo)
1117-
{
1118-
if (cHourOn >= 0 && cHourOn <= 24 && cHourOff >= 0 && cHourOff <= 24)
1119-
{
1120-
lua_pushboolean(luaVM, pModelInfo->SetTime(cHourOn, cHourOff));
1121-
return 1;
1122-
}
1123-
}
1124-
}
1125-
else
1126-
luaL_error(luaVM, argStream.GetFullErrorMessage());
1127-
1128-
// Failed
1129-
lua_pushboolean(luaVM, false);
1130-
return 1;
1131-
}
1132-
1133-
int CLuaEngineDefs::EngineGetModelVisibleTime(lua_State* luaVM)
1134-
{
1135-
// int, int engineGetModelVisibleTime ( int/string modelID )
1136-
SString strModelId;
1137-
1138-
CScriptArgReader argStream(luaVM);
1139-
argStream.ReadString(strModelId);
1140-
1141-
if (!argStream.HasErrors())
1142-
{
1143-
ushort usModelID = CModelNames::ResolveModelID(strModelId);
1144-
CModelInfo* pModelInfo = g_pGame->GetModelInfo(usModelID);
1145-
if (pModelInfo)
1146-
{
1147-
char cHourOn, cHourOff;
1148-
if (pModelInfo->GetTime(cHourOn, cHourOff))
1149-
{
1150-
lua_pushnumber(luaVM, cHourOn);
1151-
lua_pushnumber(luaVM, cHourOff);
1152-
return 2;
1153-
}
1154-
else // Model is incompatible, don't let confuse user.
1155-
{
1156-
lua_pushnumber(luaVM, 0);
1157-
lua_pushnumber(luaVM, 24);
1158-
return 2;
1159-
}
1160-
}
1161-
}
1162-
else
1163-
luaL_error(luaVM, argStream.GetFullErrorMessage());
1164-
1165-
// Failed
1166-
lua_pushboolean(luaVM, false);
1167-
return 1;
1168-
}
1169-
11701098
int CLuaEngineDefs::EngineGetModelTextures(lua_State* luaVM)
11711099
{
11721100
// table engineGetModelTextures ( string/int modelName/modelID, string/table textureNames )

‎Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ class CLuaEngineDefs : public CLuaDefs
4747
LUA_DECLARE(EngineGetModelIDFromName);
4848
LUA_DECLARE(EngineGetModelTextureNames);
4949
LUA_DECLARE(EngineGetVisibleTextureNames);
50-
LUA_DECLARE(EngineSetModelVisibleTime);
51-
LUA_DECLARE(EngineGetModelVisibleTime);
5250
LUA_DECLARE(EngineGetModelTextures);
5351
LUA_DECLARE(EngineSetSurfaceProperties);
5452
LUA_DECLARE(EngineGetSurfaceProperties);

‎Client/sdk/game/CGame.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ class __declspec(novtable) CGame
239239
virtual void ResetModelLodDistances() = 0;
240240
virtual void ResetAlphaTransparencies() = 0;
241241
virtual void DisableVSync() = 0;
242-
virtual void ResetModelTimes() = 0;
243242

244243
virtual void OnPedContextChange(CPed* pPedContext) = 0;
245244
virtual CPed* GetPedContext() = 0;

‎Client/sdk/game/CModelInfo.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ class CModelInfo
129129
virtual float GetOriginalLODDistance() = 0;
130130
virtual void SetLODDistance(float fDistance, bool bOverrideMaxDistance = false) = 0;
131131
virtual void RestreamIPL() = 0;
132-
virtual bool GetTime(char& hourOn, char& hourOff) = 0;
133-
virtual bool SetTime(char hourOn, char hourOff) = 0;
134132

135133
virtual void ModelAddRef(EModelRequestType requestType, const char* szTag /* = NULL*/) = 0;
136134
virtual void RemoveRef(bool bRemoveExtraGTARef = false) = 0;

‎Client/sdk/game/RenderWare.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,3 @@ struct RwError
424424
{
425425
int err1, err2;
426426
};
427-
428-
struct TimeInfo {
429-
TimeInfo(char timeOn, char timeOff, short OtherTimeModel) : m_nTimeOn(timeOn), m_nTimeOff(timeOff), m_wOtherTimeModel(OtherTimeModel) {};
430-
char m_nTimeOn;
431-
char m_nTimeOff;
432-
short m_wOtherTimeModel;
433-
};

0 commit comments

Comments
 (0)