OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Replaced uint with unsigned int

Browse source
This commit is contained in:
Marcus Minhorst 2025-07-19 10:00:49 -04:00 • committed by Ricardo Luís Vaz Silva
commit 649ddd7774
31 changed files with 86 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/am_map.cpp
View file

@ -1313,7 +1313,7 @@ void DAutomap::changeWindowLoc ()
void DAutomap::startDisplay()
{
uint pnum;
unsigned int pnum;
f_oldloc.x = FLT_MAX;
amclock = 0;
@ -2809,7 +2809,7 @@ void DAutomap::drawPlayers ()
mpoint_t pt;
DAngle angle;
uint i;
unsigned int i;
if (!multiplayer)
{

4
src/common/scripting/dap/BreakpointManager.cpp
View file

@ -207,7 +207,7 @@ dap::ResponseOrError<dap::SetBreakpointsResponse> BreakpointManager::SetBreakpoi
found.pop();
continue;
}
for (uint i = 0; i < func->LineInfoCount; i++)
for (unsigned int i = 0; i < func->LineInfoCount; i++)
{
if (func->LineInfo[i].LineNumber == line)
{
@ -453,7 +453,7 @@ dap::ResponseOrError<dap::SetInstructionBreakpointsResponse> BreakpointManager::
dap::SetInstructionBreakpointsResponse response;
ClearBreakpointsType(BreakpointInfo::Type::Instruction);
for (uint i = 0; i < breakpoints.size(); i++)
for (unsigned int i = 0; i < breakpoints.size(); i++)
{
auto &bp = breakpoints[i];
void *srcAddress = (void *)(std::stoull(bp.instructionReference.substr(2), nullptr, 16));

2
src/common/scripting/dap/DebugExecutionManager.cpp
View file

@ -337,7 +337,7 @@ dap::array<dap::Breakpoint> DebugExecutionManager::SetExceptionBreakpointFilters
{
m_exceptionFilters.clear();
dap::array<dap::Breakpoint> breakpoints;
for (uint i = 0; i < filterIds.size(); i++)
for (unsigned int i = 0; i < filterIds.size(); i++)
{
auto breakpoint = dap::Breakpoint();
int64_t id = (int64_t)DebugExecutionManager::GetFilterID(filterIds[i]);

2
src/common/scripting/dap/Nodes/StackFrameStateNode.cpp
View file

@ -67,7 +67,7 @@ bool StackFrameStateNode::SerializeToProtocol(dap::StackFrame &stackFrame, PexCa
{
// end of the function, get the max line number
int max_line = 0;
for (uint i = 0; i < scriptFunction->LineInfoCount; i++)
for (unsigned int i = 0; i < scriptFunction->LineInfoCount; i++)
{
if (scriptFunction->LineInfo[i].LineNumber > max_line)
{

6
src/common/utility/basics.h
View file

@ -25,10 +25,6 @@ typedef int32_t fixed_t;
typedef uint32_t angle_t;
#ifdef _WIN32
typedef unsigned int uint;
#endif
#if defined(__GNUC__)
// With versions of GCC newer than 4.2, it appears it was determined that the
// cost of an unaligned pointer on PPC was high enough to add padding to the
@ -78,4 +74,4 @@ template<typename T>
T clamp(T val, T minval, T maxval)
{
return std::max<T>(std::min<T>(val, maxval), minval);
}
}

2
src/console/c_cmds.cpp
View file

@ -254,7 +254,7 @@ CCMD (chase)
{
if (demoplayback)
{
uint i;
unsigned int i;
if (chasedemo)
{

6
src/d_main.cpp
View file

@ -261,7 +261,7 @@ CUSTOM_CVAR (Int, fraglimit, 0, CVAR_SERVERINFO)
// lowered below somebody's current frag count.
if (deathmatch && self > 0)
{
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i] && self <= D_GetFragCount(&players[i]))
{
@ -509,7 +509,7 @@ CUSTOM_CVAR (Int, dmflags2, 0, CVAR_SERVERINFO | CVAR_NOINITCALL)
if ((self & DF2_NO_AUTOMAP) && automapactive)
AM_Stop ();
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
player_t *p = &players[i];
@ -3039,7 +3039,7 @@ static void GC_MarkGameRoots()
Level->Mark();
// Mark players.
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
players[i].PropagateMark();

6
src/d_net.cpp
View file

@ -367,7 +367,7 @@ void Net_ClearBuffers()
{
CloseNetwork();
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
playeringame[i] = false;
players[i].waiting = players[i].inconsistant = false;
@ -579,7 +579,7 @@ static size_t GetNetBufferSize()
}
// Header info
uint totalBytes = 10;
unsigned int totalBytes = 10;
if (NetBuffer[0] & NCMD_QUITTERS)
totalBytes += NetBuffer[totalBytes] + 1;
@ -3387,7 +3387,7 @@ CCMD(listmuted)
}
bool found = false;
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (MutedClients & ((uint64_t)1u << i))
{

8
src/d_netinfo.cpp
View file

@ -265,7 +265,7 @@ int D_PickRandomTeam ()
int numTeams = 0;
int team;
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i])
{
@ -380,7 +380,7 @@ int D_GetFragCount (player_t *player)
// Count total frags for this player's team
int count = 0;
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i] && players[i].userinfo.GetTeam() == team)
{
@ -393,7 +393,7 @@ int D_GetFragCount (player_t *player)
void D_SetupUserInfo ()
{
uint i;
unsigned int i;
userinfo_t *coninfo;
// Reset everybody's userinfo to a default state.
@ -1019,7 +1019,7 @@ void ReadUserInfo(FSerializer &arc, userinfo_t &info, FString &skin)
CCMD(playerinfo)
{
TArray<int> inGame = {};
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i])
inGame.Push(i);

2
src/g_dumpinfo.cpp
View file

@ -347,7 +347,7 @@ CCMD(dumplinktable)
CCMD(printinv)
{
uint pnum = consoleplayer;
unsigned int pnum = consoleplayer;
#ifdef _DEBUG
// Only allow peeking on other players' inventory in debug builds.

12
src/g_game.cpp
View file

@ -1154,7 +1154,7 @@ void G_Ticker ()
// do player reborns if needed
// TODO: These should really be moved to queues.
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (!playeringame[i])
continue;
@ -1473,7 +1473,7 @@ double FLevelLocals::PlayersRangeFromSpot (FPlayerStart *spot)
{
double closest = INT_MAX;
double distance;
uint i;
unsigned int i;
for (i = 0; i < MAXPLAYERS; i++)
{
@ -1569,7 +1569,7 @@ void FLevelLocals::DeathMatchSpawnPlayer (int playernum)
I_Error ("No deathmatch starts");
bool hasSpawned = false;
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (PlayerInGame(i) && Players[i]->mo != nullptr && Players[i]->health > 0)
{
@ -2604,7 +2604,7 @@ void G_RecordDemo (const char* name)
void G_BeginRecording (const char *startmap)
{
uint i;
unsigned int i;
if (startmap == NULL)
{
@ -2719,7 +2719,7 @@ bool G_ProcessIFFDemo (FString &mapname)
bool bodyHit = false;
int numPlayers = 0;
int id, len;
uint i;
unsigned int i;
uLong uncompSize = 0;
uint8_t *nextchunk;
@ -2992,7 +2992,7 @@ bool G_CheckDemoStatus (void)
demoplayback = false;
netgame = false;
multiplayer = false;
for (uint i = 1; i < MAXPLAYERS; i++)
for (unsigned int i = 1; i < MAXPLAYERS; i++)
playeringame[i] = 0;
consoleplayer = 0;
players[0].camera = nullptr;

24
src/g_level.cpp
View file

@ -454,7 +454,7 @@ UNSAFE_CCMD (open)
void G_NewInit ()
{
uint i;
unsigned int i;
// Destory all old player refrences that may still exist
TThinkerIterator<AActor> it(primaryLevel, NAME_PlayerPawn, STAT_TRAVELLING, false);
@ -536,7 +536,7 @@ static void InitPlayerClasses ()
{
if (!savegamerestore)
{
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
SinglePlayerClass[i] = players[i].userinfo.GetPlayerClassNum();
if (SinglePlayerClass[i] < 0 || !playeringame[i])
@ -557,7 +557,7 @@ static void InitPlayerClasses ()
void G_InitNew (const char *mapname, bool bTitleLevel)
{
bool wantFast;
uint i;
unsigned int i;
// did we have any level before?
if (primaryLevel->info != nullptr)
@ -821,7 +821,7 @@ void FLevelLocals::ChangeLevel(const char *levelname, int position, int inflags,
D_DrawIcon = "TELEICON";
}
for(uint i = 0; i < MAXPLAYERS; i++)
for(unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (PlayerInGame(i))
{
@ -1156,7 +1156,7 @@ void G_DoCompleted (void)
bool FLevelLocals::DoCompleted (FString nextlevel, wbstartstruct_t &wminfo)
{
uint i;
unsigned int i;
// [RH] Mark this level as having been visited
if (!(flags & LEVEL_CHANGEMAPCHEAT))
@ -1381,7 +1381,7 @@ void G_DoLoadLevel(const FString &nextmapname, int position, bool autosave, bool
void FLevelLocals::DoLoadLevel(const FString &nextmapname, int position, bool autosave, bool newGame)
{
MapName = nextmapname;
uint i;
unsigned int i;
if (NextSkill >= 0)
{
@ -1482,7 +1482,7 @@ void FLevelLocals::DoLoadLevel(const FString &nextmapname, int position, bool au
if (!FromSnapshot)
{
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (PlayerInGame(i) && Players[i]->mo != nullptr)
P_PlayerStartStomp(Players[i]->mo, !deathmatch);
@ -1490,7 +1490,7 @@ void FLevelLocals::DoLoadLevel(const FString &nextmapname, int position, bool au
}
// For each player, if they are viewing through a player, make sure it is themselves.
for (uint ii = 0; ii < MAXPLAYERS; ++ii)
for (unsigned int ii = 0; ii < MAXPLAYERS; ++ii)
{
if (PlayerInGame(ii))
{
@ -1621,7 +1621,7 @@ void FLevelLocals::StartTravel ()
if (deathmatch)
return;
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i])
{
@ -1809,7 +1809,7 @@ FLevelLocals::FLevelLocals() : Behaviors(this), tagManager(this)
{
// Make sure that these point to the right data all the time.
// This will be needed for as long as it takes to completely separate global UI state from per-level play state.
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
Players[i] = &players[i];
}
@ -2024,7 +2024,7 @@ void G_WriteVisited(FSerializer &arc)
if (arc.BeginObject("playerclasses"))
{
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i])
{
@ -2098,7 +2098,7 @@ void G_ReadVisited(FSerializer &arc)
if (arc.BeginObject("playerclasses"))
{
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
FStringf key("%d", i);
arc(key.GetChars(), players[i].cls);

4
src/g_levellocals.h
View file

@ -621,7 +621,7 @@ public:
// This needs to be done better, but for now it should be good enough.
bool PlayerInGame(player_t *player)
{
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (player == Players[i]) return PlayerInGame(i);
}
@ -630,7 +630,7 @@ public:
int PlayerNum(player_t *player)
{
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (player == Players[i]) return i;
}

4
src/gamedata/g_mapinfo.cpp
View file

@ -399,7 +399,7 @@ level_info_t *level_info_t::CheckLevelRedirect ()
PClassActor *type = PClass::FindActor(RedirectType);
if (type != NULL)
{
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i] && players[i].mo->FindInventory(type))
{
@ -421,7 +421,7 @@ level_info_t *level_info_t::CheckLevelRedirect ()
if (var->GetFlags() & CVAR_USERINFO)
{
// user sync'd cvar, check for all players
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i] && (var = GetCVar(i, RedirectCVAR.GetChars())))
{

2
src/maploader/maploader.cpp
View file

@ -3209,7 +3209,7 @@ void MapLoader::LoadLevel(MapData *map, const char *lumpname, int position)
LoadLightmap(map);
}
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (Level->PlayerInGame(i) && Level->Players[i]->mo != nullptr)
Level->Players[i]->health = Level->Players[i]->mo->health;

4
src/p_conversation.cpp
View file

@ -322,7 +322,7 @@ void P_FreeStrifeConversations ()
void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveangle)
{
AActor *oldtarget;
uint i;
unsigned int i;
// Make sure this is actually a player.
if (pc == nullptr || pc->player == nullptr || npc == nullptr || !pc->Level->isPrimaryLevel()) return;
@ -446,7 +446,7 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
void P_ResumeConversation ()
{
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;

14
src/p_saveg.cpp
View file

@ -603,7 +603,7 @@ void FLevelLocals::SerializeSounds(FSerializer &arc)
void FLevelLocals::SerializePlayers(FSerializer &arc, bool skipload)
{
int numPlayers, numPlayersNow;
uint i;
unsigned int i;
// Count the number of players present right now.
for (numPlayersNow = 0, i = 0; i < MAXPLAYERS; ++i)
@ -690,7 +690,7 @@ void FLevelLocals::ReadOnePlayer(FSerializer &arc, bool fromHub)
player_t temp = {};
temp.Serialize(arc);
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (!PlayerInGame(i))
continue;
@ -751,7 +751,7 @@ void FLevelLocals::ReadMultiplePlayers(FSerializer &arc, int numPlayers, bool fr
// based on their names. If two players in the savegame have the
// same name, then they are assigned to players in the current game
// on a first-come, first-served basis.
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (!PlayerInGame(i))
continue;
@ -780,7 +780,7 @@ void FLevelLocals::ReadMultiplePlayers(FSerializer &arc, int numPlayers, bool fr
// Any players that didn't have matching names are assigned to existing
// players on a first-come, first-served basis.
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (!PlayerInGame(i) || assignedPlayers[i])
continue;
@ -893,7 +893,7 @@ void FLevelLocals::SpawnExtraPlayers()
{
// If there are more players now than there were in the savegame,
// be sure to spawn the extra players.
uint i;
unsigned int i;
if (deathmatch || !isPrimaryLevel())
{
@ -1046,7 +1046,7 @@ void FLevelLocals::Serialize(FSerializer &arc, bool hubload)
{
P_Recalculate3DFloors(&sec);
}
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (PlayerInGame(i) && Players[i]->mo != nullptr)
{
@ -1125,7 +1125,7 @@ void FLevelLocals::UnSnapshotLevel(bool hubLoad)
next = it.Next();
if (pawn->player == nullptr || pawn->player->mo == nullptr || !PlayerInGame(pawn->player))
{
uint i;
unsigned int i;
// If this isn't the unmorphed original copy of a player, destroy it, because it's extra.
for (i = 0; i < MAXPLAYERS; ++i)

2
src/p_setup.cpp
View file

@ -426,7 +426,7 @@ void P_FreeLevelData (bool fullgc)
void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
{
uint i;
unsigned int i;
Level->ShaderStartTime = I_msTimeFS(); // indicate to the shader system that the level just started

6
src/p_tick.cpp
View file

@ -68,7 +68,7 @@ void P_RunClientsideLogic()
if (gamestate == GS_LEVEL || gamestate == GS_TITLELEVEL)
{
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i] && players[i].inventorytics > 0)
--players[i].inventorytics;
@ -147,7 +147,7 @@ void P_ClearLevelInterpolation()
}
}
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
{
@ -171,7 +171,7 @@ void P_ClearLevelInterpolation()
//
void P_Ticker (void)
{
uint i;
unsigned int i;
for (auto Level : AllLevels())
{

12
src/playsim/bots/b_func.cpp
View file

@ -283,7 +283,7 @@ void DBot::Dofire (usercmd_t *cmd)
bool FCajunMaster::IsLeader (player_t *player)
{
for (uint count = 0; count < MAXPLAYERS; count++)
for (unsigned int count = 0; count < MAXPLAYERS; count++)
{
if (players[count].Bot != NULL
&& players[count].Bot->mate == player->mo)
@ -301,7 +301,7 @@ void FCajunMaster::BotTick(AActor *mo)
{
BotSupportCycles.Clock();
m_Thinking = true;
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].Bot == NULL)
continue;
@ -342,7 +342,7 @@ void FCajunMaster::BotTick(AActor *mo)
//the mate (teammate coop mate).
AActor *DBot::Choose_Mate ()
{
uint count;
unsigned int count;
double closest_dist, test;
AActor *target;
@ -413,7 +413,7 @@ AActor *DBot::Choose_Mate ()
//MAKEME: Make this a smart decision
AActor *DBot::Find_enemy ()
{
uint count;
unsigned int count;
double closest_dist, temp; //To target.
AActor *target;
DAngle vangle;
@ -580,7 +580,7 @@ bool FCajunMaster::SafeCheckPosition (AActor *actor, double x, double y, FCheckP
void FCajunMaster::StartTravel ()
{
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (players[i].Bot != NULL)
{
@ -591,7 +591,7 @@ void FCajunMaster::StartTravel ()
void FCajunMaster::FinishTravel ()
{
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (players[i].Bot != NULL)
{

6
src/playsim/bots/b_game.cpp
View file

@ -186,7 +186,7 @@ void FCajunMaster::Init ()
//Called on each level exit (from g_game.c).
void FCajunMaster::End ()
{
uint i;
unsigned int i;
//Arrange wanted botnum and their names, so they can be spawned next level.
getspawned.Clear();
@ -365,7 +365,7 @@ void FCajunMaster::TryAddBot (FLevelLocals *Level, TArrayView<uint8_t>& stream,
bool FCajunMaster::DoAddBot (FLevelLocals *Level, TArrayView<uint8_t> info, botskill_t skill)
{
uint bnum;
unsigned int bnum;
for (bnum = 0; bnum < MAXPLAYERS; bnum++)
{
@ -403,7 +403,7 @@ bool FCajunMaster::DoAddBot (FLevelLocals *Level, TArrayView<uint8_t> info, bots
void FCajunMaster::RemoveAllBots (FLevelLocals *Level, bool fromlist)
{
uint i, j;
unsigned int i, j;
for (i = 0; i < MAXPLAYERS; ++i)
{

2
src/playsim/fragglescript/t_func.cpp
View file

@ -263,7 +263,7 @@ PClassActor * FParser::T_GetMobjType(svalue_t arg)
//==========================================================================
int FParser::T_GetPlayerNum(const svalue_t &arg)
{
uint playernum;
unsigned int playernum;
if(arg.type == svt_mobj)
{
if(!actorvalue(arg) || !arg.value.mobj->player)

2
src/playsim/mapthinkers/a_quake.cpp
View file

@ -114,7 +114,7 @@ void DEarthquake::Serialize(FSerializer &arc)
void DEarthquake::Tick ()
{
uint i;
unsigned int i;
if (m_Spot == NULL)
{

8
src/playsim/p_acs.cpp
View file

@ -1776,7 +1776,7 @@ static int UseInventory (FLevelLocals *Level, AActor *activator, const char *typ
}
if (activator == NULL)
{
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (Level->PlayerInGame(i))
ret += DoUseInv (Level->Players[i]->mo, info);
@ -3753,7 +3753,7 @@ void DLevelScript::ChangeFlat (int tag, int name, bool floorOrCeiling)
int DLevelScript::CountPlayers ()
{
uint count = 0, i;
unsigned int count = 0, i;
for (i = 0; i < MAXPLAYERS; i++)
if (Level->PlayerInGame(i))
@ -3906,7 +3906,7 @@ void DLevelScript::DoFadeRange (int r1, int g1, int b1, int a1,
bool fadingFrom = a1 >= 0;
float fr1 = 0, fg1 = 0, fb1 = 0, fa1 = 0;
float fr2, fg2, fb2, fa2;
uint i;
unsigned int i;
fr2 = (float)r2 / 255.f;
fg2 = (float)g2 / 255.f;
@ -10189,7 +10189,7 @@ scriptwait:
case PCD_CHECKPLAYERCAMERA:
{
uint playernum = STACK(1);
unsigned int playernum = STACK(1);
if (playernum < 0 || playernum >= MAXPLAYERS || !Level->PlayerInGame(playernum) ||
Level->Players[playernum]->camera == nullptr || Level->Players[playernum]->camera->player != nullptr)

6
src/playsim/p_actionfunctions.cpp
View file

@ -1745,7 +1745,7 @@ DEFINE_ACTION_FUNCTION(AActor, CheckIfSeen)
PARAM_SELF_PROLOGUE(AActor);
auto Level = self->Level;
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (Level->PlayerInGame(i))
{
@ -1818,7 +1818,7 @@ DEFINE_ACTION_FUNCTION(AActor, CheckSightOrRange)
range *= range;
auto Level = self->Level;
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (Level->PlayerInGame(i))
{
@ -1848,7 +1848,7 @@ DEFINE_ACTION_FUNCTION(AActor, CheckRange)
range *= range;
auto Level = self->Level;
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (Level->PlayerInGame(i))
{

8
src/playsim/p_enemy.cpp
View file

@ -1776,9 +1776,9 @@ int P_LookForEnemies (AActor *actor, INTBOOL allaround, FLookExParams *params)
int P_LookForPlayers (AActor *actor, INTBOOL allaround, FLookExParams *params)
{
uint c;
int pnum;
player_t* player;
unsigned int c;
int pnum;
player_t* player;
bool chasegoal = params? (!(params->flags & LOF_DONTCHASEGOAL)) : true;
if (actor->TIDtoHate != 0)
@ -3234,7 +3234,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_Pain)
int CheckBossDeath (AActor *actor)
{
uint i;
unsigned int i;
// make sure there is a player alive for victory
for (i = 0; i < MAXPLAYERS; i++)

2
src/playsim/p_interaction.cpp
View file

@ -632,7 +632,7 @@ void AActor::Die (AActor *source, AActor *inflictor, int dmgflags, FName MeansOf
player->Bot->t_respawn = (pr_botrespawn()%15)+((Level->BotInfo.botnum-1)*2)+TICRATE+1;
//Added by MC: Discard enemies.
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
DBot *Bot = Level->Players[i]->Bot;
if (Bot != nullptr && this == Bot->enemy)

8
src/playsim/p_mobj.cpp
View file

@ -6031,7 +6031,7 @@ void PlayerPointerSubstitution(AActor* oldPlayer, AActor* newPlayer, bool remove
}
// Go through player infos.
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (!oldPlayer->Level->PlayerInGame(i))
continue;
@ -6152,7 +6152,7 @@ int MorphPointerSubstitution(AActor* from, AActor* to)
to->MoveBehaviors(*from);
// Go through player infos.
for (uint i = 0; i < MAXPLAYERS; ++i)
for (unsigned int i = 0; i < MAXPLAYERS; ++i)
{
if (!from->Level->PlayerInGame(i))
continue;
@ -6388,7 +6388,7 @@ AActor *FLevelLocals::SpawnPlayer (FPlayerStart *mthing, int playernum, int flag
VMCall(func, params, 2, rets, 1);
}
for (uint ii = 0; ii < MAXPLAYERS; ++ii)
for (unsigned int ii = 0; ii < MAXPLAYERS; ++ii)
{
if (PlayerInGame(ii) && Players[ii]->camera == oldactor)
{
@ -6621,7 +6621,7 @@ AActor *FLevelLocals::SpawnMapThing (FMapThing *mthing, int position)
else if (!deathmatch)
{ // Cooperative
mask = 0;
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (PlayerInGame(i))
{

4
src/playsim/p_pspr.cpp
View file

@ -458,7 +458,7 @@ void DPSprite::NewTick()
// This function should be called after the beginning of a tick, before any possible
// prprite-event, or near the end, after any possible psprite event.
// Because data is reset for every tick (which it must be) this has no impact on savegames.
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
{
@ -1489,7 +1489,7 @@ ADD_STAT(psprites)
{
FString out;
DPSprite *pspr;
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;

2
src/playsim/p_spec.cpp
View file

@ -450,7 +450,7 @@ void P_ActorInSpecialSector (AActor *victim, sector_t * sector, F3DFloor* Ffloor
if (victim->player && sector->Flags & (SECF_EXIT1 | SECF_EXIT2))
{
for (uint i = 0; i < MAXPLAYERS; i++)
for (unsigned int i = 0; i < MAXPLAYERS; i++)
if (playeringame[i])
P_DamageMobj(players[i].mo, nullptr, nullptr, TELEFRAG_DAMAGE, NAME_InstantDeath);
if (sector->Flags & SECF_EXIT2)

2
src/r_data/r_translate.cpp
View file

@ -228,7 +228,7 @@ FTranslationID CreateBloodTranslation(PalEntry color)
void R_InitTranslationTables ()
{
uint i;
unsigned int i;
// Each player gets two translations. Doom and Strife don't use the
// extra ones, but Heretic and Hexen do. These are set up during