Decouple <vector>
This commit is contained in:
+10
-7
@@ -9,6 +9,9 @@
|
||||
#include "InputEventPlus.h"
|
||||
#include "InputMapper.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
||||
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
|
||||
#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen")
|
||||
#define PREPARE_SCREENS THEME->GetMetric (m_sName,"PrepareScreens")
|
||||
@@ -108,7 +111,7 @@ void Screen::EndScreen()
|
||||
void Screen::Update( float fDeltaTime )
|
||||
{
|
||||
ActorFrame::Update( fDeltaTime );
|
||||
|
||||
|
||||
m_fLockInputSecs = std::max( 0.0f, m_fLockInputSecs-fDeltaTime );
|
||||
|
||||
/* We need to ensure two things:
|
||||
@@ -116,7 +119,7 @@ void Screen::Update( float fDeltaTime )
|
||||
* simultaneously, one with a .001 delay and another with a .002 delay,
|
||||
* the .001 delay message must be sent first.
|
||||
* 2. Messages to be delivered simultaneously must be sent in the order queued.
|
||||
*
|
||||
*
|
||||
* Sort by time to ensure #1; use a stable sort to ensure #2. */
|
||||
stable_sort(m_QueuedMessages.begin(), m_QueuedMessages.end(), SortMessagesByDelayRemaining);
|
||||
|
||||
@@ -299,14 +302,14 @@ void Screen::PostScreenMessage( const ScreenMessage SM, float fDelay )
|
||||
|
||||
void Screen::ClearMessageQueue()
|
||||
{
|
||||
m_QueuedMessages.clear();
|
||||
m_QueuedMessages.clear();
|
||||
}
|
||||
|
||||
void Screen::ClearMessageQueue( const ScreenMessage SM )
|
||||
{
|
||||
for( int i=m_QueuedMessages.size()-1; i>=0; i-- )
|
||||
if( m_QueuedMessages[i].SM == SM )
|
||||
m_QueuedMessages.erase( m_QueuedMessages.begin()+i );
|
||||
m_QueuedMessages.erase( m_QueuedMessages.begin()+i );
|
||||
}
|
||||
|
||||
bool Screen::PassInputToLua(const InputEventPlus& input)
|
||||
@@ -411,7 +414,7 @@ void Screen::InternalRemoveCallback(callback_key_t key)
|
||||
// lua start
|
||||
#include "LuaBinding.h"
|
||||
|
||||
/** @brief Allow Lua to have access to the Screen. */
|
||||
/** @brief Allow Lua to have access to the Screen. */
|
||||
class LunaScreen: public Luna<Screen>
|
||||
{
|
||||
public:
|
||||
@@ -470,7 +473,7 @@ LUA_REGISTER_DERIVED_CLASS( Screen, ActorFrame )
|
||||
/*
|
||||
* (c) 2001-2004 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
|
||||
@@ -480,7 +483,7 @@ LUA_REGISTER_DERIVED_CLASS( Screen, ActorFrame )
|
||||
* 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
|
||||
|
||||
Reference in New Issue
Block a user