[Scummvm-git-logs] scummvm master -> c7ddfdeab50a927b1f4832d93f617d3ff11ee364
bluegr
noreply at scummvm.org
Mon Jul 15 17:50:53 UTC 2024
This automated email contains information about 23 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
dd54db1c29 JANITORIAL: Fix noteably and fullfill typos in globals.h
130b81208f JANITORIAL: Fix loosing typo in ags_plugin.cpp
ef77941154 JANITORIAL: Fix seperate typo in surface_avx2.cpp
c5c6db4c11 JANITORIAL: Fix many typos in surface_neon.cpp
030d65566e JANITORIAL: Fix seperate typo in surface_sse2.cpp
17d99844db JANITORIAL: Fix occured typo in ftmemory.h
72acbbd8f8 JANITORIAL: Fix occured typo in ahhint.cpp
18f05c435a JANITORIAL: Fix supressing typo in script_api.h
821c7c081f JANITORIAL: Fix refering typo in config.cpp
2acfde1e35 JANITORIAL: Fix acommodating typo in engine.cpp
b8c1ad9098 JANITORIAL: Fix refering typo in graphics_mode.cpp
4b2061a3e8 JANITORIAL: Fix similarily typo in ali_3d_scummvm.cpp
27deb1a128 JANITORIAL: Fix accomodating typo in graphics_driver.h
dbd65158bc JANITORIAL: Fix enviroment typos in savegame.cpp
082c3cf1c2 JANITORIAL: Fix enviroment typo in savegame.h
2f64d0af3e JANITORIAL: Fix tranform typo in viewport.h
8fcd832bbb JANITORIAL: Fix simplier typo in draw.cpp
857677df9c JANITORIAL: Fix simplier typo in drawing_surface.cpp
514d7e6e6b JANITORIAL: Fix enviroment typo in game.cpp
fe4ea1d5b6 JANITORIAL: Fix omited typo in sprite_list_entry.h
207b8cc283 JANITORIAL: Fix ammendment and accomodated typos in data_ext.h
2693b30a14 JANITORIAL: Fix simplier typo in main_game_file.cpp
c7ddfdeab5 JANITORIAL: Fix optmizations and loosing typos in test_gfx.cpp
Commit: dd54db1c29a4c67c85f60c3bc557df57051c76f1
https://github.com/scummvm/scummvm/commit/dd54db1c29a4c67c85f60c3bc557df57051c76f1
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix noteably and fullfill typos in globals.h
Changed paths:
engines/ags/globals.h
diff --git a/engines/ags/globals.h b/engines/ags/globals.h
index d6a27009ff2..c276c504e46 100644
--- a/engines/ags/globals.h
+++ b/engines/ags/globals.h
@@ -758,7 +758,7 @@ public:
// TODO: IMPORTANT!!
// we cannot simply replace these arrays with vectors, or other C++ containers,
// until we implement safe management of such containers in script exports
- // system. Noteably we would need an alternate to StaticArray class to track
+ // system. Notably we would need an alternate to StaticArray class to track
// access to their elements.
ScriptObject *_scrObj;
ScriptGUI *_scrGui = nullptr;
@@ -839,7 +839,7 @@ public:
*/
// Following struct instructs the engine to run game loops until
- // certain condition is not fullfilled.
+ // certain condition is not fulfilled.
struct RestrictUntil {
int type = 0; // type of condition, UNTIL_* constant
int disabled_for = 0; // FOR_* constant
Commit: 130b81208f5b0a7c4a1bdbc2b1eec98b4feba141
https://github.com/scummvm/scummvm/commit/130b81208f5b0a7c4a1bdbc2b1eec98b4feba141
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix loosing typo in ags_plugin.cpp
Changed paths:
engines/ags/plugins/ags_plugin.cpp
diff --git a/engines/ags/plugins/ags_plugin.cpp b/engines/ags/plugins/ags_plugin.cpp
index 9aece0763b9..5cffbfb5fff 100644
--- a/engines/ags/plugins/ags_plugin.cpp
+++ b/engines/ags/plugins/ags_plugin.cpp
@@ -404,7 +404,7 @@ AGSObject *IAGSEngine::GetObject(int32 num) {
}
BITMAP *IAGSEngine::CreateBlankBitmap(int32 width, int32 height, int32 coldep) {
// [IKM] We should not create Bitmap object here, because
- // a) we are returning raw allegro bitmap and therefore loosing control over it
+ // a) we are returning raw allegro bitmap and therefore losing control over it
// b) plugin won't use Bitmap anyway
BITMAP *tempb = create_bitmap_ex(coldep, width, height);
clear_to_color(tempb, bitmap_mask_color(tempb));
Commit: ef77941154fb452c717808745e96802391e9c790
https://github.com/scummvm/scummvm/commit/ef77941154fb452c717808745e96802391e9c790
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix seperate typo in surface_avx2.cpp
Changed paths:
engines/ags/lib/allegro/surface_avx2.cpp
diff --git a/engines/ags/lib/allegro/surface_avx2.cpp b/engines/ags/lib/allegro/surface_avx2.cpp
index 716766120b5..75a4fb059ee 100644
--- a/engines/ags/lib/allegro/surface_avx2.cpp
+++ b/engines/ags/lib/allegro/surface_avx2.cpp
@@ -190,7 +190,7 @@ static inline __m256i blendTintSpriteSIMD(__m256i srcCols, __m256i destCols, __m
// srcCols[2] = A | R | G | B
// srcCols[3] = A | R | G | B
// ->
- // to 4 float32x4_t's each being a seperate channel with each lane
+ // to 4 float32x4_t's each being a separate channel with each lane
// corresponding to their respective srcCols lane
// dda = { A[0], A[1], A[2], A[3] }
// ddr = { R[0], R[1], R[2], R[3] }
Commit: c5c6db4c112dcf5b329b0276fc2a01bbd2d4c909
https://github.com/scummvm/scummvm/commit/c5c6db4c112dcf5b329b0276fc2a01bbd2d4c909
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix many typos in surface_neon.cpp
Changed paths:
engines/ags/lib/allegro/surface_neon.cpp
diff --git a/engines/ags/lib/allegro/surface_neon.cpp b/engines/ags/lib/allegro/surface_neon.cpp
index 781ea450e5b..0a5205efbd6 100644
--- a/engines/ags/lib/allegro/surface_neon.cpp
+++ b/engines/ags/lib/allegro/surface_neon.cpp
@@ -151,7 +151,7 @@ static inline uint32x4_t rgbBlendSIMD(uint32x4_t srcCols, uint32x4_t destCols, u
srcCols = vandq_u32(srcCols, vmovq_n_u32(0xff00));
srcCols = vorrq_u32(srcCols, srcColsCopy);
- // Remeber that alpha is not alphas, but rather the alpha of destCols
+ // Remember that alpha is not alphas, but rather the alpha of destCols
if (preserveAlpha) {
srcCols = vandq_u32(srcCols, vmovq_n_u32(0x00ffffff));
srcCols = vorrq_u32(srcCols, alpha);
@@ -203,7 +203,7 @@ static inline uint32x4_t blendTintSpriteSIMD(uint32x4_t srcCols, uint32x4_t dest
// srcCols[2] = A | R | G | B
// srcCols[3] = A | R | G | B
// ->
- // to 4 float32x4_t's each being a seperate channel with each lane
+ // to 4 float32x4_t's each being a separate channel with each lane
// corresponding to their respective srcCols lane
// dda = { A[0], A[1], A[2], A[3] }
// ddr = { R[0], R[1], R[2], R[3] }
@@ -220,7 +220,7 @@ static inline uint32x4_t blendTintSpriteSIMD(uint32x4_t srcCols, uint32x4_t dest
ssg = vmulq_n_f32(vcvtq_f32_u32(vandq_u32(vshrq_n_u32(srcCols, 8), vmovq_n_u32(0xff))), 1.0 / 255.0);
ssb = vmulq_n_f32(vcvtq_f32_u32(vandq_u32(srcCols, vmovq_n_u32(0xff))), 1.0 / 255.0);
- // Get the maxes and mins (needed for HSV->RGB and visa-versa)
+ // Get the maxes and mins (needed for HSV->RGB and vice-versa)
float32x4_t dmaxes = vmaxq_f32(ddr, vmaxq_f32(ddg, ddb));
float32x4_t smaxes = vmaxq_f32(ssr, vmaxq_f32(ssg, ssb));
float32x4_t smins = vminq_f32(ssr, vminq_f32(ssg, ssb));
@@ -255,9 +255,9 @@ static inline uint32x4_t blendTintSpriteSIMD(uint32x4_t srcCols, uint32x4_t dest
val = vmaxq_f32(val, vmovq_n_f32(0.0));
}
- // then it stiches the HSV back together
+ // then it stitches the HSV back together
// the hue and saturation come from the source (tint) color, and the value comes from
- // the destinaion (real source) color
+ // the destination (real source) color
chroma = vmulq_f32(val, vmulq_f32(vsubq_f32(smaxes, smins), vrecpeq_f32(vaddq_f32(smaxes, eplison0))));
float32x4_t hprime_mod2 = vmulq_n_f32(hue, 1.0 / 2.0);
hprime_mod2 = vmulq_n_f32(vsubq_f32(hprime_mod2, vcvtq_f32_s32(vcvtq_s32_f32(hprime_mod2))), 2.0);
@@ -472,7 +472,7 @@ static void drawInner4BppWithConv(BITMAP::DrawInnerArgs &args) {
const uint32x4_t addIndexesFlipped = {3, 2, 1, 0};
uint32x4_t addIndexes = args.horizFlip ? addIndexesFlipped : addIndexesNormal;
- // This is so that we can calculate in parralell the pixel indexes for scaled drawing
+ // This is so that we can calculate in parallel the pixel indexes for scaled drawing
uint32x4_t scaleAdds = {0, (uint32)args.scaleX, (uint32)args.scaleX*2, (uint32)args.scaleX*3};
// Clip the bounds ahead of time (so we don't waste time checking if we are in bounds when
@@ -561,7 +561,7 @@ static void drawInner4BppWithConv(BITMAP::DrawInnerArgs &args) {
scaleXCtr += args.scaleX*4;
// Now this is pretty much the same as before with non-scaled code, except that we use
- // our dummy source buffer instead of the actuall source bitmap
+ // our dummy source buffer instead of the actual source bitmap
byte *destPtr = &destP[destX * (uintptr_t)DestBytesPerPixel];
uint32x4_t skipMask = vcgeq_u32(vaddq_u32(vdupq_n_u32(xCtr), addIndexes), xCtrWidthSIMD);
drawPixelSIMD<DestBytesPerPixel, SrcBytesPerPixel>(destPtr, (const byte *)srcBuffer, tint, alphas, maskedAlphas, transColors, 1, 0, args.srcAlpha, args.skipTrans, args.horizFlip, args.useTint, skipMask);
@@ -571,7 +571,7 @@ static void drawInner4BppWithConv(BITMAP::DrawInnerArgs &args) {
// The only exception here is scaling drawing this is because:
// 1) if statements are costly, and the less we do the faster this loop is
// 2) with this, the only branch in the normal drawing loop is the width check
- // 3) the scaling code will actually draw the until the last 4 pixels of the image
+ // 3) the scaling code will actually draw until the last 4 pixels of the image
// and do the extra if checks because the scaling code is already much slower
// than the normal drawing loop, and the less duplicate code helps here.
if (yCtr + 1 != yCtrHeight) destP += args.destArea.pitch;
@@ -651,7 +651,7 @@ static void drawInner2Bpp(BITMAP::DrawInnerArgs &args) {
uint16x8_t addIndexesFlipped = {7, 6, 5, 4, 3, 2, 1, 0};
uint16x8_t addIndexes = args.horizFlip ? addIndexesFlipped : addIndexesNormal;
- // This is so that we can calculate in parralell the pixel indexes for scaled drawing
+ // This is so that we can calculate in parallel the pixel indices for scaled drawing
uint32x4_t scaleAdds = {0, (uint32)args.scaleX, (uint32)args.scaleX*2, (uint32)args.scaleX*3};
uint32x4_t scaleAdds2 = {(uint32)args.scaleX*4, (uint32)args.scaleX*5, (uint32)args.scaleX*6, (uint32)args.scaleX*7};
@@ -732,7 +732,7 @@ static void drawInner2Bpp(BITMAP::DrawInnerArgs &args) {
for (int xCtr = xCtrStart, xCtrBpp = xCtrBppStart, destX = args.xStart, scaleXCtr = xCtrStart * args.scaleX; xCtr < xCtrWidth; destX += 8, xCtr += 8, xCtrBpp += 16) {
if (yCtr + 1 == yCtrHeight && xCtr + 8 > xCtrWidth) break;
uint32x4_t indexes = vdupq_n_u32(scaleXCtr), indexes2 = vdupq_n_u32(scaleXCtr);
- // Calculate in parallel the indexes of the pixels
+ // Calculate in parallel the indices of the pixels
indexes = vmulq_n_u32(vshrq_n_u32(vaddq_u32(indexes, scaleAdds), BITMAP::SCALE_THRESHOLD_BITS), 2);
indexes2 = vmulq_n_u32(vshrq_n_u32(vaddq_u32(indexes2, scaleAdds2), BITMAP::SCALE_THRESHOLD_BITS), 2);
// Simply memcpy them in. memcpy has no real performance overhead here
@@ -747,7 +747,7 @@ static void drawInner2Bpp(BITMAP::DrawInnerArgs &args) {
scaleXCtr += args.scaleX*8;
// Now this is pretty much the same as before with non-scaled code, except that we use
- // our dummy source buffer instead of the actuall source bitmap
+ // our dummy source buffer instead of the actual source bitmap
byte *destPtr = &destP[destX * 2];
uint16x8_t skipMask = vcgeq_u16(vaddq_u16(vdupq_n_u16(xCtr), addIndexes), xCtrWidthSIMD);
drawPixelSIMD2Bpp(destPtr, (const byte *)srcBuffer, tint, alphas, transColors, 1, 0, args.srcAlpha, args.skipTrans, args.horizFlip, args.useTint, skipMask);
@@ -757,7 +757,7 @@ static void drawInner2Bpp(BITMAP::DrawInnerArgs &args) {
// The only exception here is scaling drawing this is because:
// 1) if statements are costly, and the less we do the faster this loop is
// 2) with this, the only branch in the normal drawing loop is the width check
- // 3) the scaling code will actually draw the until the last 4 pixels of the image
+ // 3) the scaling code will actually draw until the last 4 pixels of the image
// and do the extra if checks because the scaling code is already much slower
// than the normal drawing loop, and the less duplicate code helps here.
if (yCtr + 1 != yCtrHeight) destP += args.destArea.pitch;
@@ -827,7 +827,7 @@ static void drawInner1Bpp(BITMAP::DrawInnerArgs &args) {
const int xDir = args.horizFlip ? -1 : 1;
uint8x16_t transColors = vmovq_n_u8(args.transColor);
- // This is so that we can calculate in parralell the pixel indexes for scaled drawing
+ // This is so that we can calculate in parallel the pixel indices for scaled drawing
uint32x4_t scaleAdds1 = {0, (uint32)args.scaleX, (uint32)args.scaleX*2, (uint32)args.scaleX*3};
uint32x4_t scaleAdds2 = {(uint32)args.scaleX*4, (uint32)args.scaleX*5, (uint32)args.scaleX*6, (uint32)args.scaleX*7};
uint32x4_t scaleAdds3 = {(uint32)args.scaleX*8, (uint32)args.scaleX*9, (uint32)args.scaleX*10, (uint32)args.scaleX*11};
@@ -878,7 +878,7 @@ static void drawInner1Bpp(BITMAP::DrawInnerArgs &args) {
for (; xCtr + 16 < xCtrWidth; destX += 16, xCtr += 16) {
byte *destPtr = &destP[destX];
- // Here we dont use the drawPixelSIMD function because 1bpp bitmaps in allegro
+ // Here we don't use the drawPixelSIMD function because 1bpp bitmaps in allegro
// can't have any blending applied to them
uint8x16_t destCols = vld1q_u8(destPtr);
uint8x16_t srcCols = vld1q_u8(srcP + xDir * xCtr);
@@ -936,7 +936,7 @@ static void drawInner1Bpp(BITMAP::DrawInnerArgs &args) {
*destVal = *srcCol;
}
if (args.horizFlip) srcP -= 15; // Undo what we did up there
- destP += args.destArea.pitch; // Goto next row
+ destP += args.destArea.pitch; // Go to next row
// Only advance the src row by 1 every time like this if we don't scale
if (!Scale) srcP += args.vertFlip ? -args.src.pitch : args.src.pitch;
}
Commit: 030d65566eb634c62ba41151cf1fead309487c85
https://github.com/scummvm/scummvm/commit/030d65566eb634c62ba41151cf1fead309487c85
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix seperate typo in surface_sse2.cpp
Changed paths:
engines/ags/lib/allegro/surface_sse2.cpp
diff --git a/engines/ags/lib/allegro/surface_sse2.cpp b/engines/ags/lib/allegro/surface_sse2.cpp
index 9e10b3bdca4..518fb72e4e0 100644
--- a/engines/ags/lib/allegro/surface_sse2.cpp
+++ b/engines/ags/lib/allegro/surface_sse2.cpp
@@ -194,7 +194,7 @@ static inline __m128i blendTintSpriteSIMD(__m128i srcCols, __m128i destCols, __m
// srcCols[2] = A | R | G | B
// srcCols[3] = A | R | G | B
// ->
- // to 4 float32x4_t's each being a seperate channel with each lane
+ // to 4 float32x4_t's each being a separate channel with each lane
// corresponding to their respective srcCols lane
// dda = { A[0], A[1], A[2], A[3] }
// ddr = { R[0], R[1], R[2], R[3] }
Commit: 17d99844db3ebdb040bb75489a8267367aff5a58
https://github.com/scummvm/scummvm/commit/17d99844db3ebdb040bb75489a8267367aff5a58
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix occured typo in ftmemory.h
Changed paths:
engines/ags/lib/freetype-2.1.3/ftmemory.h
diff --git a/engines/ags/lib/freetype-2.1.3/ftmemory.h b/engines/ags/lib/freetype-2.1.3/ftmemory.h
index d835899175e..cef23c080db 100644
--- a/engines/ags/lib/freetype-2.1.3/ftmemory.h
+++ b/engines/ags/lib/freetype-2.1.3/ftmemory.h
@@ -90,7 +90,7 @@ void FT_Free(FT_Memory memory, void **P);
/* */
/* The following macros are variants of their FT_MEM_XXXX equivalents; */
/* they are used to set an _implicit_ `error' variable and return TRUE */
-/* if an error occured (i.e. if 'error != 0'). */
+/* if an error occurred (i.e. if 'error != 0'). */
/* */
#define FT_ALLOC(_pointer_, _size_) FT_SET_ERROR(FT_MEM_ALLOC(_pointer_, _size_))
Commit: 72acbbd8f86a11dbc43dbf6c7db278847e283ec9
https://github.com/scummvm/scummvm/commit/72acbbd8f86a11dbc43dbf6c7db278847e283ec9
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix occured typo in ahhint.cpp
Changed paths:
engines/ags/lib/freetype-2.1.3/autohint/ahhint.cpp
diff --git a/engines/ags/lib/freetype-2.1.3/autohint/ahhint.cpp b/engines/ags/lib/freetype-2.1.3/autohint/ahhint.cpp
index b541b9881a3..23522bf6605 100644
--- a/engines/ags/lib/freetype-2.1.3/autohint/ahhint.cpp
+++ b/engines/ags/lib/freetype-2.1.3/autohint/ahhint.cpp
@@ -949,7 +949,7 @@ static FT_Error ah_hinter_load(AH_Hinter hinter, FT_UInt glyph_index, FT_Int32 l
ah_outline_save(outline, gloader);
/* we now need to hint the metrics according to the change in */
- /* width/positioning that occured during the hinting process */
+ /* width/positioning that occurred during the hinting process */
{
FT_Pos old_advance, old_rsb, old_lsb, new_lsb;
AH_Edge edge1 = outline->vert_edges; /* leftmost edge */
Commit: 18f05c435a60a06e176fc4c302e445e8e36f1c94
https://github.com/scummvm/scummvm/commit/18f05c435a60a06e176fc4c302e445e8e36f1c94
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix supressing typo in script_api.h
Changed paths:
engines/ags/engine/script/script_api.h
diff --git a/engines/ags/engine/script/script_api.h b/engines/ags/engine/script/script_api.h
index a90fee29681..33c6972722a 100644
--- a/engines/ags/engine/script/script_api.h
+++ b/engines/ags/engine/script/script_api.h
@@ -59,7 +59,7 @@ inline const char *ScriptVSprintf(char *buffer, size_t buf_length, const char *f
}
// Helper macros for script functions;
-// asserting for internal mistakes; supressing "unused param" warnings
+// asserting for internal mistakes; suppressing "unused param" warnings
#define ASSERT_SELF(METHOD) \
(void)params; (void)param_count; \
assert((self != NULL) && "Object pointer is null in call to API function")
Commit: 821c7c081f0a956b487c78eca19d226d38a6695d
https://github.com/scummvm/scummvm/commit/821c7c081f0a956b487c78eca19d226d38a6695d
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix refering typo in config.cpp
Changed paths:
engines/ags/engine/main/config.cpp
diff --git a/engines/ags/engine/main/config.cpp b/engines/ags/engine/main/config.cpp
index 0fb17c7d158..93724bb06b0 100644
--- a/engines/ags/engine/main/config.cpp
+++ b/engines/ags/engine/main/config.cpp
@@ -59,7 +59,7 @@ WindowSetup parse_window_mode(const String &option, bool as_windowed, WindowSetu
// in which case we'll use either a resizing window or a REAL fullscreen mode
const WindowMode exp_wmode = as_windowed ? kWnd_Windowed : kWnd_Fullscreen;
// Note that for "desktop" we return "default" for windowed, this will result
- // in refering to the desktop size but resizing in accordance to the scaling style
+ // in referring to the desktop size but resizing in accordance to the scaling style
if (option.CompareNoCase("desktop") == 0)
return as_windowed ? WindowSetup(exp_wmode) : WindowSetup(get_desktop_size(), exp_wmode);
// "Native" means using game resolution as a window size
Commit: 2acfde1e357d15d5549600ab3df5bee46ef7fdcb
https://github.com/scummvm/scummvm/commit/2acfde1e357d15d5549600ab3df5bee46ef7fdcb
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix acommodating typo in engine.cpp
Changed paths:
engines/ags/engine/main/engine.cpp
diff --git a/engines/ags/engine/main/engine.cpp b/engines/ags/engine/main/engine.cpp
index ef611c98d56..bc0a10a606a 100644
--- a/engines/ags/engine/main/engine.cpp
+++ b/engines/ags/engine/main/engine.cpp
@@ -745,7 +745,7 @@ void engine_init_game_settings() {
GUI::Options.DisabledStyle = static_cast<GuiDisableStyle>(_GP(game).options[OPT_DISABLEOFF]);
GUI::Options.ClipControls = _GP(game).options[OPT_CLIPGUICONTROLS] != 0;
- // Force GUI metrics recalculation, accomodating for loaded fonts
+ // Force GUI metrics recalculation, accommodating for loaded fonts
GUI::MarkForFontUpdate(-1);
memset(&_GP(play).walkable_areas_on[0], 1, MAX_WALK_AREAS + 1);
Commit: b8c1ad9098b197fe55be0dd223580553034cebe3
https://github.com/scummvm/scummvm/commit/b8c1ad9098b197fe55be0dd223580553034cebe3
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix refering typo in graphics_mode.cpp
Changed paths:
engines/ags/engine/main/graphics_mode.cpp
diff --git a/engines/ags/engine/main/graphics_mode.cpp b/engines/ags/engine/main/graphics_mode.cpp
index 658db73c054..adb73455e54 100644
--- a/engines/ags/engine/main/graphics_mode.cpp
+++ b/engines/ags/engine/main/graphics_mode.cpp
@@ -238,7 +238,7 @@ bool try_init_compatible_mode(const DisplayMode &dm) {
if (!result && dm.IsWindowed()) {
// When initializing windowed mode we could start with any random window size;
// if that did not work, try to find nearest supported mode, as with fullscreen mode,
- // except refering to max window size as an upper bound
+ // except referring to max window size as an upper bound
if (find_nearest_supported_mode(*modes.get(), screen_size, dm.ColorDepth, nullptr, &device_size, dm_compat)) {
dm_compat.Vsync = dm.Vsync;
dm_compat.Mode = kWnd_Windowed;
Commit: 4b2061a3e81136116685b25cb15cbb11fef5c610
https://github.com/scummvm/scummvm/commit/4b2061a3e81136116685b25cb15cbb11fef5c610
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix similarily typo in ali_3d_scummvm.cpp
Changed paths:
engines/ags/engine/gfx/ali_3d_scummvm.cpp
diff --git a/engines/ags/engine/gfx/ali_3d_scummvm.cpp b/engines/ags/engine/gfx/ali_3d_scummvm.cpp
index c50ed92d7e6..ce5a91ce628 100644
--- a/engines/ags/engine/gfx/ali_3d_scummvm.cpp
+++ b/engines/ags/engine/gfx/ali_3d_scummvm.cpp
@@ -388,7 +388,7 @@ void ScummVMRendererGraphicsDriver::RenderToBackBuffer() {
// with blending and translucency; it seems you'd have to first stretch the original sprite onto a
// temp buffer and then TransBlendBlt / LitBlendBlt it to the final destination. Of course, doing
// that here would slow things down significantly, so if we ever go that way sprite caching will
- // be required (similarily to how AGS caches flipped/scaled object sprites now for).
+ // be required (similarly to how AGS caches flipped/scaled object sprites now for).
//
const size_t last_batch_to_rend = _spriteBatchDesc.size() - 1;
Commit: 27deb1a128b20ac2529ba1a5087dc9942fbb4b98
https://github.com/scummvm/scummvm/commit/27deb1a128b20ac2529ba1a5087dc9942fbb4b98
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix accomodating typo in graphics_driver.h
Changed paths:
engines/ags/engine/gfx/graphics_driver.h
diff --git a/engines/ags/engine/gfx/graphics_driver.h b/engines/ags/engine/gfx/graphics_driver.h
index 04d6338d764..9e3b61296f4 100644
--- a/engines/ags/engine/gfx/graphics_driver.h
+++ b/engines/ags/engine/gfx/graphics_driver.h
@@ -104,7 +104,7 @@ public:
virtual void SetTintMethod(TintMethod method) = 0;
// Initialize given display mode
virtual bool SetDisplayMode(const DisplayMode &mode) = 0;
- // Updates previously set display mode, accomodating to the new screen size
+ // Updates previously set display mode, accommodating to the new screen size
virtual void UpdateDeviceScreen(const Size &screen_size) = 0;
// Gets if a graphics mode was initialized
virtual bool IsModeSet() const = 0;
Commit: dbd65158bc81ec244d5675765d15744c65dc8e64
https://github.com/scummvm/scummvm/commit/dbd65158bc81ec244d5675765d15744c65dc8e64
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix enviroment typos in savegame.cpp
Changed paths:
engines/ags/engine/game/savegame.cpp
diff --git a/engines/ags/engine/game/savegame.cpp b/engines/ags/engine/game/savegame.cpp
index 386c7c0b958..5a6947df95e 100644
--- a/engines/ags/engine/game/savegame.cpp
+++ b/engines/ags/engine/game/savegame.cpp
@@ -179,9 +179,9 @@ HSaveError ReadDescription(Stream *in, SavegameVersion &svg_ver, SavegameDescrip
return new SavegameError(kSvgErr_FormatVersionNotSupported,
String::FromFormat("Required: %d, supported: %d - %d.", svg_ver, kSvgVersion_LowestSupported, kSvgVersion_Current));
- // Enviroment information
+ // Environment information
if (svg_ver >= kSvgVersion_351)
- in->ReadInt32(); // enviroment info size
+ in->ReadInt32(); // environment info size
if (elems & kSvgDesc_EnvInfo) {
desc.EngineName = StrUtil::ReadString(in);
desc.EngineVersion.SetFromString(StrUtil::ReadString(in));
@@ -682,7 +682,7 @@ void WriteDescription(Stream *out, const String &user_text, const Bitmap *user_i
out->WriteInt32(kSvgVersion_Current);
soff_t env_pos = out->GetPosition();
out->WriteInt32(0);
- // Enviroment information
+ // Environment information
StrUtil::WriteString(get_engine_name(), out);
StrUtil::WriteString(_G(EngineVersion).LongString, out);
StrUtil::WriteString(_GP(game).guid, out);
Commit: 082c3cf1c20e291fc56e18dbf4fd072bbb7e7912
https://github.com/scummvm/scummvm/commit/082c3cf1c20e291fc56e18dbf4fd072bbb7e7912
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix enviroment typo in savegame.h
Changed paths:
engines/ags/engine/game/savegame.h
diff --git a/engines/ags/engine/game/savegame.h b/engines/ags/engine/game/savegame.h
index 08fbbc5e989..60e4c05cb8c 100644
--- a/engines/ags/engine/game/savegame.h
+++ b/engines/ags/engine/game/savegame.h
@@ -126,7 +126,7 @@ enum SavegameDescElem {
kSvgDesc_All = kSvgDesc_EnvInfo | kSvgDesc_UserText | kSvgDesc_UserImage
};
-// SavegameDescription describes savegame with information about the enviroment
+// SavegameDescription describes savegame with information about the environment
// it was created in, and custom data provided by user
struct SavegameDescription {
// Name of the engine that saved the game
Commit: 2f64d0af3e6bfef83a24f7b1e4a776dcd5958e76
https://github.com/scummvm/scummvm/commit/2f64d0af3e6bfef83a24f7b1e4a776dcd5958e76
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix tranform typo in viewport.h
Changed paths:
engines/ags/engine/game/viewport.h
diff --git a/engines/ags/engine/game/viewport.h b/engines/ags/engine/game/viewport.h
index 112d5c8849f..ce92032cdec 100644
--- a/engines/ags/engine/game/viewport.h
+++ b/engines/ags/engine/game/viewport.h
@@ -206,7 +206,7 @@ private:
// Position of the viewport on screen
Rect _position;
// TODO: Camera reference (when supporting multiple cameras)
- // Coordinate tranform between camera and viewport
+ // Coordinate transform between camera and viewport
// TODO: need to add rotate conversion to let script API support that;
// (maybe use full 3D matrix for that)
AGS::Shared::PlaneScaling _transform;
Commit: 8fcd832bbbcfd16494084c074aab3cd159b178ef
https://github.com/scummvm/scummvm/commit/8fcd832bbbcfd16494084c074aab3cd159b178ef
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix simplier typo in draw.cpp
Changed paths:
engines/ags/engine/ac/draw.cpp
diff --git a/engines/ags/engine/ac/draw.cpp b/engines/ags/engine/ac/draw.cpp
index 7a002f7ab43..6d376be7894 100644
--- a/engines/ags/engine/ac/draw.cpp
+++ b/engines/ags/engine/ac/draw.cpp
@@ -1582,7 +1582,7 @@ void prepare_characters_for_drawing() {
_GP(charextra)[aa].height = newheight;
} else {
// draw at original size, so just use the sprite width and height
- // TODO: store width and height always, that's much simplier to use for reference!
+ // TODO: store width and height always, that's much simpler to use for reference!
_GP(charextra)[aa].width = 0;
_GP(charextra)[aa].height = 0;
newwidth = src_sprwidth;
Commit: 857677df9c48a899912f4bf91c723890188ef74e
https://github.com/scummvm/scummvm/commit/857677df9c48a899912f4bf91c723890188ef74e
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix simplier typo in drawing_surface.cpp
Changed paths:
engines/ags/engine/ac/drawing_surface.cpp
diff --git a/engines/ags/engine/ac/drawing_surface.cpp b/engines/ags/engine/ac/drawing_surface.cpp
index b823f52947a..5bab1292ef7 100644
--- a/engines/ags/engine/ac/drawing_surface.cpp
+++ b/engines/ags/engine/ac/drawing_surface.cpp
@@ -172,7 +172,7 @@ void DrawingSurface_DrawImageImpl(ScriptDrawingSurface *sds, Bitmap *src,
Math::ClampLength(src_y, src_height, 0, src->GetHeight());
// TODO: possibly optimize by not making a stretched intermediate bitmap
- // if simplier blit/draw_sprite could be called (no translucency with alpha channel).
+ // if simpler blit/draw_sprite could be called (no translucency with alpha channel).
bool needToFreeBitmap = false;
if (dst_width != src->GetWidth() || dst_height != src->GetHeight() ||
src_width != src->GetWidth() || src_height != src->GetHeight()) {
Commit: 514d7e6e6bcb14d175867e6b84bebde5f474eab9
https://github.com/scummvm/scummvm/commit/514d7e6e6bcb14d175867e6b84bebde5f474eab9
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix enviroment typo in game.cpp
Changed paths:
engines/ags/engine/ac/game.cpp
diff --git a/engines/ags/engine/ac/game.cpp b/engines/ags/engine/ac/game.cpp
index a3ed944e92c..5cf2d6e7dca 100644
--- a/engines/ags/engine/ac/game.cpp
+++ b/engines/ags/engine/ac/game.cpp
@@ -977,7 +977,7 @@ HSaveError load_game(const String &path, int slotNumber, bool &data_overwritten)
SavegameDescription desc;
err = OpenSavegame(path, src, desc, kSvgDesc_EnvInfo);
- // saved in incompatible enviroment
+ // saved in incompatible environment
if (!err)
return err;
// CHECKME: is this color depth test still essential? if yes, is there possible workaround?
Commit: fe4ea1d5b6983d3bf22890741ee397110c952ec4
https://github.com/scummvm/scummvm/commit/fe4ea1d5b6983d3bf22890741ee397110c952ec4
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix omited typo in sprite_list_entry.h
Changed paths:
engines/ags/engine/ac/sprite_list_entry.h
diff --git a/engines/ags/engine/ac/sprite_list_entry.h b/engines/ags/engine/ac/sprite_list_entry.h
index 0aeee8a16b9..b4d3e3e0568 100644
--- a/engines/ags/engine/ac/sprite_list_entry.h
+++ b/engines/ags/engine/ac/sprite_list_entry.h
@@ -34,7 +34,7 @@ struct SpriteListEntry {
int x = 0, y = 0;
int zorder = 0;
// Tells if this item should take priority during sort if z1 == z2
- // TODO: this is some compatibility feature - find out if may be omited and done without extra struct?
+ // TODO: this is some compatibility feature - find out if may be omitted and done without extra struct?
bool takesPriorityIfEqual = false;
// Mark for the render stage callback (if >= 0 other fields are ignored)
int renderStage = -1;
Commit: 207b8cc283b91619eeeda06bdac87731ed6b5493
https://github.com/scummvm/scummvm/commit/207b8cc283b91619eeeda06bdac87731ed6b5493
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix ammendment and accomodated typos in data_ext.h
Changed paths:
engines/ags/shared/util/data_ext.h
diff --git a/engines/ags/shared/util/data_ext.h b/engines/ags/shared/util/data_ext.h
index 7bd487b5bbd..590bae133ee 100644
--- a/engines/ags/shared/util/data_ext.h
+++ b/engines/ags/shared/util/data_ext.h
@@ -21,13 +21,13 @@
//=============================================================================
//
- // A simple data extension format which may be useful as an ammendment to
+ // A simple data extension format which may be useful as an amendment to
// any data file in the game.
//
// Format consists of a list of "blocks", each preceded with an integer and an
// optional string identifier, and a size in bytes which lets a reader to skip
// the block completely if necessary.
- // Because the serialization algorithm was accomodated to be shared among
+ // Because the serialization algorithm was accommodated to be shared among
// several existing data files, few things in the meta info may be read
// slightly differently depending on flags passed into the function.
//
Commit: 2693b30a14032eaa6833645e163b2eb03199ecb6
https://github.com/scummvm/scummvm/commit/2693b30a14032eaa6833645e163b2eb03199ecb6
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix simplier typo in main_game_file.cpp
Changed paths:
engines/ags/shared/game/main_game_file.cpp
diff --git a/engines/ags/shared/game/main_game_file.cpp b/engines/ags/shared/game/main_game_file.cpp
index 640af3b0eb5..76caff1d5ff 100644
--- a/engines/ags/shared/game/main_game_file.cpp
+++ b/engines/ags/shared/game/main_game_file.cpp
@@ -306,7 +306,7 @@ void ReadDialogs(std::vector<DialogTopic> &dialog,
// Read the dialog lines
//
- // TODO: investigate this: these strings were read much simplier in the editor, see code:
+ // TODO: investigate this: these strings were read much simpler in the editor, see code:
/*
char stringbuffer[1000];
for (bb=0;bb<thisgame.numdlgmessage;bb++) {
Commit: c7ddfdeab50a927b1f4832d93f617d3ff11ee364
https://github.com/scummvm/scummvm/commit/c7ddfdeab50a927b1f4832d93f617d3ff11ee364
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-15T20:50:41+03:00
Commit Message:
JANITORIAL: Fix optmizations and loosing typos in test_gfx.cpp
Changed paths:
engines/ags/tests/test_gfx.cpp
diff --git a/engines/ags/tests/test_gfx.cpp b/engines/ags/tests/test_gfx.cpp
index ab0fa0ccffd..cde5af78d7f 100644
--- a/engines/ags/tests/test_gfx.cpp
+++ b/engines/ags/tests/test_gfx.cpp
@@ -43,7 +43,7 @@ void Test_GfxSpeed(bool enableSimd, size_t blenderModeStart, size_t blenderModeE
uint oldSimdFlags = _G(simd_flags);
if (!enableSimd) _G(simd_flags) = AGS3::Globals::SIMD_NONE;
if (enableSimd) debug("SIMD optimizations: true\n");
- else debug("SIMD optmizations: false\n");
+ else debug("SIMD optimizations: false\n");
Bitmap *benchgfx32 = BitmapHelper::CreateBitmap(100, 100, 32);
Bitmap *benchgfx16 = BitmapHelper::CreateBitmapCopy(benchgfx32, 16);
Bitmap *benchgfx8 = BitmapHelper::CreateBitmap(100, 100, 8);
@@ -250,7 +250,7 @@ void Test_BlenderModes() {
void Test_GfxTransparency() {
// Test that every transparency which is a multiple of 10 is converted
- // forth and back without loosing precision
+ // forth and back without losing precision
const size_t arr_sz = 11;
const int trans100[arr_sz] = { 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 };
int trans255[arr_sz] = { 0 };
More information about the Scummvm-git-logs
mailing list