[Scummvm-git-logs] scummvm master -> 433cdf0298affe11aa00d6c4ea55ba1218458fb4

bluegr noreply at scummvm.org
Sat Jul 27 09:51:06 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:
433cdf0298 JANITORIAL: BAGEL: Fix typos in comments


Commit: 433cdf0298affe11aa00d6c4ea55ba1218458fb4
    https://github.com/scummvm/scummvm/commit/433cdf0298affe11aa00d6c4ea55ba1218458fb4
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-27T12:51:03+03:00

Commit Message:
JANITORIAL: BAGEL: Fix typos in comments

Changed paths:
    engines/bagel/baglib/chat_wnd.cpp
    engines/bagel/baglib/log_msg.cpp
    engines/bagel/baglib/movie_object.cpp
    engines/bagel/baglib/pan_bitmap.h
    engines/bagel/baglib/pan_window.cpp
    engines/bagel/baglib/pan_window.h
    engines/bagel/baglib/storage_dev_win.cpp
    engines/bagel/baglib/time_object.cpp
    engines/bagel/boflib/dat_file.cpp
    engines/bagel/boflib/gfx/sprite.cpp
    engines/bagel/boflib/string.cpp
    engines/bagel/boflib/string_functions.h
    engines/bagel/spacebar/main_window.cpp
    engines/bagel/spacebar/thud.cpp


diff --git a/engines/bagel/baglib/chat_wnd.cpp b/engines/bagel/baglib/chat_wnd.cpp
index b9aa21b41cb..fdd414f6842 100644
--- a/engines/bagel/baglib/chat_wnd.cpp
+++ b/engines/bagel/baglib/chat_wnd.cpp
@@ -53,9 +53,9 @@ void CBagChatWnd::onMouseMove(uint32 flags, CBofPoint *pos, void *) {
 	// If over a chat choice, then highlight it
 	CBofList<CBagObject *> *bagObjectList = getObjectList();
 
-	// Run thru background object list and find if the cursor is over an object
+	// Run through background object list and find if the cursor is over an object
 	if (bagObjectList != nullptr) {
-		// Go thru list backwards to find the 1st top-most object
+		// Go through list backwards to find the 1st top-most object
 		CBofListNode<CBagObject *> *currNode = bagObjectList->getTail();
 		while (currNode != nullptr) {
 			CBagObject *currNodeItem = currNode->getNodeItem();
diff --git a/engines/bagel/baglib/log_msg.cpp b/engines/bagel/baglib/log_msg.cpp
index 230d26ef0a0..e73f55b1501 100644
--- a/engines/bagel/baglib/log_msg.cpp
+++ b/engines/bagel/baglib/log_msg.cpp
@@ -90,7 +90,7 @@ CBofPoint CBagLog::arrangeFloater(CBofPoint &pos, CBagObject *bagObj) {
 		setNumFloatPages(pageNum);
 
 		const int totalPages = getCurFltPage();
-		// Now position this object int the sdev
+		// Now position this object into the sdev
 		// if it fell on this page, show it
 		if (pageNum == totalPages) {
 			CBofPoint pagePos = nextPos;
diff --git a/engines/bagel/baglib/movie_object.cpp b/engines/bagel/baglib/movie_object.cpp
index af0a88c1002..ab58db24e8c 100644
--- a/engines/bagel/baglib/movie_object.cpp
+++ b/engines/bagel/baglib/movie_object.cpp
@@ -471,7 +471,7 @@ ParseCodes CBagMovieObject::setInfo(CBagIfstream &istr) {
 		break;
 
 		//
-		//  No match return from funtion
+		//  No match return from function
 		//
 		default: {
 			const ParseCodes parseCode = CBagObject::setInfo(istr);
diff --git a/engines/bagel/baglib/pan_bitmap.h b/engines/bagel/baglib/pan_bitmap.h
index 7cbdf079ec1..46a34fa3770 100644
--- a/engines/bagel/baglib/pan_bitmap.h
+++ b/engines/bagel/baglib/pan_bitmap.h
@@ -43,7 +43,7 @@ public:
 	};
 
 private:
-	CBofRect _xCurrView;      // Viewport Window size (0->Width-1,0->Heigth-1,1->Width+Width/4,1->Heigth)
+	CBofRect _xCurrView;      // Viewport Window size (0->Width-1,0->Height-1,1->Width+Width/4,1->Height)
 	double _xFOVAngle;        // Field of view in radians
 	CBofPoint _xRotateRate;   // Rate of rotation on increment left, right ...
 	bool _bActiveScrolling;   // True when there should be screen updates
diff --git a/engines/bagel/baglib/pan_window.cpp b/engines/bagel/baglib/pan_window.cpp
index 1bd70ad4c93..2c08097f822 100644
--- a/engines/bagel/baglib/pan_window.cpp
+++ b/engines/bagel/baglib/pan_window.cpp
@@ -35,7 +35,7 @@ namespace Bagel {
 CBagPDA *CBagPanWindow::_pPDABmp;      // Pointer to the PDA object
 int CBagPanWindow::_nCorrection;
 int CBagPanWindow::_nPanSpeed;
-CBagWield *CBagPanWindow::_pWieldBmp;  // Pointer to the WEILD object
+CBagWield *CBagPanWindow::_pWieldBmp;  // Pointer to the WIELD object
 
 void CBagPanWindow::initialize() {
 	_pPDABmp = nullptr;
@@ -518,7 +518,7 @@ void CBagPanWindow::onMouseMove(uint32 nFlags, CBofPoint *p, void *) {
 
 
 	// Change cursor based on the Foreground object list
-	// Run thru background object list and find if the cursor is over an object
+	// Run through background object list and find if the cursor is over an object
 	CBofList<CBagObject *> *pList = _pFGObjectList;
 	if (pList != nullptr) {
 		CBagObject *pOverObj = nullptr;
diff --git a/engines/bagel/baglib/pan_window.h b/engines/bagel/baglib/pan_window.h
index 02ca9a56911..8269e274e10 100644
--- a/engines/bagel/baglib/pan_window.h
+++ b/engines/bagel/baglib/pan_window.h
@@ -75,7 +75,7 @@ private:
 	CBofList<CBagObject *> *_pFGObjectList; // Objects to be painted to the window
 
 public:
-	static CBagWield *_pWieldBmp; // Pointer to the WEILD object
+	static CBagWield *_pWieldBmp; // Pointer to the WIELD object
 
 	CBagPanWindow();
 	virtual ~CBagPanWindow();
diff --git a/engines/bagel/baglib/storage_dev_win.cpp b/engines/bagel/baglib/storage_dev_win.cpp
index b46d9ae730b..e9c5777682c 100644
--- a/engines/bagel/baglib/storage_dev_win.cpp
+++ b/engines/bagel/baglib/storage_dev_win.cpp
@@ -226,7 +226,7 @@ ErrorCode CBagStorageDev::activateLocalObject(CBagObject  *pObj) {
 			pObj->setActive();
 			pObj->attach();
 
-			// Preform an update and arrange objects in the storage device
+			// Perform an update and arrange objects in the storage device
 			if (g_allowattachActiveObjectsFl) {
 				attachActiveObjects();
 			}
@@ -1481,12 +1481,12 @@ void CBagStorageDevWnd::onMouseMove(uint32 n, CBofPoint *pPoint, void *) {
 			bWield = true;
 		}
 
-		// Run thru background object list and find if the cursor is over an object
+		// Run through background object list and find if the cursor is over an object
 		CBofList<CBagObject *> *pList = getObjectList();
 		if (pList != nullptr) {
 			CBofPoint cCursorLocation = devPtToViewPort(*_xCursorLocation);
 
-			// Go thru list backwards to find the 1st top-most object
+			// Go through list backwards to find the 1st top-most object
 			CBofListNode<CBagObject *> *pNode = pList->getTail();
 			while (pNode != nullptr) {
 				CBagObject *pObj = pNode->getNodeItem();
diff --git a/engines/bagel/baglib/time_object.cpp b/engines/bagel/baglib/time_object.cpp
index 3c1ea38e84f..a1769d98b13 100644
--- a/engines/bagel/baglib/time_object.cpp
+++ b/engines/bagel/baglib/time_object.cpp
@@ -149,7 +149,7 @@ CBofRect CBagTimeObject::getRect() {
 	if (_xDig1) {
 		s = _xDig1->getSize();
 
-		// Increase the width to accomodate all 5 sprites
+		// Increase the width to accommodate all 5 sprites
 		s.cx = s.cx * 5;
 	}
 	return CBofRect(p, s);
diff --git a/engines/bagel/boflib/dat_file.cpp b/engines/bagel/boflib/dat_file.cpp
index 8af430af501..46604dd5a0c 100644
--- a/engines/bagel/boflib/dat_file.cpp
+++ b/engines/bagel/boflib/dat_file.cpp
@@ -499,7 +499,7 @@ ErrorCode CBofDataFile::writeRecord(int32 lRecNum, void *pBuf, int32 lSize, bool
 				// Write chunk to new position
 				write(pTmpBuf, lChunkSize);
 
-				// That much less to do next time thru
+				// That much less to do next time through
 				lBufLength -= lChunkSize;
 
 				// Last chunk is lBufLength
diff --git a/engines/bagel/boflib/gfx/sprite.cpp b/engines/bagel/boflib/gfx/sprite.cpp
index f77882e889b..bc0f6364958 100644
--- a/engines/bagel/boflib/gfx/sprite.cpp
+++ b/engines/bagel/boflib/gfx/sprite.cpp
@@ -413,7 +413,7 @@ bool CBofSprite::updateDirtyRect(CBofWindow *pWnd, CBofSprite *pPrimarySprite) {
 			}
 
 			CBofRect cRect, cSrcRect;
-			// Run thru the sprite list
+			// Run through the sprite list
 			while (pSprite != nullptr) {
 				// and paint each partial sprite overlap to the work area
 				if (pSprite->_bPositioned && cRect.intersectRect(&pSprite->_cRect, pRect)) {
@@ -462,7 +462,7 @@ bool CBofSprite::updateDirtyRect(CBofBitmap *pBmp, CBofSprite *pPrimarySprite) {
 	}
 
 	CBofRect cRect;
-	// Run thru the sprite list
+	// Run through the sprite list
 	while (pSprite != nullptr) {
 		// and paint each partial sprite overlap to the work area
 		if (pSprite->_bPositioned && cRect.intersectRect(&pSprite->_cRect, pRect)) {
diff --git a/engines/bagel/boflib/string.cpp b/engines/bagel/boflib/string.cpp
index 3b0e5fd6a11..342453766bc 100644
--- a/engines/bagel/boflib/string.cpp
+++ b/engines/bagel/boflib/string.cpp
@@ -485,7 +485,7 @@ void CBofString::replaceChar(char chOld, char chNew) {
 	assert(chOld != '\0');
 
 	if (_pszData != nullptr) {
-		// Walk thru the string and replace the specified character
+		// Walk through the string and replace the specified character
 		char *p = _pszData;
 		for (int i = 0; i < _nLength; i++) {
 			if (*p == chOld) {
diff --git a/engines/bagel/boflib/string_functions.h b/engines/bagel/boflib/string_functions.h
index ea1fc9fcb64..cb49c563e96 100644
--- a/engines/bagel/boflib/string_functions.h
+++ b/engines/bagel/boflib/string_functions.h
@@ -26,7 +26,7 @@
 namespace Bagel {
 
 /**
- * Counts number of occurence of a specified char in String
+ * Counts number of occurrences of a specified char in String
  * @param str       Pointer to string to parse
  * @param c         Character to count in str
  * @return          Number of times character c occurs in string str
@@ -34,7 +34,7 @@ namespace Bagel {
 extern int strCharCount(const char *str, char c);
 
 /**
- * Replaces all occurence of cOld in string with cNew
+ * Replaces all occurrences of cOld in string with cNew
  * @param pszbuf    String to search
  * @param cOld      Character to find in pszBuf
  * @param cNew      Character to replace cOld
diff --git a/engines/bagel/spacebar/main_window.cpp b/engines/bagel/spacebar/main_window.cpp
index 1f2d24d4e6c..6db1e9160e9 100644
--- a/engines/bagel/spacebar/main_window.cpp
+++ b/engines/bagel/spacebar/main_window.cpp
@@ -31,7 +31,7 @@ namespace SpaceBar {
 
 #define PLAY_MODE_ONLY    1
 
-SBarThud *CMainWindow::_pThudBmp = nullptr;    // Pointer to the WEILD object
+SBarThud *CMainWindow::_pThudBmp = nullptr;    // Pointer to the WIELD object
 int CMainWindow::_nInstances = 0;      // Number of space bar windows
 bool CMainWindow::_bZzazzlVision = false;
 CBofRect *CMainWindow::_xFilterRect;
diff --git a/engines/bagel/spacebar/thud.cpp b/engines/bagel/spacebar/thud.cpp
index 88bc5fdd4cb..a5b8f24470c 100644
--- a/engines/bagel/spacebar/thud.cpp
+++ b/engines/bagel/spacebar/thud.cpp
@@ -72,7 +72,7 @@ ErrorCode SBarThud::attach() {
 		}
 	}
 
-	// The weild has been loaded with too many active objects
+	// The wield has been loaded with too many active objects
 	_nObjects = nActiveObj;
 
 	return errorCode;




More information about the Scummvm-git-logs mailing list