[Scummvm-git-logs] scummvm master -> b465fc45f85ae17f895e85e05a116df161d4ee64
neuromancer
noreply at scummvm.org
Fri Sep 25 11:46:48 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
b465fc45f8 COLONY: removed use of static keyword
Commit: b465fc45f85ae17f895e85e05a116df161d4ee64
https://github.com/scummvm/scummvm/commit/b465fc45f85ae17f895e85e05a116df161d4ee64
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-09-25T13:46:39+02:00
Commit Message:
COLONY: removed use of static keyword
Changed paths:
engines/colony/animation.cpp
engines/colony/battle.cpp
engines/colony/colony.h
engines/colony/console.cpp
engines/colony/gfx.cpp
engines/colony/intro.cpp
engines/colony/render.cpp
engines/colony/render_internal.h
engines/colony/renderer_opengl_shaders.cpp
engines/colony/sound.cpp
engines/colony/ui.cpp
diff --git a/engines/colony/animation.cpp b/engines/colony/animation.cpp
index 97be2242e79..8c3ea9e87aa 100644
--- a/engines/colony/animation.cpp
+++ b/engines/colony/animation.cpp
@@ -1017,7 +1017,7 @@ void ColonyEngine::loadCoderTiles() {
delete imgs[i];
}
-static void drawCoderTile(Graphics::ManagedSurface &s, const Image *img, int x, int y, uint32 fg, uint32 bg) {
+void drawCoderTile(Graphics::ManagedSurface &s, const Image *img, int x, int y, uint32 fg, uint32 bg) {
if (!img || !img->data)
return;
for (int r = 0; r < img->height; r++) {
diff --git a/engines/colony/battle.cpp b/engines/colony/battle.cpp
index 90ecaf7c7db..cd63bf70ec7 100644
--- a/engines/colony/battle.cpp
+++ b/engines/colony/battle.cpp
@@ -452,6 +452,7 @@ void ColonyEngine::battleInit() {
_battleShip.look = _battleShip.ang = 32;
_battleRound = 0;
+ _battleSendFarX = false;
_projon = false;
_pcount = 0;
@@ -1073,8 +1074,6 @@ void ColonyEngine::battleCommand(int xnew, int ynew) {
}
void ColonyEngine::battleShoot() {
- static bool s_sendFarX = false;
-
if (_me.power[0] <= 0 || _weapons <= 0 || _fl)
return;
@@ -1113,14 +1112,14 @@ void ColonyEngine::battleShoot() {
target->power[1] -= battlePowerLevel(_me.power[0]);
if (target->power[1] < 0) {
target->power[1] = 15 + (_randomSource.getRandomNumber(0x0F) & 0x0F);
- if (s_sendFarX) {
+ if (_battleSendFarX) {
target->xloc = battleNormalizeCoord(_me.xloc + 16000);
target->yloc = battleNormalizeCoord(_me.yloc + _randomSource.getRandomNumber(0x7FFF));
} else {
target->xloc = battleNormalizeCoord(_me.xloc + _randomSource.getRandomNumber(0x7FFF));
target->yloc = battleNormalizeCoord(_me.yloc + 16000);
}
- s_sendFarX = !s_sendFarX;
+ _battleSendFarX = !_battleSendFarX;
_sound->play(Sound::kExplode);
}
}
diff --git a/engines/colony/colony.h b/engines/colony/colony.h
index decc2a5d8f2..429a8abe7a2 100644
--- a/engines/colony/colony.h
+++ b/engines/colony/colony.h
@@ -61,9 +61,8 @@ class Sound;
// with the high byte == 0xFF as direct ARGB (R=bits 16-23, G=8-15, B=0-7) and
// values with high byte 0 as palette indices. The PixelFormat below matches
// that direct-ARGB layout exactly so we can build colors via ARGBToColor.
-inline const Graphics::PixelFormat &renderColorFormat() {
- static const Graphics::PixelFormat fmt(4, 8, 8, 8, 8, 16, 8, 0, 24);
- return fmt;
+inline Graphics::PixelFormat renderColorFormat() {
+ return Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24);
}
inline uint32 packRGB(byte r, byte g, byte b) {
@@ -155,7 +154,7 @@ enum RobotType {
// Capped at 112 so the robot keeps at least 32 units of movement freedom
// within a 256-unit cell (256 - 2*112 = 32).
inline int robotWallPad(int robotType) {
- static const int kMaxPad = 112;
+ const int kMaxPad = 112;
switch (robotType) {
case kRobEye: return 66;
case kRobPyramid:
@@ -338,8 +337,8 @@ enum MenuIndex {
uint8 objWorldAng(uint8 objectAng);
uint8 objAngFromPlayer(uint8 playerAng);
-static const int kBaseObject = 20;
-static const int kMeNum = 101;
+const int kBaseObject = 20;
+const int kMeNum = 101;
struct Locate {
uint8 ang = 0;
@@ -630,6 +629,7 @@ private:
int _mountains[256]; // mountain height profile
int _battledx = 0; // mountain parallax divisor (Width/59)
int _battleRound = 0; // AI round-robin counter
+ bool _battleSendFarX = false; // alternate robot respawn axis
Locate *_battlePwh[100] = {}; // visible object pointers (for hit detection)
int _battleMaxP = 0; // count of visible objects
Locate _pyramids[4][4][15]; // pyramid obstacles: 4x4 quadrants, 15 each
@@ -814,7 +814,6 @@ private:
void drawDashboardMac();
void drawDOSBarGraph(int x, int y, int height);
void updateDOSPowerBars();
- static int qlog(int32 x);
void drawMiniMapMarker(int x, int y, int halfSize, uint32 color, bool isMac, const Common::Rect *clip = nullptr);
bool hasRobotAt(int x, int y) const;
bool hasFoodAt(int x, int y) const;
diff --git a/engines/colony/console.cpp b/engines/colony/console.cpp
index 873c42cc9b3..6f73c1ac626 100644
--- a/engines/colony/console.cpp
+++ b/engines/colony/console.cpp
@@ -441,7 +441,7 @@ bool Debugger::cmdGoals(int argc, const char **argv) {
}
bool Debugger::cmdWin(int argc, const char **argv) {
- static const char *const endingDescriptions[] = {
+ const char *const endingDescriptions[] = {
"planet destroyed, all 6 cryos recovered",
"planet destroyed, some cryos recovered",
"planet destroyed, no cryos recovered",
diff --git a/engines/colony/gfx.cpp b/engines/colony/gfx.cpp
index cc0f721ff41..aa96483488b 100644
--- a/engines/colony/gfx.cpp
+++ b/engines/colony/gfx.cpp
@@ -66,7 +66,7 @@ Common::Point canvasToWindow(const Common::Rect &viewport, const Common::Point &
// primitive coverage up to parity. Note that the generic preference order
// in graphics/renderer.cpp:122 picks shaders for the Default case, so we
// must override it here.
-static Graphics::RendererType pickRendererType() {
+Graphics::RendererType pickRendererType() {
const Common::String configured = ConfMan.get("renderer");
const Graphics::RendererType desired = Graphics::Renderer::parseTypeCode(configured);
diff --git a/engines/colony/intro.cpp b/engines/colony/intro.cpp
index a3692482499..bab6ee7f1ce 100644
--- a/engines/colony/intro.cpp
+++ b/engines/colony/intro.cpp
@@ -543,7 +543,7 @@ bool ColonyEngine::scrollInfo(const Graphics::Font *macFont) {
// waits for click, then scrolls it off the top.
// Mac original: TextFont(190 = Commando); TextSize(12);
// Text blue starts at 0xFFFF and fades by -4096 per visible line.
- static const char *const kDosStory[] = {
+ const char *const kDosStory[] = {
"Mankind has left the",
"cradle of earth and",
"is beginning to eye",
@@ -558,7 +558,7 @@ bool ColonyEngine::scrollInfo(const Graphics::Font *macFont) {
"Press any key to begin",
"the Adventure..."
};
- static const char *const kMacStory[] = {
+ const char *const kMacStory[] = {
"",
"Mankind has left the",
"cradle of earth and",
diff --git a/engines/colony/render.cpp b/engines/colony/render.cpp
index d4e2b3cfa0a..66fdb975f44 100644
--- a/engines/colony/render.cpp
+++ b/engines/colony/render.cpp
@@ -143,14 +143,14 @@ const DOSColorEntry g_dosColors[79] = {
// Look up the DOS lsColor entry for a given ObjColor index.
// Returns a fallback entry for out-of-range indices.
-const DOSColorEntry &lookupDOSColor(int colorIdx, int level) {
+DOSColorEntry lookupDOSColor(int colorIdx, int level) {
// DOS pcycle for animated reactor/suit: WHITE,LTGRAY,GRAY,DKGRAY,BLACK (bounce)
- static const DOSColorEntry kHCore1 = {0, 0, 15, 15, 15, 1}; // WHITE
- static const DOSColorEntry kHCore2 = {1, 8, 8, 15, 8, 3}; // LTGRAY
- static const DOSColorEntry kHCore3 = {2, 8, 8, 7, 8, 3}; // GRAY
- static const DOSColorEntry kHCore4 = {3, 0, 8, 8, 8, 1}; // DKGRAY
- static const DOSColorEntry kCCoreEntry = {0, 0, 15, 15, 15, 1}; // WHITE (cold core)
- static const DOSColorEntry fallback = {2, 0, 0, 0, 0, 1}; // GRAY monochrome
+ const DOSColorEntry kHCore1 = {0, 0, 15, 15, 15, 1}; // WHITE
+ const DOSColorEntry kHCore2 = {1, 8, 8, 15, 8, 3}; // LTGRAY
+ const DOSColorEntry kHCore3 = {2, 8, 8, 7, 8, 3}; // GRAY
+ const DOSColorEntry kHCore4 = {3, 0, 8, 8, 8, 1}; // DKGRAY
+ const DOSColorEntry kCCoreEntry = {0, 0, 15, 15, 15, 1}; // WHITE (cold core)
+ const DOSColorEntry fallback = {2, 0, 0, 0, 0, 1}; // GRAY monochrome
if (colorIdx >= 0 && colorIdx < 79)
return g_dosColors[colorIdx];
@@ -209,7 +209,7 @@ void setupDOSFill(Renderer *gfx, uint32 fillColor, uint32 backColor, int pattern
}
uint32 setupDOSMaterial(Renderer *gfx, int colorIdx, int level) {
- const DOSColorEntry &color = lookupDOSColor(colorIdx, level);
+ const DOSColorEntry color = lookupDOSColor(colorIdx, level);
setupDOSFill(gfx, color.fillColor, color.backColor, color.pattern);
return color.lineFillColor;
}
@@ -651,7 +651,7 @@ void ColonyEngine::draw3DPrism(Thing &obj, const PrismPartDef &def, bool useLook
// EGA: per-surface materials from the DOS lsColor table.
// polyfill ON → FILLCOLOR/BACKCOLOR/PATTERN fill, LINEFILLCOLOR outline.
// polyfill OFF → outline only with LINECOLOR.
- const DOSColorEntry &dc = lookupDOSColor(colorIdx, _level);
+ const DOSColorEntry dc = lookupDOSColor(colorIdx, _level);
if (!_wireframe) {
const uint32 outlineColor = setupDOSMaterial(_gfx, colorIdx, _level);
_gfx->draw3DPolygon(px, py, pz, count, outlineColor);
@@ -847,8 +847,8 @@ void ColonyEngine::draw3DSphere(Thing &obj, int pt0x, int pt0y, int pt0z,
} else if (!isMacRenderMode()) {
// DOS eye ovals are independent of the polygon-fill toggle. FillOval()
// uses the selected material while FrameOval() uses the caller's pen.
- const DOSColorEntry &fill = lookupDOSColor((int)fillColor, _level);
- const DOSColorEntry &outline = lookupDOSColor((int)outlineColor, _level);
+ const DOSColorEntry fill = lookupDOSColor((int)fillColor, _level);
+ const DOSColorEntry outline = lookupDOSColor((int)outlineColor, _level);
if (dosFill)
setupDOSFill(_gfx, fill.fillColor, fill.backColor, fill.pattern);
else {
diff --git a/engines/colony/render_internal.h b/engines/colony/render_internal.h
index 48b1acdb354..6996480e276 100644
--- a/engines/colony/render_internal.h
+++ b/engines/colony/render_internal.h
@@ -61,12 +61,12 @@ enum MacPattern {
// Internal-only surface color for Mac wall helper objects (FWALL/CWALL).
// In the original Mac renderer these use c_lwall/c_dwall, which are
// special corridor-wall colors rather than normal material palette entries.
-static const int kColorCorridorWall = 1000;
+const int kColorCorridorWall = 1000;
// GL_POLYGON_STIPPLE patterns: 32x32 bit arrays (128 bytes), tiled from 8x8 Mac patterns.
// Bit=1 → fragment drawn (black foreground), bit=0 → fragment discarded (white background shows).
// Mac QuickDraw convention: bit=1 = foreground (BLACK), bit=0 = background (WHITE).
-static const byte kStippleLtGray[128] = {
+const byte kStippleLtGray[128] = {
// 0x88,0x22 alternating rows = 25% coverage (sparse dots)
0x88,0x88,0x88,0x88, 0x22,0x22,0x22,0x22, 0x88,0x88,0x88,0x88, 0x22,0x22,0x22,0x22,
0x88,0x88,0x88,0x88, 0x22,0x22,0x22,0x22, 0x88,0x88,0x88,0x88, 0x22,0x22,0x22,0x22,
@@ -78,7 +78,7 @@ static const byte kStippleLtGray[128] = {
0x88,0x88,0x88,0x88, 0x22,0x22,0x22,0x22, 0x88,0x88,0x88,0x88, 0x22,0x22,0x22,0x22,
};
-static const byte kStippleGray[128] = {
+const byte kStippleGray[128] = {
// 0xAA,0x55 alternating rows = 50% coverage (checkerboard)
0xAA,0xAA,0xAA,0xAA, 0x55,0x55,0x55,0x55, 0xAA,0xAA,0xAA,0xAA, 0x55,0x55,0x55,0x55,
0xAA,0xAA,0xAA,0xAA, 0x55,0x55,0x55,0x55, 0xAA,0xAA,0xAA,0xAA, 0x55,0x55,0x55,0x55,
@@ -92,7 +92,7 @@ static const byte kStippleGray[128] = {
// DOS FILLPATTERN 5 from METAWNDO.EXE: 12.5% foreground coverage.
// The driver's 8x8 rows (88 00 22 00 88 00 22 00) are tiled to 32x32.
-static const byte kDOSStipplePattern5[128] = {
+const byte kDOSStipplePattern5[128] = {
0x88,0x88,0x88,0x88, 0x00,0x00,0x00,0x00, 0x22,0x22,0x22,0x22, 0x00,0x00,0x00,0x00,
0x88,0x88,0x88,0x88, 0x00,0x00,0x00,0x00, 0x22,0x22,0x22,0x22, 0x00,0x00,0x00,0x00,
0x88,0x88,0x88,0x88, 0x00,0x00,0x00,0x00, 0x22,0x22,0x22,0x22, 0x00,0x00,0x00,0x00,
@@ -103,7 +103,7 @@ static const byte kDOSStipplePattern5[128] = {
0x88,0x88,0x88,0x88, 0x00,0x00,0x00,0x00, 0x22,0x22,0x22,0x22, 0x00,0x00,0x00,0x00,
};
-static const byte kStippleDkGray[128] = {
+const byte kStippleDkGray[128] = {
// 0x77,0xDD alternating rows = 75% coverage (dense dots)
0x77,0x77,0x77,0x77, 0xDD,0xDD,0xDD,0xDD, 0x77,0x77,0x77,0x77, 0xDD,0xDD,0xDD,0xDD,
0x77,0x77,0x77,0x77, 0xDD,0xDD,0xDD,0xDD, 0x77,0x77,0x77,0x77, 0xDD,0xDD,0xDD,0xDD,
@@ -116,7 +116,7 @@ static const byte kStippleDkGray[128] = {
};
// Lookup: MacPattern enum → GL stipple data pointer (null for solid/clear patterns)
-static const byte *kMacStippleData[] = {
+const byte *const kMacStippleData[] = {
nullptr, // kPatternWhite - solid white, no stipple
kStippleLtGray, // kPatternLtGray - 25% black dots
kStippleGray, // kPatternGray - 50% checkerboard
diff --git a/engines/colony/renderer_opengl_shaders.cpp b/engines/colony/renderer_opengl_shaders.cpp
index bdd1034bebf..5bc655fced7 100644
--- a/engines/colony/renderer_opengl_shaders.cpp
+++ b/engines/colony/renderer_opengl_shaders.cpp
@@ -194,14 +194,14 @@ OpenGLShaderRenderer::OpenGLShaderRenderer(OSystem *system, int width, int heigh
for (int i = 0; i < 256 * 3; i++)
_palette[i] = 255;
- static const char *solidAttribs[] = { "position", nullptr };
+ const char *const solidAttribs[] = { "position", nullptr };
_solidShader = OpenGL::Shader::fromFiles("colony_solid", solidAttribs);
_solidVBO = OpenGL::Shader::createBuffer(GL_ARRAY_BUFFER,
sizeof(float) * 2 * kSolidVertexCapacity, nullptr, GL_DYNAMIC_DRAW);
_solidShader->enableVertexAttribute("position", _solidVBO, 2, GL_FLOAT, GL_FALSE,
2 * sizeof(float), 0);
- static const char *bitmapAttribs[] = { "position", "texcoord", nullptr };
+ const char *const bitmapAttribs[] = { "position", "texcoord", nullptr };
_bitmapShader = OpenGL::Shader::fromFiles("colony_bitmap", bitmapAttribs);
// Per-draw vec2 position + vec2 texcoord, 4 vertices for a quad.
_bitmapVBO = OpenGL::Shader::createBuffer(GL_ARRAY_BUFFER,
@@ -214,7 +214,7 @@ OpenGLShaderRenderer::OpenGLShaderRenderer(OSystem *system, int width, int heigh
// 3D solid: vec3 vertex consuming mvpMatrix; the fragment shader has
// its own stipple-emulation branch (Freescape pattern, GLES2 safe),
// so we use a dedicated colony_solid_3d.{vertex,fragment} pair.
- static const char *solid3dAttribs[] = { "position", nullptr };
+ const char *const solid3dAttribs[] = { "position", nullptr };
_solid3dShader = OpenGL::Shader::fromFiles("colony_solid_3d", solid3dAttribs);
_solid3dVBO = OpenGL::Shader::createBuffer(GL_ARRAY_BUFFER,
sizeof(float) * 3 * kSolid3DVertexCapacity, nullptr, GL_DYNAMIC_DRAW);
diff --git a/engines/colony/sound.cpp b/engines/colony/sound.cpp
index 0356757541c..5d355e27149 100644
--- a/engines/colony/sound.cpp
+++ b/engines/colony/sound.cpp
@@ -60,28 +60,28 @@ const uint32 kRestDivider = 0;
// Ambient DOS intro phrases from COLDAT.ASM.
// These are sparse note patterns with long rests; exact VSP note decoding
// is not available here, so we map them to stable PC speaker dividers.
-static const MelodyStep kStars1Phrase[] = {
+const MelodyStep kStars1Phrase[] = {
{ 4831, 3 }, { kRestDivider, 3 }, { kRestDivider, 3 }, { kRestDivider, 3 },
{ 4063, 3 }, { kRestDivider, 3 }, { kRestDivider, 3 }, { kRestDivider, 3 },
{ 1811, 3 }, { kRestDivider, 3 }, { kRestDivider, 3 }, { kRestDivider, 3 },
{ 1715, 3 }, { kRestDivider, 3 }
};
-static const MelodyStep kStars2Phrase[] = {
+const MelodyStep kStars2Phrase[] = {
{ 4831, 3 }, { kRestDivider, 3 }, { kRestDivider, 3 }, { 2712, 3 },
{ 4063, 3 }, { kRestDivider, 3 }, { kRestDivider, 3 }, { 2032, 3 },
{ 1811, 3 }, { kRestDivider, 3 }, { kRestDivider, 3 }, { 9121, 3 },
{ 1715, 3 }, { kRestDivider, 3 }
};
-static const MelodyStep kStars3Phrase[] = {
+const MelodyStep kStars3Phrase[] = {
{ 4831, 3 }, { kRestDivider, 3 }, { 9121, 3 }, { 2712, 3 },
{ 4063, 3 }, { kRestDivider, 3 }, { 7670, 3 }, { 2032, 3 },
{ 1811, 3 }, { kRestDivider, 3 }, { 4560, 3 }, { 9121, 3 },
{ 1715, 3 }, { kRestDivider, 3 }
};
-static const MelodyStep kStars4Phrase[] = {
+const MelodyStep kStars4Phrase[] = {
{ 4831, 3 }, { 1524, 3 }, { 9121, 3 }, { 2712, 3 },
{ 4063, 3 }, { 4831, 3 }, { 7670, 3 }, { 2032, 3 },
{ 1811, 3 }, { 3044, 3 }, { 4560, 3 }, { 9121, 3 },
diff --git a/engines/colony/ui.cpp b/engines/colony/ui.cpp
index 28b718ec27a..a3fe21f602d 100644
--- a/engines/colony/ui.cpp
+++ b/engines/colony/ui.cpp
@@ -51,7 +51,7 @@ enum MacTextPopupStyle {
kMacInformWindow
};
-static Graphics::ManagedSurface *captureMessageBackground(Renderer *gfx, int width, int height) {
+Graphics::ManagedSurface *captureMessageBackground(Renderer *gfx, int width, int height) {
if (!gfx)
return nullptr;
@@ -67,7 +67,7 @@ static Graphics::ManagedSurface *captureMessageBackground(Renderer *gfx, int wid
return saved;
}
-static void restoreMessageBackground(Renderer *gfx, Graphics::ManagedSurface *saved) {
+void restoreMessageBackground(Renderer *gfx, Graphics::ManagedSurface *saved) {
if (!saved)
return;
if (gfx) {
@@ -78,7 +78,7 @@ static void restoreMessageBackground(Renderer *gfx, Graphics::ManagedSurface *sa
delete saved;
}
-static void animateMacZoom(Renderer *gfx, OSystem *system, const Common::Rect &from, const Common::Rect &to) {
+void animateMacZoom(Renderer *gfx, OSystem *system, const Common::Rect &from, const Common::Rect &to) {
if (!gfx || !system || from.isEmpty() || to.isEmpty())
return;
@@ -102,7 +102,7 @@ static void animateMacZoom(Renderer *gfx, OSystem *system, const Common::Rect &f
CursorMan.showMouse(cursorWasVisible);
}
-static bool drawMacTextPopup(Graphics::MacWindowManager *wm, Renderer *gfx,
+bool drawMacTextPopup(Graphics::MacWindowManager *wm, Renderer *gfx,
int screenWidth, int screenHeight, int centerX, int centerY,
const Common::Array<Common::String> &lines, Graphics::TextAlign align, bool macColor,
int visibleLineCount = -1, Common::Rect *popupBounds = nullptr,
@@ -483,7 +483,7 @@ void ColonyEngine::updateViewportLayout() {
}
// DASHBOAR.C qlog(): bit-length of x (equivalent to floor(log2(x))+1)
-int ColonyEngine::qlog(int32 x) {
+int qlog(int32 x) {
int i = 0;
while (x > 0) {
x >>= 1;
@@ -1326,7 +1326,7 @@ void ColonyEngine::loadForkliftIcons() {
_flIconsLoaded = true;
// c_box1, c_cryo, c_teleport, c_ccore
- static const int kBgColorIdx[5] = { -1, 84, 90, 93, 111 };
+ const int kBgColorIdx[5] = { -1, 84, 90, 93, 111 };
const uint32 white = packRGB(255, 255, 255);
const uint32 black = packRGB(0, 0, 0);
@@ -1412,7 +1412,7 @@ void ColonyEngine::drawForkliftOverlay() {
} else {
// IBM_DISP.C: framed white box at the bottom center naming the
// fork state, black text on vINTWHITE.
- static const char *fltext[5] = { "EMPTY", "BOX", "CRYO", "TELEPORT", "REACTOR" };
+ const char *const fltext[5] = { "EMPTY", "BOX", "CRYO", "TELEPORT", "REACTOR" };
Graphics::DosFont font;
const int half = 4 + font.getStringWidth(fltext[fnum]) / 2;
const Common::Rect r(_centerX - half, _screenR.bottom - 15, _centerX + half, _screenR.bottom - 1);
More information about the Scummvm-git-logs
mailing list