[Scummvm-git-logs] scummvm master -> f6077152d153d14d10b233a4187e4fd3932258e1
dreammaster
dreammaster at scummvm.org
Sun Feb 7 06:22:13 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:
f6077152d1 AGS: More standardization of int vs int32_t
Commit: f6077152d153d14d10b233a4187e4fd3932258e1
https://github.com/scummvm/scummvm/commit/f6077152d153d14d10b233a4187e4fd3932258e1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-02-06T22:22:04-08:00
Commit Message:
AGS: More standardization of int vs int32_t
Changed paths:
engines/ags/engine/gui/gui_engine.cpp
engines/ags/engine/script/cc_instance.cpp
engines/ags/engine/script/cc_instance.h
engines/ags/shared/ac/gamesetupstruct.cpp
engines/ags/shared/ac/gamesetupstructbase.h
engines/ags/shared/ac/inventoryiteminfo.h
engines/ags/shared/ac/spritecache.cpp
engines/ags/shared/ac/view.h
engines/ags/shared/game/interactions.cpp
engines/ags/shared/gui/guimain.cpp
engines/ags/shared/gui/guimain.h
diff --git a/engines/ags/engine/gui/gui_engine.cpp b/engines/ags/engine/gui/gui_engine.cpp
index 3a76b334fc..b248e3327a 100644
--- a/engines/ags/engine/gui/gui_engine.cpp
+++ b/engines/ags/engine/gui/gui_engine.cpp
@@ -80,7 +80,7 @@ bool GUIMain::HasAlphaChannel() const {
// Engine-specific implementation split out of acgui.h
//=============================================================================
-void check_font(int *fontnum) {
+void check_font(int32_t *fontnum) {
// do nothing
}
diff --git a/engines/ags/engine/script/cc_instance.cpp b/engines/ags/engine/script/cc_instance.cpp
index b9ba305bfa..cab7c8f729 100644
--- a/engines/ags/engine/script/cc_instance.cpp
+++ b/engines/ags/engine/script/cc_instance.cpp
@@ -1549,7 +1549,7 @@ bool ccInstance::AddGlobalVar(const ScriptVariable &glvar) {
*/
Debug::Printf(kDbgMsg_Warn, "WARNING: global variable refers to data beyond allocated buffer (%d, %d)", glvar.ScAddress, globaldatasize);
}
- globalvars->insert(std::make_pair(glvar.ScAddress, glvar));
+ globalvars->insert(std::make_pair((int)glvar.ScAddress, glvar));
return true;
}
diff --git a/engines/ags/engine/script/cc_instance.h b/engines/ags/engine/script/cc_instance.h
index efa176d30f..176a5502de 100644
--- a/engines/ags/engine/script/cc_instance.h
+++ b/engines/ags/engine/script/cc_instance.h
@@ -108,7 +108,7 @@ struct ScriptPosition {
struct ccInstance {
public:
// TODO: change to std:: if moved to C++11
- typedef std::unordered_map<int32_t, ScriptVariable> ScVarMap;
+ typedef std::unordered_map<int, ScriptVariable> ScVarMap;
typedef std::shared_ptr<ScVarMap> PScVarMap;
public:
int32_t flags;
diff --git a/engines/ags/shared/ac/gamesetupstruct.cpp b/engines/ags/shared/ac/gamesetupstruct.cpp
index 91d6e53e83..3e37b72023 100644
--- a/engines/ags/shared/ac/gamesetupstruct.cpp
+++ b/engines/ags/shared/ac/gamesetupstruct.cpp
@@ -127,7 +127,7 @@ void GameSetupStruct::read_font_infos(Shared::Stream *in, GameDataVersion data_v
for (int i = 0; i < numfonts; ++i) {
fonts[i].YOffset = in->ReadInt32();
if (data_ver >= kGameVersion_341_2)
- fonts[i].LineSpacing = Math::Max(0, in->ReadInt32());
+ fonts[i].LineSpacing = Math::Max((int32_t)0, in->ReadInt32());
}
} else {
for (int i = 0; i < numfonts; ++i) {
@@ -135,7 +135,7 @@ void GameSetupStruct::read_font_infos(Shared::Stream *in, GameDataVersion data_v
fonts[i].SizePt = in->ReadInt32();
fonts[i].Outline = in->ReadInt32();
fonts[i].YOffset = in->ReadInt32();
- fonts[i].LineSpacing = Math::Max(0, in->ReadInt32());
+ fonts[i].LineSpacing = Math::Max((int32_t)0, in->ReadInt32());
AdjustFontInfoUsingFlags(fonts[i], flags);
if (data_ver >= kGameVersion_351) {
fonts[i].AutoOutlineThickness = in->ReadInt32();
diff --git a/engines/ags/shared/ac/gamesetupstructbase.h b/engines/ags/shared/ac/gamesetupstructbase.h
index 41656ed5ee..870ac636c6 100644
--- a/engines/ags/shared/ac/gamesetupstructbase.h
+++ b/engines/ags/shared/ac/gamesetupstructbase.h
@@ -50,7 +50,7 @@ struct GameSetupStructBase {
static const int NUM_INTS_RESERVED = 17;
char gamename[GAME_NAME_LENGTH];
- int options[MAX_OPTIONS];
+ int32_t options[MAX_OPTIONS];
unsigned char paluses[256];
color defpal[256];
int numviews;
@@ -69,14 +69,14 @@ struct GameSetupStructBase {
int numcursors;
int default_lipsync_frame; // used for unknown chars
int invhotdotsprite;
- int reserved[NUM_INTS_RESERVED];
+ int32_t reserved[NUM_INTS_RESERVED];
char *messages[MAXGLOBALMES];
WordsDictionary *dict;
char *globalscript;
CharacterInfo *chars;
ccScript *compiled_script;
- int *load_messages;
+ int32_t *load_messages;
bool load_dictionary;
bool load_compiled_script;
// [IKM] 2013-03-30
diff --git a/engines/ags/shared/ac/inventoryiteminfo.h b/engines/ags/shared/ac/inventoryiteminfo.h
index ee4786613b..d02aeb2f98 100644
--- a/engines/ags/shared/ac/inventoryiteminfo.h
+++ b/engines/ags/shared/ac/inventoryiteminfo.h
@@ -23,6 +23,8 @@
#ifndef AGS_SHARED_AC_INVENTORYITEMINFO_H
#define AGS_SHARED_AC_INVENTORYITEMINFO_H
+#include "ags/shared/core/types.h"
+
namespace AGS3 {
namespace AGS {
@@ -38,7 +40,7 @@ struct InventoryItemInfo {
char name[25];
int pic;
int cursorPic, hotx, hoty;
- int reserved[5];
+ int32_t reserved[5];
char flags;
void ReadFromFile(Shared::Stream *in);
diff --git a/engines/ags/shared/ac/spritecache.cpp b/engines/ags/shared/ac/spritecache.cpp
index 8258e79028..0f1ed2b131 100644
--- a/engines/ags/shared/ac/spritecache.cpp
+++ b/engines/ags/shared/ac/spritecache.cpp
@@ -489,10 +489,10 @@ void SpriteCache::CompressSprite(Bitmap *sprite, Stream *out) {
cpackbitl(&sprite->GetScanLineForWriting(y)[0], sprite->GetWidth(), out);
} else if (depth == 2) {
for (int y = 0; y < sprite->GetHeight(); y++)
- cpackbitl16((const unsigned short *)&sprite->GetScanLine(y)[0], sprite->GetWidth(), out);
+ cpackbitl16((const uint16_t *)&sprite->GetScanLine(y)[0], sprite->GetWidth(), out);
} else {
for (int y = 0; y < sprite->GetHeight(); y++)
- cpackbitl32((const unsigned int *)&sprite->GetScanLine(y)[0], sprite->GetWidth(), out);
+ cpackbitl32((const uint32_t *)&sprite->GetScanLine(y)[0], sprite->GetWidth(), out);
}
}
@@ -503,10 +503,10 @@ void SpriteCache::UnCompressSprite(Bitmap *sprite, Stream *in) {
cunpackbitl(&sprite->GetScanLineForWriting(y)[0], sprite->GetWidth(), in);
} else if (depth == 2) {
for (int y = 0; y < sprite->GetHeight(); y++)
- cunpackbitl16((unsigned short *)&sprite->GetScanLineForWriting(y)[0], sprite->GetWidth(), in);
+ cunpackbitl16((uint16 *)&sprite->GetScanLineForWriting(y)[0], sprite->GetWidth(), in);
} else {
for (int y = 0; y < sprite->GetHeight(); y++)
- cunpackbitl32((unsigned int *)&sprite->GetScanLineForWriting(y)[0], sprite->GetWidth(), in);
+ cunpackbitl32((uint32_t *)&sprite->GetScanLineForWriting(y)[0], sprite->GetWidth(), in);
}
}
diff --git a/engines/ags/shared/ac/view.h b/engines/ags/shared/ac/view.h
index e05863aea3..6d6142ce64 100644
--- a/engines/ags/shared/ac/view.h
+++ b/engines/ags/shared/ac/view.h
@@ -24,6 +24,7 @@
#define AGS_SHARED_AC_VIEW_H
#include "ags/lib/std/vector.h"
+#include "ags/shared/core/types.h"
namespace AGS3 {
@@ -81,7 +82,7 @@ struct ViewStruct {
struct ViewStruct272 {
short numloops;
short numframes[16];
- int loopflags[16];
+ int32_t loopflags[16];
ViewFrame frames[16][20];
ViewStruct272();
diff --git a/engines/ags/shared/game/interactions.cpp b/engines/ags/shared/game/interactions.cpp
index 46021eb150..436b48f36d 100644
--- a/engines/ags/shared/game/interactions.cpp
+++ b/engines/ags/shared/game/interactions.cpp
@@ -242,8 +242,8 @@ Interaction *Interaction::CreateFromStream(Stream *in) {
if (evt_count > MAX_NEWINTERACTION_EVENTS)
quit("Can't deserialize interaction: too many events");
- int types[MAX_NEWINTERACTION_EVENTS];
- int load_response[MAX_NEWINTERACTION_EVENTS];
+ int32_t types[MAX_NEWINTERACTION_EVENTS];
+ int32_t load_response[MAX_NEWINTERACTION_EVENTS];
in->ReadArrayOfInt32(types, evt_count);
in->ReadArrayOfInt32(load_response, evt_count);
diff --git a/engines/ags/shared/gui/guimain.cpp b/engines/ags/shared/gui/guimain.cpp
index 9481df5d6a..7b9df54c6a 100644
--- a/engines/ags/shared/gui/guimain.cpp
+++ b/engines/ags/shared/gui/guimain.cpp
@@ -91,7 +91,7 @@ void GUIMain::InitDefaults() {
_ctrlDrawOrder.clear();
}
-int GUIMain::FindControlUnderMouse(int leeway, bool must_be_clickable) const {
+int32_t GUIMain::FindControlUnderMouse(int leeway, bool must_be_clickable) const {
if (loaded_game_file_version <= kGameVersion_262) {
// Ignore draw order On 2.6.2 and lower
for (size_t i = 0; i < _controls.size(); ++i) {
@@ -116,15 +116,15 @@ int GUIMain::FindControlUnderMouse(int leeway, bool must_be_clickable) const {
return -1;
}
-int GUIMain::FindControlUnderMouse() const {
+int32_t GUIMain::FindControlUnderMouse() const {
return FindControlUnderMouse(0, true);
}
-int GUIMain::FindControlUnderMouse(int leeway) const {
+int32_t GUIMain::FindControlUnderMouse(int leeway) const {
return FindControlUnderMouse(leeway, true);
}
-int GUIMain::GetControlCount() const {
+int32_t GUIMain::GetControlCount() const {
return (int32_t)_controls.size();
}
diff --git a/engines/ags/shared/gui/guimain.h b/engines/ags/shared/gui/guimain.h
index 670f52a980..2e56d313ce 100644
--- a/engines/ags/shared/gui/guimain.h
+++ b/engines/ags/shared/gui/guimain.h
@@ -188,7 +188,7 @@ private:
// Array of types and control indexes in global GUI object arrays;
// maps GUI child slots to actual controls and used for rebuilding Controls array
- typedef std::pair<GUIControlType, int32_t> ControlRef;
+ typedef std::pair<GUIControlType, int> ControlRef;
std::vector<ControlRef> _ctrlRefs;
// Array of child control references (not exclusively owned!)
std::vector<GUIObject *> _controls;
@@ -238,7 +238,7 @@ extern AGS_INLINE int get_fixed_pixel_size(int pixels);
// Those function have distinct implementations in Engine and Editor
extern void wouttext_outline(Shared::Bitmap *ds, int xxp, int yyp, int usingfont, color_t text_color, const char *texx);
extern int wgettextwidth_compensate(Shared::Bitmap *ds, const char *tex, int font);
-extern void check_font(int *fontnum);
+extern void check_font(int32_t *fontnum);
extern void set_our_eip(int eip);
#define SET_EIP(x) set_our_eip(x);
More information about the Scummvm-git-logs
mailing list