[Scummvm-git-logs] scummvm master -> ef38ef4f9a57c8cea8e07d65d6e31ad914b0c680
aquadran
aquadran at gmail.com
Sun Mar 7 20:56:48 UTC 2021
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:
ef38ef4f9a ICB: More cleanup int->int32
Commit: ef38ef4f9a57c8cea8e07d65d6e31ad914b0c680
https://github.com/scummvm/scummvm/commit/ef38ef4f9a57c8cea8e07d65d6e31ad914b0c680
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-03-07T21:56:44+01:00
Commit Message:
ICB: More cleanup int->int32
Changed paths:
engines/icb/actor.cpp
engines/icb/animation_mega_set.cpp
engines/icb/breath.cpp
engines/icb/configfile.h
engines/icb/gfx/gfxstub_dutch.h
engines/icb/gfx/rlp_api.h
engines/icb/icon_menu.h
engines/icb/jpeg.h
engines/icb/main_menu.h
engines/icb/options_manager_pc.cpp
engines/icb/p4.h
engines/icb/prim_route_builder.cpp
engines/icb/remora.cpp
engines/icb/set.cpp
engines/icb/timer_func.cpp
diff --git a/engines/icb/actor.cpp b/engines/icb/actor.cpp
index 7db1405324..aca6dbc66f 100644
--- a/engines/icb/actor.cpp
+++ b/engines/icb/actor.cpp
@@ -99,7 +99,7 @@ int32 QuickActorCull(psxCamera *camera, VECTOR *pos, SVECTOR *orient) {
SVECTOR *scrn = bboxScrn;
int32 z0;
int32 p, flag;
- int i;
+ int32 i;
// Set the local-screen matrix in the GTE
gte_SetRotMatrix(&ls);
diff --git a/engines/icb/animation_mega_set.cpp b/engines/icb/animation_mega_set.cpp
index 0030808ca0..1167740547 100644
--- a/engines/icb/animation_mega_set.cpp
+++ b/engines/icb/animation_mega_set.cpp
@@ -162,7 +162,7 @@ void _vox_image::___init(const char *chr, const char *set, __weapon weapon) {
// where chr='cord'
// set='casual_wear'
- int k, len;
+ int32 k, len;
// check for no weapon being set
if (weapon == __NOT_SET)
@@ -227,11 +227,11 @@ void _vox_image::___init(const char *chr, const char *set, __weapon weapon) {
Zdebug("\n-------------------------------------------------------------------------------\n");
}
-void _vox_image::MakeAnimEntry(int i) {
+void _vox_image::MakeAnimEntry(int32 i) {
// make name
char name[ANIM_NAME_STR_LEN];
- int len;
+ int32 len;
len = sprintf(name, "%s%s.rab", (const char *)image_path, (const char *)master_anim_name_table[i].name);
@@ -405,7 +405,7 @@ __mega_set_names _game_session::Fetch_generic_anim_from_ascii(const char *ascii_
void PreRegisterTexture(const char *, uint32, const char *, uint32, const char *, uint32);
bool8 _vox_image::Set_texture(const char *tex_name) {
- int len;
+ int32 len;
len = sprintf(texture_name, "%s.revtex", tex_name);
@@ -427,7 +427,7 @@ bool8 _vox_image::Set_texture(const char *tex_name) {
bool8 _vox_image::Set_mesh(const char *m_name) {
char name[32];
- int len;
+ int32 len;
strcpy(name, m_name);
strcat(name, ".rap");
@@ -447,7 +447,7 @@ bool8 _vox_image::Set_palette(const char *pal_name) {
return TRUE8;
}
- int len;
+ int32 len;
len = sprintf(palette_name, "%s.revtex", pal_name);
diff --git a/engines/icb/breath.cpp b/engines/icb/breath.cpp
index a9acf6b838..546ed853e3 100644
--- a/engines/icb/breath.cpp
+++ b/engines/icb/breath.cpp
@@ -98,7 +98,7 @@ Breath::Breath() {
void Breath::Init() {
breathEnd = (int16)(BREATH_WAIT);
- int i;
+ int32 i;
for (i = 0; i < MAX_BREATH; i++) {
breathStarted[i] = 0;
@@ -116,8 +116,8 @@ void Breath::Init() {
// update the breath every cycle
void Breath::Update() {
if (on) {
- int i;
- int numberStarted;
+ int32 i;
+ int32 numberStarted;
numberStarted = 0;
diff --git a/engines/icb/configfile.h b/engines/icb/configfile.h
index 50fcce6784..a39da64f24 100644
--- a/engines/icb/configfile.h
+++ b/engines/icb/configfile.h
@@ -40,7 +40,7 @@ public:
ConfigFile();
void writeSetting(const Common::String §ion, const Common::String &key, const Common::String &value) {}
Common::String readSetting(const Common::String §ion, const Common::String &key, const Common::String &defaultValue) const;
- int readIntSetting(const Common::String §ion, const Common::String &key, int defaultValue) const;
+ int32 readIntSetting(const Common::String §ion, const Common::String &key, int defaultValue) const;
void readFile(const Common::String &filename);
};
diff --git a/engines/icb/gfx/gfxstub_dutch.h b/engines/icb/gfx/gfxstub_dutch.h
index a72bbed05d..d4983aa470 100644
--- a/engines/icb/gfx/gfxstub_dutch.h
+++ b/engines/icb/gfx/gfxstub_dutch.h
@@ -39,8 +39,8 @@ typedef struct {
} RevRenderDevice;
typedef struct {
- int x, y; // fixed-point 16:16
- int u, v; // fixed-point 16:16
+ int32 x, y; // fixed-point 16:16
+ int32 u, v; // fixed-point 16:16
uint32 colour; // B, G, R, alpha (low->high mem)
} vertex2D;
@@ -54,34 +54,34 @@ typedef struct {
class TextureHandle;
TextureHandle *RegisterTexture(const RevTexture *revInput);
-int UnregisterTexture(TextureHandle *);
+int32 UnregisterTexture(TextureHandle *);
-int SetTextureState(TextureHandle *texture);
-int GetTextureState(TextureHandle *texture);
+int32 SetTextureState(TextureHandle *texture);
+int32 GetTextureState(TextureHandle *texture);
-int SetRenderDevice(RevRenderDevice *renderDev);
-int GetRenderDevice(RevRenderDevice *renderDev);
+int32 SetRenderDevice(RevRenderDevice *renderDev);
+int32 GetRenderDevice(RevRenderDevice *renderDev);
// Colour is verts[0].colour
-int DrawFlatUnTexturedPolygon(const vertex2D *verts, int nVerts, uint16 z);
+int32 DrawFlatUnTexturedPolygon(const vertex2D *verts, int nVerts, uint16 z);
-int DrawGouraudUnTexturedPolygon(const vertex2D *verts, int nVerts, uint16 z);
+int32 DrawGouraudUnTexturedPolygon(const vertex2D *verts, int nVerts, uint16 z);
// Colour is verts[0].colour
-int DrawFlatTexturedPolygon(const vertex2D *verts, int nVerts, uint16 z);
+int32 DrawFlatTexturedPolygon(const vertex2D *verts, int nVerts, uint16 z);
-int DrawGouraudTexturedPolygon(const vertex2D *verts, int nVerts, uint16 z);
+int32 DrawGouraudTexturedPolygon(const vertex2D *verts, int nVerts, uint16 z);
// Colour is verts[0].colour
-int DrawFlatTexturedTransparentPolygon(const vertex2D *verts, int nVerts, uint16 z);
+int32 DrawFlatTexturedTransparentPolygon(const vertex2D *verts, int nVerts, uint16 z);
-int DrawGouraudTexturedTransparentPolygon(const vertex2D *verts, int nVerts, uint16 z);
+int32 DrawGouraudTexturedTransparentPolygon(const vertex2D *verts, int nVerts, uint16 z);
-static const int GFXLIB_TRANSPARENT_COLOUR = 0xDEADBEAF;
+static const int32 GFXLIB_TRANSPARENT_COLOUR = 0xDEADBEAF;
// This value CANNOT be changed
-static const int GFXLIB_TRANSPARENT_INDEX = 0x00000000;
+static const int32 GFXLIB_TRANSPARENT_INDEX = 0x00000000;
void ClearProcessorState(void);
diff --git a/engines/icb/gfx/rlp_api.h b/engines/icb/gfx/rlp_api.h
index d24e4f7151..fde10e0892 100644
--- a/engines/icb/gfx/rlp_api.h
+++ b/engines/icb/gfx/rlp_api.h
@@ -143,10 +143,10 @@ typedef struct ShadeTriangle {
SVECTOR n12; // normal to plane & line 12
SVECTOR n20; // normal to plane & line 20
SVECTOR pn; // plane normal
- int d; // plane distance
- int n01dots0; // n01 . vertex 0
- int n12dots1; // n12 . vertex 1
- int n20dots2; // n20 . vertex 2
+ int32 d; // plane distance
+ int32 n01dots0; // n01 . vertex 0
+ int32 n12dots1; // n12 . vertex 1
+ int32 n20dots2; // n20 . vertex 2
} ShadeTriangle;
// A quad
@@ -161,11 +161,11 @@ typedef struct ShadeQuad {
SVECTOR n23; // normal to plane & line 23
SVECTOR n30; // normal to plane & line 30
SVECTOR pn; // plane normal
- int d; // plane distance
- int n01dots0; // n01 . vertex 0
- int n12dots1; // n12 . vertex 1
- int n23dots2; // n23 . vertex 2
- int n30dots3; // n30 . vertex 3
+ int32 d; // plane distance
+ int32 n01dots0; // n01 . vertex 0
+ int32 n12dots1; // n12 . vertex 1
+ int32 n23dots2; // n23 . vertex 2
+ int32 n30dots3; // n30 . vertex 3
} ShadeQuad;
typedef struct PSXShade {
@@ -192,16 +192,16 @@ typedef struct rlp_API {
PSXrgb ambient;
// Byte offsets
uint32 lampOffsets[1]; // actually lampOffsets[nLamps]
- inline PSXLamp *GetLamp(const int l);
+ inline PSXLamp *GetLamp(const int32 l);
inline uint32 *GetShadeOffsets(void);
- inline PSXShade *GetShade(const int s);
+ inline PSXShade *GetShade(const int32 s);
} rlp_API;
-inline PSXLamp *rlp_API::GetLamp(const int l) { return (PSXLamp *)(id + lampOffsets[l]); }
+inline PSXLamp *rlp_API::GetLamp(const int32 l) { return (PSXLamp *)(id + lampOffsets[l]); }
inline uint32 *rlp_API::GetShadeOffsets(void) { return (uint32 *)(id + shadeOffsetsOffset); }
-inline PSXShade *rlp_API::GetShade(const int s) {
+inline PSXShade *rlp_API::GetShade(const int32 s) {
uint32 *shadeOffsets = GetShadeOffsets();
return (PSXShade *)(id + shadeOffsets[s]);
}
diff --git a/engines/icb/icon_menu.h b/engines/icb/icon_menu.h
index 5f663c477c..65a2e60aed 100644
--- a/engines/icb/icon_menu.h
+++ b/engines/icb/icon_menu.h
@@ -96,7 +96,7 @@ public:
bool8 CycleIconMenu(const _input &sKeyboardState);
// Draw the special armed inventory
- void DrawArmedMenu(const int nBullets, const int32 maxBullets, const int32 nClips, const int32 maxClips);
+ void DrawArmedMenu(const int32 nBullets, const int32 maxBullets, const int32 nClips, const int32 maxClips);
// And this draws it each cycle.
void DrawIconMenu();
diff --git a/engines/icb/jpeg.h b/engines/icb/jpeg.h
index d6f5311fb7..d3ff6825b4 100644
--- a/engines/icb/jpeg.h
+++ b/engines/icb/jpeg.h
@@ -248,16 +248,16 @@ public:
uint32 ReadTable(JpegDecoder &);
// Function to decode the next value in the input stream.
- int Decode(JpegDecoder &);
+ int32 Decode(JpegDecoder &);
// This function builds the structures needed for Huffman
// decoding after the table data has been read.
void MakeTable(uint8 huffbits[JpegMaxHuffmanCodeLength]);
// Maximum Huffman code value of length N
- int maxcode[JpegMaxHuffmanCodeLength];
+ int32 maxcode[JpegMaxHuffmanCodeLength];
// Minimum Huffman code value of length N
- int mincode[JpegMaxHuffmanCodeLength];
+ int32 mincode[JpegMaxHuffmanCodeLength];
// Index into "values" for minimum code of length N
uint8 valptr[JpegMaxHuffmanCodeLength];
// Huffman values
@@ -391,7 +391,7 @@ public:
uint32 h_sampling;
// Last encoded DC value.
- int last_dc_value;
+ int32 last_dc_value;
// Entropy tables used by the component.
JpegHuffmanDecoder *ac_table;
diff --git a/engines/icb/main_menu.h b/engines/icb/main_menu.h
index 302233d22b..619cf423ad 100644
--- a/engines/icb/main_menu.h
+++ b/engines/icb/main_menu.h
@@ -35,7 +35,7 @@ void Pause_menu();
void Credits();
void ScrollingText();
-void InitisliaseScrollingText(const char *textFileName, const char *movieFileName, int frameStart);
+void InitisliaseScrollingText(const char *textFileName, const char *movieFileName, int32 frameStart);
void GameCompleted();
} // End of namespace ICB
diff --git a/engines/icb/options_manager_pc.cpp b/engines/icb/options_manager_pc.cpp
index bdab1c203b..8aa4f2c3cb 100644
--- a/engines/icb/options_manager_pc.cpp
+++ b/engines/icb/options_manager_pc.cpp
@@ -4898,7 +4898,7 @@ void OptionsManager::InitialiseControlsScreen() {
// Need to calculate printing margin
m_margin = 0;
uint32 margin = 0;
- // This ensures correct spacing for any translations (assuming this is the int32est heading thang)
+ // This ensures correct spacing for any translations (assuming this is the longest heading thang)
msg = GetTextFromReference(HashString("opt_controlmethod"));
margin = CalculateStringWidth(msg);
if (m_margin < margin)
diff --git a/engines/icb/p4.h b/engines/icb/p4.h
index 9158a6a113..cfa3e14256 100644
--- a/engines/icb/p4.h
+++ b/engines/icb/p4.h
@@ -144,7 +144,7 @@ class _stub {
__stub_modes mode[TOTAL_STUBS];
int32 stub; // stub level number
- int cycle_speed;
+ int32 cycle_speed;
private:
uint32 stub_timer_time;
bool8 timer; // on off
diff --git a/engines/icb/prim_route_builder.cpp b/engines/icb/prim_route_builder.cpp
index 4ea1ce82f4..ca1fbeecde 100644
--- a/engines/icb/prim_route_builder.cpp
+++ b/engines/icb/prim_route_builder.cpp
@@ -361,7 +361,7 @@ uint32 _prim_route_builder::ExtrapolateLine(_point *pSrc0, _point *pSrc1, _point
// pDst0, pDst1 -> Destination points!
_fpoint p0, p1;
- int swapped = 0;
+ int32 swapped = 0;
// Make sure points are going from left to right!
if (pSrc0->x < pSrc1->x) {
diff --git a/engines/icb/remora.cpp b/engines/icb/remora.cpp
index 597d2155bc..0a8391c579 100644
--- a/engines/icb/remora.cpp
+++ b/engines/icb/remora.cpp
@@ -236,7 +236,7 @@ void _remora::CycleRemoraLogic(const _input &sKeyboardState) {
// If text is scrolling, process the scroll.
if (m_bScrolling) {
- int scrollAmount = (256 * m_nCharacterHeight) / REMORA_SCROLL_CYCLES;
+ int32 scrollAmount = (256 * m_nCharacterHeight) / REMORA_SCROLL_CYCLES;
// See which way we're scrolling.
if (m_eTextScroll == SCROLL_UP) {
diff --git a/engines/icb/set.cpp b/engines/icb/set.cpp
index 94a33829f1..7ec913edd6 100644
--- a/engines/icb/set.cpp
+++ b/engines/icb/set.cpp
@@ -44,7 +44,7 @@ namespace ICB {
int32 _game_session::GetSelectedMegaId(void) {
selected_mega_id = -1;
if ((px.mega_hilite) && (player.interact_selected)) {
- int sel_id = player.cur_interact_id;
+ int32 sel_id = player.cur_interact_id;
if (logic_structs[sel_id]->image_type != PROP) {
selected_mega_id = player.cur_interact_id;
}
@@ -53,9 +53,9 @@ int32 _game_session::GetSelectedMegaId(void) {
}
void _game_session::GetSelectedMegaRGB(uint8 &r, uint8 &g, uint8 &b) {
- int newr = (uint8)g_mega_select_r + r;
- int newg = (uint8)g_mega_select_g + g;
- int newb = (uint8)g_mega_select_b + b;
+ int32 newr = (uint8)g_mega_select_r + r;
+ int32 newg = (uint8)g_mega_select_g + g;
+ int32 newb = (uint8)g_mega_select_b + b;
if (newr > 150)
newr = 150;
@@ -83,7 +83,7 @@ void _game_session::GetSelectedMegaRGB(uint8 &r, uint8 &g, uint8 &b) {
int32 _game_session::GetSelectedPropId(void) {
selected_prop_id = -1;
if ((px.prop_hilite) && (player.interact_selected)) {
- int sel_id = player.cur_interact_id;
+ int32 sel_id = player.cur_interact_id;
if (logic_structs[sel_id]->image_type == PROP) {
selected_prop_id = player.cur_interact_id;
}
diff --git a/engines/icb/timer_func.cpp b/engines/icb/timer_func.cpp
index a3251df95a..b63dd6f256 100644
--- a/engines/icb/timer_func.cpp
+++ b/engines/icb/timer_func.cpp
@@ -90,7 +90,7 @@ const short barXY[7][2] = {
#include "surface_manager.h"
-void DrawSegment(int x, int y, int dx, int dy, int danger) {
+void DrawSegment(int32 x, int32 y, int32 dx, int32 dy, int32 danger) {
uint8 *surface_address;
uint32 pitch;
@@ -121,9 +121,9 @@ void DrawSegment(int x, int y, int dx, int dy, int danger) {
}
// draw a digit using lcd display, -1 for the :
-void DrawDigit(int x, int y, int d, int danger) {
- int sx, sy, dx, dy;
- int i, dig;
+void DrawDigit(int32 x, int32 y, int32 d, int32 danger) {
+ int32 sx, sy, dx, dy;
+ int32 i, dig;
// special dash...
if (d == -1) {
@@ -156,8 +156,8 @@ void DrawDigit(int x, int y, int d, int danger) {
}
// draw mm:ss
-void DrawTime(int mins, int secs, int hs, int danger) {
- int x, y;
+void DrawTime(int32 mins, int32 secs, int32 hs, int32 danger) {
+ int32 x, y;
x = TIME_X;
y = TIME_Y;
@@ -187,7 +187,7 @@ void DrawTimer() {
if (!timerOn)
return;
- int mins, secs, cycles, totalSecs, hs, danger;
+ int32 mins, secs, cycles, totalSecs, hs, danger;
cycles = g_globalScriptVariables.GetVariable(timerVariable);
More information about the Scummvm-git-logs
mailing list