projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disabled smooth movement for player entering exit in BD engine
[rocksndiamonds.git]
/
src
/
game_bd
/
bd_bdcff.c
diff --git
a/src/game_bd/bd_bdcff.c
b/src/game_bd/bd_bdcff.c
index 9972b7f2b9a4e0309002690d4ede7cccc2aa9da7..06e5e06ba2ae607c43ff4852e18c682db76e31c1 100644
(file)
--- a/
src/game_bd/bd_bdcff.c
+++ b/
src/game_bd/bd_bdcff.c
@@
-107,17
+107,17
@@
static boolean attrib_is_valid_for_cave(const char *attrib)
int i;
/* bdcff engine flag............ */
int i;
/* bdcff engine flag............ */
- if (strcasecmp(attrib, "Engine")
==
0)
+ if (strcasecmp(attrib, "Engine")
==
0)
return TRUE;
/* old flags - for compatibility */
return TRUE;
/* old flags - for compatibility */
- if (strcasecmp(attrib, "BD1Scheduling")
==
0)
+ if (strcasecmp(attrib, "BD1Scheduling")
==
0)
return TRUE;
return TRUE;
- if (strcasecmp(attrib, "SnapExplosions")
==
0)
+ if (strcasecmp(attrib, "SnapExplosions")
==
0)
return TRUE;
return TRUE;
- if (strcasecmp(attrib, "AmoebaProperties")
==
0)
+ if (strcasecmp(attrib, "AmoebaProperties")
==
0)
return TRUE;
/* search in property database */
return TRUE;
/* search in property database */
@@
-151,7
+151,7
@@
static boolean struct_set_property(gpointer str, const GdStructDescriptor *prop_
boolean was_string;
params = getSplitStringArray(param, " ", -1);
boolean was_string;
params = getSplitStringArray(param, " ", -1);
- paramcount = g
_strv_l
ength(params);
+ paramcount = g
etStringArrayL
ength(params);
identifier_found = FALSE;
/* check all known tags. do not exit this loop if identifier_found == true...
identifier_found = FALSE;
/* check all known tags. do not exit this loop if identifier_found == true...
@@
-188,12
+188,10
@@
static boolean struct_set_property(gpointer str, const GdStructDescriptor *prop_
if (prop_desc[i].type == GD_TYPE_LONGSTRING)
{
if (prop_desc[i].type == GD_TYPE_LONGSTRING)
{
- GString *str = *(GString **)value;
- char *compressed;
+ char **str = (char **)value;
- compressed = g_strcompress(param);
- g_string_assign(str, compressed);
- free(compressed);
+ checked_free(*str);
+ *str = getUnescapedString(param);
/* remember this to skip checking the number of parameters at the end of the function */
was_string = TRUE;
/* remember this to skip checking the number of parameters at the end of the function */
was_string = TRUE;
@@
-676,7
+674,7
@@
boolean gd_caveset_load_from_bdcff(const char *contents)
default_cave = gd_cave_new();
cave = default_cave;
default_cave = gd_cave_new();
cave = default_cave;
- linenum = g
_strv_l
ength(lines);
+ linenum = g
etStringArrayL
ength(lines);
for (lineno = 0; lineno < linenum; lineno++)
{
for (lineno = 0; lineno < linenum; lineno++)
{
@@
-1051,7
+1049,7
@@
boolean gd_caveset_load_from_bdcff(const char *contents)
params = getSplitStringArray(param, " ", -1);
/* an effect command has two parameters */
params = getSplitStringArray(param, " ", -1);
/* an effect command has two parameters */
- if (g
_strv_l
ength(params) == 2)
+ if (g
etStringArrayL
ength(params) == 2)
{
int i;
{
int i;