Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

typos #377

Merged
merged 3 commits into from
Nov 23, 2023
Merged

typos #377

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified android/AndroidAppSettings.cfg
100755 → 100644
Empty file.
Empty file modified data/difficulty.cfg
100755 → 100644
Empty file.
Empty file modified data/editor-tools.cfg
100755 → 100644
Empty file.
Empty file modified data/editor.cfg
100755 → 100644
Empty file.
Empty file modified data/fonts/Montaga-Regular.ttf
100755 → 100644
Empty file.
Empty file modified data/fonts/OFL.txt
100755 → 100644
Empty file.
Empty file modified data/framed-gui-elements.cfg
100755 → 100644
Empty file.
Empty file modified data/gui-elements.cfg
100755 → 100644
Empty file.
Empty file modified data/objects/hud-elements/dummy_gui_object.cfg
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion external/include/boost/archive/basic_binary_oarchive.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class BOOST_SYMBOL_VISIBLE basic_binary_oarchive :
friend class detail::interface_oarchive<Archive>;
#endif
#endif
// any datatype not specifed below will be handled by base class
// any datatype not specified below will be handled by base class
typedef detail::common_oarchive<Archive> detail_common_oarchive;
template<class T>
void save_override(const T & t){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ struct Format_Type
// return SAMPLEFORMAT_IEEEFP;
// }
//
// io_error( "Unkown channel format." );
// io_error( "Unknown channel format." );
//}

// The following two functions look the same but are different since one is using
Expand Down
Empty file modified images/anura-icon.ico
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/StackWalker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, const CONTEXT *context, PReadPro
// if this returns ERROR_INVALID_ADDRESS (487) or ERROR_NOACCESS (998), you can
// assume that either you are done, or that the stack is so hosed that the next
// deeper frame could not be found.
// CONTEXT need not to be suplied if imageTyp is IMAGE_FILE_MACHINE_I386!
// CONTEXT need not to be supplied if imageTyp is IMAGE_FILE_MACHINE_I386!
if ( ! this->m_sw->pSW(imageType, this->m_hProcess, hThread, &s, &c, myReadProcMem, this->m_sw->pSFTA, this->m_sw->pSGMB, nullptr) )
{
// INFO: "StackWalk64" does not set "GetLastError"...
Expand Down
2 changes: 1 addition & 1 deletion src/button.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ variant Button::getColorScheme()
hpadding_ = v["hpad"].as_int(default_hpadding);
vpadding_ = v["vpad"].as_int(default_vpadding);
if(v.has_key("padding")) {
ASSERT_LOG(v["padding"].num_elements() == 2, "Incorrect number of padding elements specifed." << v["padding"].num_elements());
ASSERT_LOG(v["padding"].num_elements() == 2, "Incorrect number of padding elements specified." << v["padding"].num_elements());
hpadding_ = v["padding"][0].as_int();
vpadding_ = v["padding"][1].as_int();
}
Expand Down
2 changes: 1 addition & 1 deletion src/checkbox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ namespace gui
{
hpadding_ = v["hpad"].as_int(12);
if(v.has_key("padding")) {
ASSERT_LOG(v["padding"].num_elements() == 2, "Incorrect number of padding elements specifed." << v["padding"].num_elements());
ASSERT_LOG(v["padding"].num_elements() == 2, "Incorrect number of padding elements specified." << v["padding"].num_elements());
hpadding_ = v["padding"][0].as_int();
}
checked_ = v["checked"].as_bool(false);
Expand Down
Empty file modified src/custom_object.cpp
100755 → 100644
Empty file.
Empty file modified src/custom_object.hpp
100755 → 100644
Empty file.
Empty file modified src/custom_object_callable.cpp
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions src/custom_object_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,7 @@ namespace

END_FUNCTION_DEF(object)

FUNCTION_DEF(object_playable, 1, 5, "object_playable(string type_id, int midpoint_x, int midpoint_y, int facing, (optional) map properties) -> object: constructs and returns a new object. Note that the difference between this and spawn is that spawn returns a command to actually place the object in the Level. object_playable only creates the playble object and returns it. It may be stored for later use.")
FUNCTION_DEF(object_playable, 1, 5, "object_playable(string type_id, int midpoint_x, int midpoint_y, int facing, (optional) map properties) -> object: constructs and returns a new object. Note that the difference between this and spawn is that spawn returns a command to actually place the object in the Level. object_playable only creates the playable object and returns it. It may be stored for later use.")
Formula::failIfStaticContext();
const std::string type = EVAL_ARG(0).as_string();
ffl::IntrusivePtr<CustomObject> obj;
Expand Down Expand Up @@ -3446,7 +3446,7 @@ RETURN_TYPE("bool")
cmd->setExpression(this);
return variant(cmd);
} else if(NUM_ARGS == 2) {
LOG_ERROR("TWO ARGMENTS ISN'T A SUPPORTED OPTION FOR resolve_solid() CONTINUING AS IF ONE ARGUMENT SUPPLIED");
LOG_ERROR("TWO ARGUMENTS ISN'T A SUPPORTED OPTION FOR resolve_solid() CONTINUING AS IF ONE ARGUMENT SUPPLIED");
resolve_solid_command* cmd = (new resolve_solid_command(e, 0, 0, 0));
cmd->setExpression(this);
return variant(cmd);
Expand Down
Empty file modified src/custom_object_type.cpp
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/editor_module_properties_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace editor_dialogs
empty_lvl.add_attr(variant("character"), variant(&playable_m));
sys::write_file(mod_path + "data/level/titlescreen.cfg", empty_lvl.write_json());

// Module specifed as standalone, write out a few extra useful files.
// Module specified as standalone, write out a few extra useful files.
if(mod.included_modules_.empty()) {
// data/fonts.cfg -- {font:["@flatten","@include data/dialog_font.cfg","@include data/label_font.cfg"]}
// data/gui.cfg -- {section:["@flatten","@include data/editor-tools.cfg","@include data/gui-elements.cfg"],FramedGuiElement: ["@flatten","@include data/framed-gui-elements.cfg"]}
Expand Down
Empty file modified src/haptic.hpp
100755 → 100644
Empty file.
Empty file modified src/isochunk.cpp
100755 → 100644
Empty file.
Empty file modified src/isochunk.hpp
100755 → 100644
Empty file.
Empty file modified src/isoworld.hpp
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/kre/ParticleSystemEmitters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ namespace KRE
case EmitterType::SPHERE_SURFACE:
return std::make_shared<SphereSurfaceEmitter>(parent);
default:
ASSERT_LOG(false, "Unkown emitter type given: " << static_cast<int>(type));
ASSERT_LOG(false, "Unknown emitter type given: " << static_cast<int>(type));
break;
}
return nullptr;
Expand Down
Empty file modified src/normal_map.cpp
100755 → 100644
Empty file.
Empty file modified src/profile_timer.hpp
100755 → 100644
Empty file.
Empty file modified src/simplex_noise.cpp
100755 → 100644
Empty file.
Empty file modified src/simplex_noise.hpp
100755 → 100644
Empty file.
Empty file modified src/spline.hpp
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/tbs_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ namespace tbs
void server::connect_relay_session(const std::string& host, const std::string& port, int session_id)
{
if(web_server_) {
LOG_INFO("Connnect relay session: " << host << ":" << port << " session = " << session_id);
LOG_INFO("Connect relay session: " << host << ":" << port << " session = " << session_id);
web_server_->connect_proxy(static_cast<uint32_t>(session_id), host, port);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/tiled/tiled.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ namespace tiled
}
// is raw data.
SDL_Surface* image = IMG_Load_RW(SDL_RWFromConstMem(&data_[0], static_cast<int>(data_.size())), 1);
ASSERT_LOG(image != nullptr, "Unable to create a surface from suplied data: " << SDL_GetError());
ASSERT_LOG(image != nullptr, "Unable to create a surface from supplied data: " << SDL_GetError());
ASSERT_LOG(image->format != nullptr, "No format attached to the surface.");
int bpp = image->format->BytesPerPixel;
Uint32 rmask = image->format->Rmask;
Expand Down
Empty file modified src/voxel_editor.cpp
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/xhtml/css_transition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace css

float evaluate_step(float t, int nintervals, bool start)
{
ASSERT_LOG(t >= 0.0f && t <= 1.0f, "Time specfied not in interval [0,1]: " << t);
ASSERT_LOG(t >= 0.0f && t <= 1.0f, "Time specified not in interval [0,1]: " << t);
if(nintervals == 1) {
// slight optimisation for a common case.
return start ? 1.0f : t < 1.0f ? 0.0f : 1.0f;
Expand Down
2 changes: 1 addition & 1 deletion src/xhtml/xhtml_inline_element_box.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace xhtml
void InlineElementBox::handleLayout(LayoutEngine& eng, const Dimensions& containing)
{
auto node = getNode();
ASSERT_LOG(node != nullptr && node->isReplaced(), "InlineElementBox was generated for an empty node, or node which isn't replacable.");
ASSERT_LOG(node != nullptr && node->isReplaced(), "InlineElementBox was generated for an empty node, or node which isn't replaceable.");

// set dimensions from the replaced element information.
setContentWidth(node->getDimensions().w() * LayoutEngine::getFixedPointScale());
Expand Down
Empty file modified steam_appid.txt
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion utils/doc/builtins_summary.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@

* object(string type_id, int midpoint_x, int midpoint_y, (optional) map properties) -> object: constructs and returns a new object. Note that the difference between this and spawn is that spawn returns a command to actually place the object in the Level. object only creates the object and returns it. It may be stored for later use.

* object_playable(string type_id, int midpoint_x, int midpoint_y, int facing, (optional) map properties) -> object: constructs and returns a new object. Note that the difference between this and spawn is that spawn returns a command to actually place the object in the Level. object_playable only creates the playble object and returns it. It may be stored for later use.
* object_playable(string type_id, int midpoint_x, int midpoint_y, int facing, (optional) map properties) -> object: constructs and returns a new object. Note that the difference between this and spawn is that spawn returns a command to actually place the object in the Level. object_playable only creates the playable object and returns it. It may be stored for later use.

* animation(string id): changes the current object's animation to the given animation. time_in_animation is reset to 0.

Expand Down
2 changes: 1 addition & 1 deletion utils/doc/functions
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ matched line 1900 of file '../../src//custom_object_functions.cpp':
FUNCTION_DEF(object, 1, 5, "object(string type_id, int midpoint_x, int midpoint_y, (optional) map properties) -> object: constructs and returns a new object. Note that the difference between this and spawn is that spawn returns a command to actually place the object in the Level. object only creates the object and returns it. It may be stored for later use.")

matched line 2096 of file '../../src//custom_object_functions.cpp':
FUNCTION_DEF(object_playable, 1, 5, "object_playable(string type_id, int midpoint_x, int midpoint_y, int facing, (optional) map properties) -> object: constructs and returns a new object. Note that the difference between this and spawn is that spawn returns a command to actually place the object in the Level. object_playable only creates the playble object and returns it. It may be stored for later use.")
FUNCTION_DEF(object_playable, 1, 5, "object_playable(string type_id, int midpoint_x, int midpoint_y, int facing, (optional) map properties) -> object: constructs and returns a new object. Note that the difference between this and spawn is that spawn returns a command to actually place the object in the Level. object_playable only creates the playable object and returns it. It may be stored for later use.")

matched line 2199 of file '../../src//custom_object_functions.cpp':
FUNCTION_DEF(animation, 1, 1, "animation(string id): changes the current object's animation to the given animation. time_in_animation is reset to 0.")
Expand Down