mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-09 13:01:49 +00:00
Merge pull request #948 from zaveshaa/comment-typos
Fix typos in comments and log messages
This commit is contained in:
commit
6b915b33a4
8 changed files with 11 additions and 11 deletions
|
|
@ -413,7 +413,7 @@ namespace audio {
|
||||||
/// @brief Load audio file info and PCM data
|
/// @brief Load audio file info and PCM data
|
||||||
/// @param file audio file
|
/// @param file audio file
|
||||||
/// @param headerOnly read header only
|
/// @param headerOnly read header only
|
||||||
/// @throws std::runtime_error if I/O error ocurred or format is unknown
|
/// @throws std::runtime_error if I/O error occurred or format is unknown
|
||||||
/// @return PCM audio data
|
/// @return PCM audio data
|
||||||
std::unique_ptr<PCM> load_PCM(const io::path& file, bool headerOnly);
|
std::unique_ptr<PCM> load_PCM(const io::path& file, bool headerOnly);
|
||||||
|
|
||||||
|
|
@ -421,7 +421,7 @@ namespace audio {
|
||||||
/// @param file audio file path
|
/// @param file audio file path
|
||||||
/// @param keepPCM store PCM data in sound to make it accessible with
|
/// @param keepPCM store PCM data in sound to make it accessible with
|
||||||
/// Sound::getPCM
|
/// Sound::getPCM
|
||||||
/// @throws std::runtime_error if I/O error ocurred or format is unknown
|
/// @throws std::runtime_error if I/O error occurred or format is unknown
|
||||||
/// @return new Sound instance
|
/// @return new Sound instance
|
||||||
std::unique_ptr<Sound> load_sound(const io::path& file, bool keepPCM);
|
std::unique_ptr<Sound> load_sound(const io::path& file, bool keepPCM);
|
||||||
|
|
||||||
|
|
@ -434,7 +434,7 @@ namespace audio {
|
||||||
|
|
||||||
/// @brief Open new PCM stream from file
|
/// @brief Open new PCM stream from file
|
||||||
/// @param file audio file path
|
/// @param file audio file path
|
||||||
/// @throws std::runtime_error if I/O error ocurred or format is unknown
|
/// @throws std::runtime_error if I/O error occurred or format is unknown
|
||||||
/// @return new PCMStream instance
|
/// @return new PCMStream instance
|
||||||
std::unique_ptr<PCMStream> open_PCM_stream(const io::path& file);
|
std::unique_ptr<PCMStream> open_PCM_stream(const io::path& file);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ public:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (in.fail()) {
|
if (in.fail()) {
|
||||||
logger.error() << "Wav::load_pcm: I/O error ocurred";
|
logger.error() << "Wav::load_pcm: I/O error occurred";
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
return in.gcount();
|
return in.gcount();
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,7 @@ class Hud : public util::ObjectsKeeper {
|
||||||
/// @brief Allow actual pause
|
/// @brief Allow actual pause
|
||||||
bool allowPause = true;
|
bool allowPause = true;
|
||||||
bool debug = false;
|
bool debug = false;
|
||||||
/// @brief UI element will be dynamicly positioned near to inventory or in screen center
|
/// @brief UI element will be dynamically positioned near to inventory or in screen center
|
||||||
std::shared_ptr<gui::UINode> secondUI;
|
std::shared_ptr<gui::UINode> secondUI;
|
||||||
|
|
||||||
std::shared_ptr<gui::UINode> debugMinimap;
|
std::shared_ptr<gui::UINode> debugMinimap;
|
||||||
|
|
|
||||||
|
|
@ -323,7 +323,7 @@ namespace lua {
|
||||||
|
|
||||||
if (found == usertypeNames.end()) {
|
if (found == usertypeNames.end()) {
|
||||||
log_error(
|
log_error(
|
||||||
"usertype is not registred: " + std::string(typeid(T).name())
|
"usertype is not registered: " + std::string(typeid(T).name())
|
||||||
);
|
);
|
||||||
} else if (getglobal(L, found->second)) {
|
} else if (getglobal(L, found->second)) {
|
||||||
setmetatable(L);
|
setmetatable(L);
|
||||||
|
|
|
||||||
|
|
@ -161,7 +161,7 @@ public:
|
||||||
state = ConnectionState::CLOSED;
|
state = ConnectionState::CLOSED;
|
||||||
break;
|
break;
|
||||||
} else if (size < 0) {
|
} else if (size < 0) {
|
||||||
logger.warning() << "an error ocurred while receiving from "
|
logger.warning() << "an error occurred while receiving from "
|
||||||
<< to_string(addr);
|
<< to_string(addr);
|
||||||
auto error = handle_socket_error("recv(...) error");
|
auto error = handle_socket_error("recv(...) error");
|
||||||
closesocket(descriptor);
|
closesocket(descriptor);
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,10 @@
|
||||||
#include "util/EnumMetadata.hpp"
|
#include "util/EnumMetadata.hpp"
|
||||||
|
|
||||||
enum class ParticleSpawnShape {
|
enum class ParticleSpawnShape {
|
||||||
/// @brief Coordinates are regulary distributed within
|
/// @brief Coordinates are regularly distributed within
|
||||||
/// the volume of a ball.
|
/// the volume of a ball.
|
||||||
BALL = 0,
|
BALL = 0,
|
||||||
/// @brief Coordinates are regulary distributed on
|
/// @brief Coordinates are regularly distributed on
|
||||||
/// a sphere.
|
/// a sphere.
|
||||||
SPHERE,
|
SPHERE,
|
||||||
/// @brief Coordinates are uniform distributed within
|
/// @brief Coordinates are uniform distributed within
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ namespace util {
|
||||||
|
|
||||||
/// @brief Simple heap implementation for memory-optimal sparse array of
|
/// @brief Simple heap implementation for memory-optimal sparse array of
|
||||||
/// small different structures
|
/// small different structures
|
||||||
/// @note alignment is not impemented
|
/// @note alignment is not implemented
|
||||||
/// (impractical in the context of scripting and memory consumption)
|
/// (impractical in the context of scripting and memory consumption)
|
||||||
/// @tparam Tindex entry index type
|
/// @tparam Tindex entry index type
|
||||||
/// @tparam Tsize entry size type
|
/// @tparam Tsize entry size type
|
||||||
|
|
|
||||||
|
|
@ -323,7 +323,7 @@ void WorldRegions::processBlocksData(int x, int z, const BlockDataProc& func) {
|
||||||
try {
|
try {
|
||||||
func(&blocksData, std::move(voxData));
|
func(&blocksData, std::move(voxData));
|
||||||
} catch (const std::exception& err) {
|
} catch (const std::exception& err) {
|
||||||
logger.error() << "an error ocurred while processing blocks "
|
logger.error() << "an error occurred while processing blocks "
|
||||||
"data in chunk (" << gx << ", " << gz << "): " << err.what();
|
"data in chunk (" << gx << ", " << gz << "): " << err.what();
|
||||||
blocksData = {};
|
blocksData = {};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue