1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 16:40:01 +00:00

CStreaming done, hopefully

This commit is contained in:
aap 2020-08-20 23:43:13 +02:00
parent 857cef776d
commit a6fe606ce6
9 changed files with 387 additions and 188 deletions

View file

@ -374,10 +374,10 @@ private:
static int32 GetNewUniqueScriptSphereIndex(int32 index); static int32 GetNewUniqueScriptSphereIndex(int32 index);
static void RemoveScriptSphere(int32 index); static void RemoveScriptSphere(int32 index);
static void RemoveScriptTextureDictionary(); static void RemoveScriptTextureDictionary();
public:
static void RemoveThisPed(CPed* pPed); static void RemoveThisPed(CPed* pPed);
#ifdef MISSION_SWITCHER #ifdef MISSION_SWITCHER
public:
static void SwitchToMission(int32 mission); static void SwitchToMission(int32 mission);
#endif #endif

View file

@ -616,10 +616,7 @@ void CGame::ShutDownForRestart(void)
CWorld::ClearForRestart(); CWorld::ClearForRestart();
CGameLogic::ClearShortCut(); CGameLogic::ClearShortCut();
CTimer::Shutdown(); CTimer::Shutdown();
CStreaming::FlushRequestList(); CStreaming::ReInit();
CStreaming::DeleteAllRwObjects();
CStreaming::RemoveAllUnusedModels();
CStreaming::ms_disableStreaming = false;
CRadar::RemoveRadarSections(); CRadar::RemoveRadarSections();
FrontEndMenuManager.UnloadTextures(); FrontEndMenuManager.UnloadTextures();
CParticleObject::RemoveAllExpireableParticleObjects(); CParticleObject::RemoveAllExpireableParticleObjects();

File diff suppressed because it is too large Load diff

View file

@ -93,6 +93,7 @@ public:
static CStreamingChannel ms_channel[2]; static CStreamingChannel ms_channel[2];
static int32 ms_channelError; static int32 ms_channelError;
static int32 ms_numVehiclesLoaded; static int32 ms_numVehiclesLoaded;
static int32 ms_numPedsLoaded;
static int32 ms_vehiclesLoaded[MAXVEHICLESLOADED]; static int32 ms_vehiclesLoaded[MAXVEHICLESLOADED];
static int32 ms_lastVehicleDeleted; static int32 ms_lastVehicleDeleted;
static bool ms_bIsPedFromPedGroupLoaded[NUMMODELSPERPEDGROUP]; static bool ms_bIsPedFromPedGroupLoaded[NUMMODELSPERPEDGROUP];
@ -110,6 +111,7 @@ public:
static void Init(void); static void Init(void);
static void Init2(void); static void Init2(void);
static void ReInit(void);
static void Shutdown(void); static void Shutdown(void);
static void Update(void); static void Update(void);
static void LoadCdDirectory(void); static void LoadCdDirectory(void);
@ -149,6 +151,7 @@ public:
static void RemoveAnim(int32 id) { RemoveModel(id + STREAM_OFFSET_ANIM); } static void RemoveAnim(int32 id) { RemoveModel(id + STREAM_OFFSET_ANIM); }
static void RemoveUnusedBuildings(eLevelName level); static void RemoveUnusedBuildings(eLevelName level);
static void RemoveBuildings(eLevelName level); static void RemoveBuildings(eLevelName level);
static void RemoveBuildingsNotInArea(int32 area);
static void RemoveUnusedBigBuildings(eLevelName level); static void RemoveUnusedBigBuildings(eLevelName level);
static void RemoveIslandsNotUsed(eLevelName level); static void RemoveIslandsNotUsed(eLevelName level);
static void RemoveBigBuildings(eLevelName level); static void RemoveBigBuildings(eLevelName level);
@ -156,6 +159,7 @@ public:
static bool RemoveLeastUsedModel(uint32 excludeMask); static bool RemoveLeastUsedModel(uint32 excludeMask);
static void RemoveAllUnusedModels(void); static void RemoveAllUnusedModels(void);
static void RemoveUnusedModelsInLoadedList(void); static void RemoveUnusedModelsInLoadedList(void);
static bool RemoveLoadedZoneModel(void);
static int32 GetAvailableVehicleSlot(void); static int32 GetAvailableVehicleSlot(void);
static bool IsTxdUsedByRequestedModels(int32 txdId); static bool IsTxdUsedByRequestedModels(int32 txdId);
static bool AreAnimsUsedByRequestedModels(int32 animId); static bool AreAnimsUsedByRequestedModels(int32 animId);
@ -187,9 +191,9 @@ public:
static void IHaveUsedStreamingMemory(void); static void IHaveUsedStreamingMemory(void);
static void UpdateMemoryUsed(void); static void UpdateMemoryUsed(void);
static void AddModelsToRequestList(const CVector &pos); static void AddModelsToRequestList(const CVector &pos, int32 flags);
static void ProcessEntitiesInSectorList(CPtrList &list, float x, float y, float xmin, float ymin, float xmax, float ymax); static void ProcessEntitiesInSectorList(CPtrList &list, float x, float y, float xmin, float ymin, float xmax, float ymax, int32 flags);
static void ProcessEntitiesInSectorList(CPtrList &list); static void ProcessEntitiesInSectorList(CPtrList &list, int32 flags);
static void DeleteFarAwayRwObjects(const CVector &pos); static void DeleteFarAwayRwObjects(const CVector &pos);
static void DeleteAllRwObjects(void); static void DeleteAllRwObjects(void);
static void DeleteRwObjectsAfterDeath(const CVector &pos); static void DeleteRwObjectsAfterDeath(const CVector &pos);

View file

@ -113,6 +113,7 @@ enum Config {
NUMPHONES = 50, NUMPHONES = 50,
NUMPEDGROUPS = 67, NUMPEDGROUPS = 67,
NUMMODELSPERPEDGROUP = 16, NUMMODELSPERPEDGROUP = 16,
MAXZONEPEDSLOADED = 8,
NUMSHOTINFOS = 100, NUMSHOTINFOS = 100,
NUMROADBLOCKS = 300, NUMROADBLOCKS = 300,

View file

@ -609,17 +609,13 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
} }
} }
//--MIAMI: done
void void
LoadingIslandScreen(const char *levelName) LoadingIslandScreen(const char *levelName)
{ {
CSprite2d *splash; CSprite2d *splash;
wchar *name;
char str[100];
wchar wstr[80];
CRGBA col;
splash = LoadSplash(nil); splash = LoadSplash(nil);
name = TheText.Get(levelName);
if(!DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255)) if(!DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255))
return; return;
@ -627,26 +623,10 @@ LoadingIslandScreen(const char *levelName)
CSprite2d::InitPerFrame(); CSprite2d::InitPerFrame();
CFont::InitPerFrame(); CFont::InitPerFrame();
DefinedState(); DefinedState();
col = CRGBA(255, 255, 255, 255); CRGBA col = CRGBA(255, 255, 255, 255);
CRGBA col2 = CRGBA(0, 0, 0, 255);
CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), col2);
splash->Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), col, col, col, col); splash->Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), col, col, col, col);
CFont::SetBackgroundOff();
CFont::SetScale(1.5f, 1.5f);
CFont::SetPropOn();
CFont::SetRightJustifyOn();
CFont::SetRightJustifyWrap(150.0f);
CFont::SetFontStyle(FONT_HEADING);
sprintf(str, "WELCOME TO");
AsciiToUnicode(str, wstr);
CFont::SetDropColor(CRGBA(0, 0, 0, 255));
CFont::SetDropShadowPosition(3);
CFont::SetColor(CRGBA(243, 237, 71, 255));
CFont::SetScale(SCREEN_STRETCH_X(1.2f), SCREEN_STRETCH_Y(1.2f));
CFont::PrintString(SCREEN_WIDTH - 20, SCREEN_STRETCH_FROM_BOTTOM(110.0f), TheText.Get("WELCOME"));
TextCopy(wstr, name);
TheText.UpperCase(wstr);
CFont::SetColor(CRGBA(243, 237, 71, 255));
CFont::SetScale(SCREEN_STRETCH_X(1.2f), SCREEN_STRETCH_Y(1.2f));
CFont::PrintString(SCREEN_WIDTH-20, SCREEN_STRETCH_FROM_BOTTOM(80.0f), wstr);
CFont::DrawFonts(); CFont::DrawFonts();
DoRWStuffEndOfFrame(); DoRWStuffEndOfFrame();
} }

View file

@ -3001,6 +3001,22 @@ CPed::CanBeDeleted(void)
} }
} }
//--MIAMI: done
bool
CPed::CanBeDeletedEvenInVehicle(void)
{
switch (CharCreatedBy) {
case RANDOM_CHAR:
return true;
case MISSION_CHAR:
return false;
case TODO_CHAR:
return false;
default:
return true;
}
}
// --MIAMI: Done // --MIAMI: Done
bool bool
CPed::CanPedDriveOff(void) CPed::CanPedDriveOff(void)

View file

@ -911,6 +911,7 @@ public:
bool IsPedInControl(void); bool IsPedInControl(void);
bool CanPedDriveOff(void); bool CanPedDriveOff(void);
bool CanBeDeleted(void); bool CanBeDeleted(void);
bool CanBeDeletedEvenInVehicle(void);
bool CanStrafeOrMouseControl(void); bool CanStrafeOrMouseControl(void);
bool CanPedReturnToState(void); bool CanPedReturnToState(void);
void SetMoveState(eMoveState); void SetMoveState(eMoveState);

View file

@ -1,7 +1,9 @@
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4005) #pragma warning( disable : 4005)
#pragma warning( pop ) #pragma warning( pop )
#ifndef LIBRW
#define WITHD3D #define WITHD3D
#endif
#include "common.h" #include "common.h"
#ifndef LIBRW #ifndef LIBRW
#include "rpanisot.h" #include "rpanisot.h"
@ -221,7 +223,11 @@ CanVideoCardDoDXT(void)
{ {
#ifdef LIBRW #ifdef LIBRW
// TODO // TODO
#ifdef RW_OPENGL
return false
#else
return true; return true;
#endif
#else #else
return _rwD3D8CheckValidTextureFormat(D3DFMT_DXT1) && _rwD3D8CheckValidTextureFormat(D3DFMT_DXT3); return _rwD3D8CheckValidTextureFormat(D3DFMT_DXT1) && _rwD3D8CheckValidTextureFormat(D3DFMT_DXT3);
#endif #endif