[Scummvm-git-logs] scummvm master -> 5aa8ae6a952299cb3cfc8377d28092d5d9ccb348
sev-
noreply at scummvm.org
Fri Dec 16 10:20:17 UTC 2022
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d0ab65a318 AGS: sprintf -> snprintf
58dee08718 CHEWY: Comment out unused variable
5aa8ae6a95 ICB: Fix warnings
Commit: d0ab65a31829e39c043b4b6877cd0e7cdb9e3fb4
https://github.com/scummvm/scummvm/commit/d0ab65a31829e39c043b4b6877cd0e7cdb9e3fb4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-16T11:14:41+01:00
Commit Message:
AGS: sprintf -> snprintf
Changed paths:
engines/ags/lib/alfont/alfont.cpp
diff --git a/engines/ags/lib/alfont/alfont.cpp b/engines/ags/lib/alfont/alfont.cpp
index 3e1ec23b02f..b585969c888 100644
--- a/engines/ags/lib/alfont/alfont.cpp
+++ b/engines/ags/lib/alfont/alfont.cpp
@@ -836,7 +836,7 @@ void alfont_textout_aa_ex(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int
memset(s_pointer, 0, nLen);
precedingchar_pointer = (char *)malloc(2 * sizeof(char));
memset(precedingchar_pointer, 0, 2);
- sprintf(precedingchar_pointer, "%c", f->precedingchar);
+ snprintf(precedingchar_pointer, 2 * sizeof(char), "%c", f->precedingchar);
strcpy(s_pointer, precedingchar_pointer);
if (precedingchar_pointer) {
free(precedingchar_pointer);
@@ -1932,7 +1932,7 @@ void alfont_textout_ex(BITMAP * bmp, ALFONT_FONT * f, const char *s, int x, int
memset(s_pointer, 0, nLen);
precedingchar_pointer = (char *)malloc(2 * sizeof(char));
memset(precedingchar_pointer, 0, 2);
- sprintf(precedingchar_pointer, "%c", f->precedingchar);
+ snprintf(precedingchar_pointer, 2 * sizeof(char), "%c", f->precedingchar);
strcpy(s_pointer, precedingchar_pointer);
if (precedingchar_pointer) {
free(precedingchar_pointer);
@@ -2743,7 +2743,7 @@ int alfont_text_length(ALFONT_FONT * f, const char *str) {
memset(str_pointer, 0, nLen);
precedingchar_pointer = (char *)malloc(2 * sizeof(char));
memset(precedingchar_pointer, 0, 2);
- sprintf(precedingchar_pointer, "%c", f->precedingchar);
+ snprintf(precedingchar_pointer, 2 * sizeof(char), "%c", f->precedingchar);
strcpy(str_pointer, precedingchar_pointer);
if (precedingchar_pointer) {
free(precedingchar_pointer);
@@ -3131,7 +3131,7 @@ int alfont_text_count(ALFONT_FONT * f, const char *str) {
memset(str_pointer, 0, nLen);
precedingchar_pointer = (char *)malloc(2 * sizeof(char));
memset(precedingchar_pointer, 0, 2);
- sprintf(precedingchar_pointer, "%c", f->precedingchar);
+ snprintf(precedingchar_pointer, 2 * sizeof(char), "%c", f->precedingchar);
strcpy(str_pointer, precedingchar_pointer);
if (precedingchar_pointer) {
free(precedingchar_pointer);
@@ -3380,7 +3380,7 @@ int alfont_ugetc(ALFONT_FONT * f, const char *s) {
memset(s_pointer, 0, nLen);
precedingchar_pointer = (char *)malloc(2 * sizeof(char));
memset(precedingchar_pointer, 0, 2);
- sprintf(precedingchar_pointer, "%c", f->precedingchar);
+ snprintf(precedingchar_pointer, 2 * sizeof(char), "%c", f->precedingchar);
strcpy(s_pointer, precedingchar_pointer);
if (precedingchar_pointer) {
free(precedingchar_pointer);
@@ -3628,7 +3628,7 @@ int alfont_ugetx(ALFONT_FONT * f, char **s) {
memset(s_pointer, 0, nLen);
precedingchar_pointer = (char *)malloc(2 * sizeof(char));
memset(precedingchar_pointer, 0, 2);
- sprintf(precedingchar_pointer, "%c", f->precedingchar);
+ snprintf(precedingchar_pointer, 2 * sizeof(char), "%c", f->precedingchar);
strcpy(s_pointer, precedingchar_pointer);
if (precedingchar_pointer) {
free(precedingchar_pointer);
@@ -3935,7 +3935,7 @@ int alfont_ugetxc(ALFONT_FONT * f, const char **s) {
memset(s_pointer, 0, nLen);
precedingchar_pointer = (char *)malloc(2 * sizeof(char));
memset(precedingchar_pointer, 0, 2);
- sprintf(precedingchar_pointer, "%c", f->precedingchar);
+ snprintf(precedingchar_pointer, 2 * sizeof(char), "%c", f->precedingchar);
strcpy(s_pointer, precedingchar_pointer);
if (precedingchar_pointer) {
free(precedingchar_pointer);
@@ -4482,7 +4482,7 @@ int alfont_need_uconvert(ALFONT_FONT * f, const char *str) {
memset(str_pointer, 0, nLen);
precedingchar_pointer = (char *)malloc(2 * sizeof(char));
memset(precedingchar_pointer, 0, 2);
- sprintf(precedingchar_pointer, "%c", f->precedingchar);
+ snprintf(precedingchar_pointer, 2 * sizeof(char), "%c", f->precedingchar);
strcpy(str_pointer, precedingchar_pointer);
if (precedingchar_pointer) {
free(precedingchar_pointer);
Commit: 58dee08718f1032c238664d20310dd735634b7fb
https://github.com/scummvm/scummvm/commit/58dee08718f1032c238664d20310dd735634b7fb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-16T11:15:26+01:00
Commit Message:
CHEWY: Comment out unused variable
Changed paths:
engines/chewy/audio/module_tmf.cpp
diff --git a/engines/chewy/audio/module_tmf.cpp b/engines/chewy/audio/module_tmf.cpp
index 36efeb1fa21..7704087e4f4 100644
--- a/engines/chewy/audio/module_tmf.cpp
+++ b/engines/chewy/audio/module_tmf.cpp
@@ -56,7 +56,7 @@ bool Chewy::Module_TMF::load(Common::SeekableReadStream& stream, int offs) {
// Copy instrument data.
uint8 fineTune, instVolume;
uint32 repeatPoint, repeatLength, sampleLength;
- uint32 totalSampleLength = 0;
+ //uint32 totalSampleLength = 0;
for (int i = 0; i < NUM_SAMPLES; ++i) {
fineTune = stream.readByte();
@@ -70,7 +70,7 @@ bool Chewy::Module_TMF::load(Common::SeekableReadStream& stream, int offs) {
// Sample length is at the end instead of at the start.
sampleLength = stream.readUint32LE();
assert(sampleLength <= 0x1FFFF && sampleLength % 2 == 0);
- totalSampleLength += sampleLength;
+ //totalSampleLength += sampleLength;
// Instrument name is not present in TMF data.
Common::copy(TMF_MOD_INSTRUMENT_NAME, TMF_MOD_INSTRUMENT_NAME + 23, sample[i].name);
Commit: 5aa8ae6a952299cb3cfc8377d28092d5d9ccb348
https://github.com/scummvm/scummvm/commit/5aa8ae6a952299cb3cfc8377d28092d5d9ccb348
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-16T11:17:54+01:00
Commit Message:
ICB: Fix warnings
Changed paths:
engines/icb/surface_manager.cpp
diff --git a/engines/icb/surface_manager.cpp b/engines/icb/surface_manager.cpp
index 177ecb8cf62..f10fe509d3e 100644
--- a/engines/icb/surface_manager.cpp
+++ b/engines/icb/surface_manager.cpp
@@ -79,6 +79,8 @@ void _surface_manager::PrintDebugLabel(const char *mess, uint32 c) {
Release_surface_DC( working_buffer_id, dc);*/
y += 15;
}
+
+ (void)y;
}
void _surface_manager::PrintTimer(char label, uint32 time, uint32 limit) {
@@ -109,6 +111,7 @@ void _surface_manager::PrintTimer(char label, uint32 time, uint32 limit) {
Release_surface_DC( working_buffer_id, dc);*/
x += 54;
}
+ (void)x;
}
_surface_manager::_surface_manager() {
@@ -210,7 +213,7 @@ void _surface_manager::Reset_Effects() {
void _surface_manager::Flip() {
// Draw Frame rate monitor if it's switched on
static uint32 g_fpsCounter = 0;
- static float g_fpsTotalTime = 0.0f;
+ //static float g_fpsTotalTime = 0.0f;
static float g_fpsEndTime = 0.0f;
static float g_fpsStartTime = 0.0f;
@@ -221,14 +224,14 @@ void _surface_manager::Flip() {
if ((nowTime > 1000.0f) || (nowTime < 1.0f))
nowTime = 83.0f;
- g_fpsTotalTime += nowTime;
+ //g_fpsTotalTime += nowTime;
//float averageFps = (float)(g_fpsTotalTime / ((double)g_fpsCounter + 1.0f));
//float currentFPS = (float)(1000.0f / (double)nowTime);
//float averageFPS = (float)(1000.0f / (double)averageFps);
if ((++g_fpsCounter) > 0xffffff00) {
- g_fpsTotalTime = 0.0f;
+ //g_fpsTotalTime = 0.0f;
g_fpsCounter = 0;
}
More information about the Scummvm-git-logs
mailing list