[Scummvm-git-logs] scummvm master -> c7b6d17d753da0a7ac7a331a6fa14b22c8556f1d
bluegr
noreply at scummvm.org
Wed Dec 25 16:07:22 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c7b6d17d75 JANITORIAL: ULTIMA: Fix typos
Commit: c7b6d17d753da0a7ac7a331a6fa14b22c8556f1d
https://github.com/scummvm/scummvm/commit/c7b6d17d753da0a7ac7a331a6fa14b22c8556f1d
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-12-25T18:07:20+02:00
Commit Message:
JANITORIAL: ULTIMA: Fix typos
Changed paths:
engines/ultima/nuvie/core/converse_interpret.cpp
engines/ultima/nuvie/core/events.h
engines/ultima/nuvie/screen/surface.h
engines/ultima/nuvie/sound/adplug/fm_opl.cpp
engines/ultima/nuvie/sound/adplug/opl_class.cpp
engines/ultima/ultima8/gfx/render_surface.cpp
engines/ultima/ultima8/gumps/gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.h
engines/ultima/ultima8/gumps/target_gump.cpp
engines/ultima/ultima8/world/actors/main_actor.h
diff --git a/engines/ultima/nuvie/core/converse_interpret.cpp b/engines/ultima/nuvie/core/converse_interpret.cpp
index 0143340bff9..a93e98f1470 100644
--- a/engines/ultima/nuvie/core/converse_interpret.cpp
+++ b/engines/ultima/nuvie/core/converse_interpret.cpp
@@ -537,7 +537,7 @@ bool ConverseInterpret::op(Common::Stack<converse_typed_value> &i) {
switch (inVal) {
case U6OP_SLEEP: // 0x9e
- // Note: It's usually unecessary to wait for the effect, as it
+ // Note: It's usually unnecessary to wait for the effect, as it
// pauses input and the user can't continue the conversation until
// the effect is complete.
new SleepEffect(5); // sleep until sunrise
@@ -739,7 +739,7 @@ bool ConverseInterpret::op(Common::Stack<converse_typed_value> &i) {
case U6OP_ENDANSWER: // 0xee
break; // (frame only)
case U6OP_KEYWORDS: // 0xef (text:keywords)
- if (answer_mode != ANSWER_DONE) { // havn't already answered
+ if (answer_mode != ANSWER_DONE) { // haven't already answered
answer_mode = ANSWER_NO;
if (check_keywords(get_text(), converse->get_input()))
answer_mode = ANSWER_YES;
diff --git a/engines/ultima/nuvie/core/events.h b/engines/ultima/nuvie/core/events.h
index 5700c4f86aa..69c5022b75e 100644
--- a/engines/ultima/nuvie/core/events.h
+++ b/engines/ultima/nuvie/core/events.h
@@ -312,7 +312,7 @@ public:
// bool select_obj(Obj *obj = nullptr, Actor *actor = nullptr);
// bool select_obj(sint16 rel_x, sint16 rel_y);
// There is no "select_text", as Events polls MsgScroll for new input.
-// Similiarly, a "select_key" is unnecessary. The following method
+// Similarly, a "select_key" is unnecessary. The following method
// starts sending all keyboard input to 'caller'. (with the CB_DATA_READY message)
void key_redirect(CallBack *caller, void *user_data);
void cancel_key_redirect();
diff --git a/engines/ultima/nuvie/screen/surface.h b/engines/ultima/nuvie/screen/surface.h
index 6e1bdd8571e..29d1989abca 100644
--- a/engines/ultima/nuvie/screen/surface.h
+++ b/engines/ultima/nuvie/screen/surface.h
@@ -48,7 +48,7 @@ public:
uint32 colour32[256]; // Palette as 16/32 bit colours
- // Dimentions
+ // Dimensions
uint32 w, h; // Surface width and height
uint32 pitch; // Surface pitch
diff --git a/engines/ultima/nuvie/sound/adplug/fm_opl.cpp b/engines/ultima/nuvie/sound/adplug/fm_opl.cpp
index d4f77f8c404..0fe45311bda 100644
--- a/engines/ultima/nuvie/sound/adplug/fm_opl.cpp
+++ b/engines/ultima/nuvie/sound/adplug/fm_opl.cpp
@@ -1880,7 +1880,7 @@ static unsigned char OPLRead(FM_OPL *OPL,int a)
return 0xff;
}
-/* CSM Key Controll */
+/* CSM Key Control */
INLINE void CSMKeyControll(OPL_CH *CH)
{
FM_KEYON (&CH->SLOT[SLOT1], 4U);
diff --git a/engines/ultima/nuvie/sound/adplug/opl_class.cpp b/engines/ultima/nuvie/sound/adplug/opl_class.cpp
index dae5a15b02c..2f0c61d0b75 100644
--- a/engines/ultima/nuvie/sound/adplug/opl_class.cpp
+++ b/engines/ultima/nuvie/sound/adplug/opl_class.cpp
@@ -1467,7 +1467,7 @@ static unsigned char OPLRead(FM_OPL *OPL, int a) {
return 0xff;
}
-/* CSM Key Controll */
+/* CSM Key Control */
INLINE void CSMKeyControll(OPL_CH *CH) {
FM_KEYON(&CH->SLOT[SLOT1], 4U);
FM_KEYON(&CH->SLOT[SLOT2], 4U);
diff --git a/engines/ultima/ultima8/gfx/render_surface.cpp b/engines/ultima/ultima8/gfx/render_surface.cpp
index 98cc06ca953..523feaa2504 100644
--- a/engines/ultima/ultima8/gfx/render_surface.cpp
+++ b/engines/ultima/ultima8/gfx/render_surface.cpp
@@ -122,7 +122,7 @@ bool RenderSurface::EndPainting() {
//
// void RenderSurface::GetSurfaceDims(Rect &r)
//
-// Desc: Get the Surface Dimentions (and logical origin)
+// Desc: Get the Surface Dimensions (and logical origin)
// r: Rect object to fill
//
void RenderSurface::GetSurfaceDims(Rect &r) const {
diff --git a/engines/ultima/ultima8/gumps/gump.cpp b/engines/ultima/ultima8/gumps/gump.cpp
index 991fd7b3526..7c7345b76de 100644
--- a/engines/ultima/ultima8/gumps/gump.cpp
+++ b/engines/ultima/ultima8/gumps/gump.cpp
@@ -571,7 +571,7 @@ Gump *Gump::FindGump(const FindGumpPredicate predicate, bool recursive) {
// Makes this gump the focus
void Gump::MakeFocus() {
- // By default we WONT do anything
+ // By default we WON'T do anything
if (_parent) {
if (_parent->_focusChild) _parent->_focusChild->OnFocus(false);
_parent->_focusChild = this;
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.h b/engines/ultima/ultima8/gumps/message_box_gump.h
index 22879c085d8..a4aa9c084a4 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.h
+++ b/engines/ultima/ultima8/gumps/message_box_gump.h
@@ -35,7 +35,7 @@ namespace Ultima8 {
/**
* A modal message box (for errors, etc)
- * In Crusader, this should be used for things like the "Targetting reticle [in]active." message
+ * In Crusader, this should be used for things like the "Targeting reticle [in]active." message
*/
class MessageBoxGump : public ModalGump {
Std::string _title;
diff --git a/engines/ultima/ultima8/gumps/target_gump.cpp b/engines/ultima/ultima8/gumps/target_gump.cpp
index 8ffe57ad7c3..f7cc6dee749 100644
--- a/engines/ultima/ultima8/gumps/target_gump.cpp
+++ b/engines/ultima/ultima8/gumps/target_gump.cpp
@@ -36,7 +36,7 @@ TargetGump::TargetGump() : ModalGump(), _targetTracing(false) {
}
-// Skip pause as usecode processes need to complete & matches orginal game
+// Skip pause as usecode processes need to complete & matches original game
TargetGump::TargetGump(int x, int y)
: ModalGump(x, y, 0, 0, 0, FLAG_DONT_SAVE | FLAG_PREVENT_SAVE, LAYER_MODAL, false),
_targetTracing(false) {
diff --git a/engines/ultima/ultima8/world/actors/main_actor.h b/engines/ultima/ultima8/world/actors/main_actor.h
index 439247fea50..bbf4c955053 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.h
+++ b/engines/ultima/ultima8/world/actors/main_actor.h
@@ -46,7 +46,7 @@ public:
bool CanAddItem(Item *item, bool checkwghtvol = false) override;
bool addItem(Item *item, bool checkwghtvol = false) override;
- //! Get the ShapeInfo object for this MainActor. Overrided because it changes
+ //! Get the ShapeInfo object for this MainActor. Overridden because it changes
//! when Crusader is kneeling.
const ShapeInfo *getShapeInfoFromGameInstance() const override;
More information about the Scummvm-git-logs
mailing list