actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decouple <vector>

Browse Source
This commit is contained in:
Martin Natano
2023-04-20 19:02:13 +02:00
parent aa87f85eef
commit bacecae1f7
422 changed files with 2326 additions and 1295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenDebugOverlay.cpp
+15 -12
View File
@@ -31,6 +31,9 @@
#include "ThemeMetric.h"
#include "XmlToLua.h"
#include <vector>
static bool g_bIsDisplayed = false;
static bool g_bIsSlow = false;
static bool g_bIsHalt = false;
@@ -62,7 +65,7 @@ class IDebugLine
{
public:
IDebugLine()
{
{
if( g_pvpSubscribers == nullptr )
g_pvpSubscribers = new std::vector<IDebugLine*>;
g_pvpSubscribers->push_back( this );
@@ -342,7 +345,7 @@ void ScreenDebugOverlay::Update( float fDeltaTime )
if( bCenteringNeedsUpdate )
{
DISPLAY->ChangeCentering(
PREFSMAN->m_iCenterImageTranslateX,
PREFSMAN->m_iCenterImageTranslateX,
PREFSMAN->m_iCenterImageTranslateY,
PREFSMAN->m_fCenterImageAddWidth - (int)SCREEN_WIDTH + (int)(g_fImageScaleCurrent*SCREEN_WIDTH),
PREFSMAN->m_fCenterImageAddHeight - (int)SCREEN_HEIGHT + (int)(g_fImageScaleCurrent*SCREEN_HEIGHT) );
@@ -436,7 +439,7 @@ static bool GetValueFromMap( const std::map<U, V> &m, const U &key, V &val )
bool ScreenDebugOverlay::Input( const InputEventPlus &input )
{
if( input.DeviceI == g_Mappings.holdForDebug1 ||
if( input.DeviceI == g_Mappings.holdForDebug1 ||
input.DeviceI == g_Mappings.holdForDebug2 )
{
bool bHoldingNeither =
@@ -617,8 +620,8 @@ class DebugLineAutoplay : public IDebugLine
{
ASSERT( GAMESTATE->GetMasterPlayerNumber() != PLAYER_INVALID );
PlayerController pc = GAMESTATE->m_pPlayerState[GAMESTATE->GetMasterPlayerNumber()]->m_PlayerController;
bool bHoldingShift =
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) ) ||
bool bHoldingShift =
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) ) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT) );
if( bHoldingShift )
pc = (pc==PC_CPU) ? PC_HUMAN : PC_CPU;
@@ -638,7 +641,7 @@ class DebugLineAssist : public IDebugLine
{
virtual RString GetDisplayTitle() { return ASSIST.GetValue(); }
virtual Type GetType() const { return gameplay_only; }
virtual RString GetDisplayValue() {
virtual RString GetDisplayValue() {
SongOptions so;
so.m_bAssistClap = GAMESTATE->m_SongOptions.GetSong().m_bAssistClap;
so.m_bAssistMetronome = GAMESTATE->m_SongOptions.GetSong().m_bAssistMetronome;
@@ -670,7 +673,7 @@ class DebugLineAutosync : public IDebugLine
{
virtual RString GetDisplayTitle() { return AUTOSYNC.GetValue(); }
virtual RString GetDisplayValue()
{
{
AutosyncType type = GAMESTATE->m_SongOptions.GetSong().m_AutosyncType;
switch( type )
{
@@ -688,7 +691,7 @@ class DebugLineAutosync : public IDebugLine
{
int as = GAMESTATE->m_SongOptions.GetSong().m_AutosyncType + 1;
bool bAllowSongAutosync = !GAMESTATE->IsCourseMode();
if( !bAllowSongAutosync &&
if( !bAllowSongAutosync &&
( as == AutosyncType_Song || as == AutosyncType_Tempo ) )
as = AutosyncType_Machine;
wrap( as, NUM_AutosyncType );
@@ -896,7 +899,7 @@ static HighScore MakeRandomHighScore( float fPercentDP )
static void FillProfileStats( Profile *pProfile )
{
pProfile->InitSongScores();
pProfile->InitSongScores();
pProfile->InitCourseScores();
static int s_iCount = 0;
@@ -906,7 +909,7 @@ static void FillProfileStats( Profile *pProfile )
s_iCount = (s_iCount+1)%2;
int iCount = pProfile->IsMachine()?
int iCount = pProfile->IsMachine()?
PREFSMAN->m_iMaxHighScoresPerListForMachine.Get():
PREFSMAN->m_iMaxHighScoresPerListForPlayer.Get();
@@ -1372,7 +1375,7 @@ DECLARE_ONE( DebugLineMuteActions );
/*
* (c) 2001-2005 Chris Danford, Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -1382,7 +1385,7 @@ DECLARE_ONE( DebugLineMuteActions );
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF