Fix occured/occurred spelling error
parent
ef0147eb37
commit
a06035ecb8
|
@ -143,7 +143,7 @@ public:
|
||||||
* \param[out] code Error code
|
* \param[out] code Error code
|
||||||
* \param[out] start Starting position in the code string of this error
|
* \param[out] start Starting position in the code string of this error
|
||||||
* \param[out] end Ending position in the code string of this error
|
* \param[out] end Ending position in the code string of this error
|
||||||
* \return false if no error has occured
|
* \return false if no error has occurred
|
||||||
*/
|
*/
|
||||||
bool GetError(CBotError& code, int& start, int& end);
|
bool GetError(CBotError& code, int& start, int& end);
|
||||||
|
|
||||||
|
@ -153,7 +153,7 @@ public:
|
||||||
* \param[out] start Starting position in the code string of this error
|
* \param[out] start Starting position in the code string of this error
|
||||||
* \param[out] end Ending position in the code string of this error
|
* \param[out] end Ending position in the code string of this error
|
||||||
* \param[out] pProg Program that caused the error (TODO: This always returns "this"... what?)
|
* \param[out] pProg Program that caused the error (TODO: This always returns "this"... what?)
|
||||||
* \return false if no error has occured
|
* \return false if no error has occurred
|
||||||
*/
|
*/
|
||||||
bool GetError(CBotError& code, int& start, int& end, CBotProgram*& pProg);
|
bool GetError(CBotError& code, int& start, int& end, CBotProgram*& pProg);
|
||||||
|
|
||||||
|
|
|
@ -105,7 +105,7 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Check if there was an error
|
* \brief Check if there was an error
|
||||||
* \return false if an error occured
|
* \return false if an error occurred
|
||||||
* \see GetError()
|
* \see GetError()
|
||||||
*/
|
*/
|
||||||
bool IsOk()
|
bool IsOk()
|
||||||
|
|
|
@ -124,7 +124,7 @@ void CSignalHandlers::ReportError(const std::string& errorMessage)
|
||||||
}
|
}
|
||||||
|
|
||||||
std::stringstream msg;
|
std::stringstream msg;
|
||||||
msg << "Unhandled exception occured!" << std::endl;
|
msg << "Unhandled exception occurred!" << std::endl;
|
||||||
msg << "==============================" << std::endl;
|
msg << "==============================" << std::endl;
|
||||||
msg << errorMessage << std::endl;
|
msg << errorMessage << std::endl;
|
||||||
msg << "==============================" << std::endl;
|
msg << "==============================" << std::endl;
|
||||||
|
@ -162,7 +162,7 @@ void CSignalHandlers::ReportError(const std::string& errorMessage)
|
||||||
|
|
||||||
std::cerr << std::endl << msg.str() << std::endl;
|
std::cerr << std::endl << msg.str() << std::endl;
|
||||||
|
|
||||||
m_systemUtils->SystemDialog(SDT_ERROR, "Unhandled exception occured!", msg.str());
|
m_systemUtils->SystemDialog(SDT_ERROR, "Unhandled exception occurred!", msg.str());
|
||||||
|
|
||||||
if (canSave && !triedSaving)
|
if (canSave && !triedSaving)
|
||||||
{
|
{
|
||||||
|
|
|
@ -174,7 +174,7 @@ bool CGL21Device::Create()
|
||||||
|
|
||||||
if (!InitializeGLEW())
|
if (!InitializeGLEW())
|
||||||
{
|
{
|
||||||
m_errorMessage = "An error occured while initializing GLEW.";
|
m_errorMessage = "An error occurred while initializing GLEW.";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -173,7 +173,7 @@ bool CGL33Device::Create()
|
||||||
|
|
||||||
if (!InitializeGLEW())
|
if (!InitializeGLEW())
|
||||||
{
|
{
|
||||||
m_errorMessage = "An error occured while initializing GLEW.";
|
m_errorMessage = "An error occurred while initializing GLEW.";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -169,7 +169,7 @@ bool CGLDevice::Create()
|
||||||
|
|
||||||
if (!InitializeGLEW())
|
if (!InitializeGLEW())
|
||||||
{
|
{
|
||||||
m_errorMessage = "An error occured while initializing GLEW.";
|
m_errorMessage = "An error occurred while initializing GLEW.";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -480,8 +480,8 @@ GLint LoadShader(GLint type, const char* filename)
|
||||||
auto message = MakeUniqueArray<GLchar>(len + 1);
|
auto message = MakeUniqueArray<GLchar>(len + 1);
|
||||||
glGetShaderInfoLog(shader, len + 1, nullptr, message.get());
|
glGetShaderInfoLog(shader, len + 1, nullptr, message.get());
|
||||||
|
|
||||||
GetLogger()->Error("Shader compilation error occured!\n%s\n", message.get());
|
GetLogger()->Error("Shader compilation error occurred!\n%s\n", message.get());
|
||||||
lastShaderError = std::string("Shader compilation error occured!\n\n") + std::string(message.get());
|
lastShaderError = std::string("Shader compilation error occurred!\n\n") + std::string(message.get());
|
||||||
|
|
||||||
glDeleteShader(shader);
|
glDeleteShader(shader);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -513,8 +513,8 @@ GLint LinkProgram(int count, GLint shaders[])
|
||||||
auto message = MakeUniqueArray<GLchar>(len + 1);
|
auto message = MakeUniqueArray<GLchar>(len + 1);
|
||||||
glGetProgramInfoLog(program, len + 1, nullptr, message.get());
|
glGetProgramInfoLog(program, len + 1, nullptr, message.get());
|
||||||
|
|
||||||
GetLogger()->Error("Shader program linking error occured!\n%s\n", message.get());
|
GetLogger()->Error("Shader program linking error occurred!\n%s\n", message.get());
|
||||||
lastShaderError = std::string("Shader program linking error occured!\n\n") + std::string(message.get());
|
lastShaderError = std::string("Shader program linking error occurred!\n\n") + std::string(message.get());
|
||||||
|
|
||||||
glDeleteProgram(program);
|
glDeleteProgram(program);
|
||||||
|
|
||||||
|
|
|
@ -563,7 +563,7 @@ void CRobotMain::ChangePhase(Phase phase)
|
||||||
}
|
}
|
||||||
catch (const std::runtime_error& e)
|
catch (const std::runtime_error& e)
|
||||||
{
|
{
|
||||||
LevelLoadingError("An error occured while trying to load a level", e);
|
LevelLoadingError("An error occurred while trying to load a level", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -606,7 +606,7 @@ void CRobotMain::ChangePhase(Phase phase)
|
||||||
}
|
}
|
||||||
catch (const std::runtime_error& e)
|
catch (const std::runtime_error& e)
|
||||||
{
|
{
|
||||||
LevelLoadingError("An error occured while trying to load win scene", e);
|
LevelLoadingError("An error occurred while trying to load win scene", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -636,7 +636,7 @@ void CRobotMain::ChangePhase(Phase phase)
|
||||||
}
|
}
|
||||||
catch (const std::runtime_error& e)
|
catch (const std::runtime_error& e)
|
||||||
{
|
{
|
||||||
LevelLoadingError("An error occured while trying to load lost scene", e);
|
LevelLoadingError("An error occurred while trying to load lost scene", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2781,7 +2781,7 @@ void CRobotMain::ScenePerso()
|
||||||
}
|
}
|
||||||
catch (const std::runtime_error& e)
|
catch (const std::runtime_error& e)
|
||||||
{
|
{
|
||||||
LevelLoadingError("An error occured while trying to load apperance scene", e, PHASE_PLAYER_SELECT);
|
LevelLoadingError("An error occurred while trying to load apperance scene", e, PHASE_PLAYER_SELECT);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_engine->SetDrawWorld(false); // does not draw anything on the interface
|
m_engine->SetDrawWorld(false); // does not draw anything on the interface
|
||||||
|
@ -4986,7 +4986,7 @@ void CRobotMain::ResetCreate()
|
||||||
}
|
}
|
||||||
catch (const std::runtime_error& e)
|
catch (const std::runtime_error& e)
|
||||||
{
|
{
|
||||||
LevelLoadingError("An error occured while trying to reset scene", e);
|
LevelLoadingError("An error occurred while trying to reset scene", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue