projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added using checked memory handling functions to list handling
[rocksndiamonds.git]
/
src
/
game_bd
/
bd_c64import.c
diff --git
a/src/game_bd/bd_c64import.c
b/src/game_bd/bd_c64import.c
index a88255d9781b8183813e535ec3dbebba7359b95f..b838aa4323caeec908b9800a41f2ccd387d1fe14 100644
(file)
--- a/
src/game_bd/bd_c64import.c
+++ b/
src/game_bd/bd_c64import.c
@@
-1165,7
+1165,7
@@
static int cave_copy_from_plck(GdCave *cave, const guint8 *data,
for (j = 0; j < 12; j++)
cave->name[j] = data[0x1f2 + j];
for (j = 0; j < 12; j++)
cave->name[j] = data[0x1f2 + j];
-
g_strchomp
(cave->name); /* remove spaces */
+
chompString
(cave->name); /* remove spaces */
}
else
{
}
else
{
@@
-1452,12
+1452,12
@@
static int cave_copy_from_1stb(GdCave *cave, const guint8 *data, int remaining_b
c = ' '; /* don't know this, so change to space */
if (i > 0)
c = ' '; /* don't know this, so change to space */
if (i > 0)
- c =
g_ascii_
tolower(c);
+ c = tolower(c);
cave->name[i] = c;
}
cave->name[i] = c;
}
-
g_strchomp
(cave->name);
+
chompString
(cave->name);
cave->intermission = data[0x389] != 0;
cave->intermission = data[0x389] != 0;
@@
-1581,12
+1581,12
@@
static int cave_copy_from_crdr_7(GdCave *cave, const guint8 *data, int remaining
else
c = ' ';
if (i > 0)
else
c = ' ';
if (i > 0)
- c =
g_ascii_
tolower(c);
+ c = tolower(c);
cave->name[i] = c;
}
cave->name[i] = c;
}
-
g_strchomp
(cave->name); /* remove trailing and leading spaces */
+
chompString
(cave->name); /* remove trailing and leading spaces */
cave->selectable = data[14] != 0;
cave->selectable = data[14] != 0;
@@
-2028,12
+2028,12
@@
static int cave_copy_from_crli(GdCave *cave, const guint8 *data, int remaining_b
c = ' ';
if (i > 0)
c = ' ';
if (i > 0)
- c =
g_ascii_
tolower(c);
+ c = tolower(c);
cave->name[i] = c;
}
cave->name[i] = c;
}
-
g_strchomp
(cave->name); /* remove trailing and leading spaces */
+
chompString
(cave->name); /* remove trailing and leading spaces */
}
/* uncompress rle data */
}
/* uncompress rle data */
@@
-2355,9
+2355,9
@@
List *gd_caveset_import_from_buffer (const guint8 *buf, gsize length)
/* no name, so we make up one */
if (newcave->intermission)
/* no name, so we make up one */
if (newcave->intermission)
-
g_
snprintf(newcave->name, sizeof(newcave->name), _("Intermission %d"), cavenum - 15);
+ snprintf(newcave->name, sizeof(newcave->name), _("Intermission %d"), cavenum - 15);
else
else
-
g_
snprintf(newcave->name, sizeof(newcave->name), _("Cave %c"), 'A' + cavenum);
+ snprintf(newcave->name, sizeof(newcave->name), _("Cave %c"), 'A' + cavenum);
switch(format)
{
switch(format)
{
@@
-2407,9
+2407,9
@@
List *gd_caveset_import_from_buffer (const guint8 *buf, gsize length)
newcave->selectable = cavenum % 5 == 0; /* original selection scheme */
if (newcave->intermission)
newcave->selectable = cavenum % 5 == 0; /* original selection scheme */
if (newcave->intermission)
-
g_
snprintf(newcave->name, sizeof(newcave->name), _("Intermission %d"), cavenum / 5 + 1);
+ snprintf(newcave->name, sizeof(newcave->name), _("Intermission %d"), cavenum / 5 + 1);
else
else
-
g_
snprintf(newcave->name, sizeof(newcave->name), _("Cave %c"), 'A'+(cavenum % 5 + cavenum / 5 * 4));
+ snprintf(newcave->name, sizeof(newcave->name), _("Cave %c"), 'A'+(cavenum % 5 + cavenum / 5 * 4));
cavelength = cave_copy_from_dlb (newcave, buf + bufp, length - bufp);
break;
cavelength = cave_copy_from_dlb (newcave, buf + bufp, length - bufp);
break;
@@
-2509,14
+2509,14
@@
List *gd_caveset_import_from_buffer (const guint8 *buf, gsize length)
{
/* intermission */
if (numbering)
{
/* intermission */
if (numbering)
-
g_
snprintf(cave->name, sizeof(cave->name), _("Intermission %02d"), num);
+ snprintf(cave->name, sizeof(cave->name), _("Intermission %02d"), num);
else
else
-
g_
snprintf(cave->name, sizeof(cave->name), _("Intermission %d"), intermissionnum);
+ snprintf(cave->name, sizeof(cave->name), _("Intermission %d"), intermissionnum);
} else {
if (numbering)
} else {
if (numbering)
-
g_
snprintf(cave->name, sizeof(cave->name), _("Cave %02d"), num);
+ snprintf(cave->name, sizeof(cave->name), _("Cave %02d"), num);
else
else
-
g_
snprintf(cave->name, sizeof(cave->name), _("Cave %c"), 'A' - 1 + cavenum);
+ snprintf(cave->name, sizeof(cave->name), _("Cave %c"), 'A' - 1 + cavenum);
}
num++;
}
num++;