projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fa7336e
)
removed unused variables
author
Holger Schemel
<info@artsoft.org>
Sat, 18 Aug 2018 13:12:44 +0000
(15:12 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sat, 18 Aug 2018 13:12:44 +0000
(15:12 +0200)
src/files.c
patch
|
blob
|
history
diff --git
a/src/files.c
b/src/files.c
index 37864e0d6a274679d0c6710bfa34c7f922fd9303..3cb8fc725f4f67036aa167f5921fc058b09fca1c 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-6206,7
+6206,7
@@
void LoadLevelFromFilename(struct LevelInfo *level, char *filename)
LoadLevelFromFileInfo(level, &level_file_info, FALSE);
}
LoadLevelFromFileInfo(level, &level_file_info, FALSE);
}
-static void LoadLevel_InitVersion(struct LevelInfo *level
, char *filename
)
+static void LoadLevel_InitVersion(struct LevelInfo *level)
{
int i, j;
{
int i, j;
@@
-6526,7
+6526,7
@@
static void LoadLevel_InitCustomElements(struct LevelInfo *level)
}
}
}
}
-static void LoadLevel_InitElements(struct LevelInfo *level
, char *filename
)
+static void LoadLevel_InitElements(struct LevelInfo *level)
{
LoadLevel_InitStandardElements(level);
{
LoadLevel_InitStandardElements(level);
@@
-6538,7
+6538,7
@@
static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
InitElementPropertiesGfxElement();
}
InitElementPropertiesGfxElement();
}
-static void LoadLevel_InitPlayfield(struct LevelInfo *level
, char *filename
)
+static void LoadLevel_InitPlayfield(struct LevelInfo *level)
{
int x, y;
{
int x, y;
@@
-6570,7
+6570,7
@@
static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename)
SetBorderElement();
}
SetBorderElement();
}
-static void LoadLevel_InitNativeEngines(struct LevelInfo *level
,char *filename
)
+static void LoadLevel_InitNativeEngines(struct LevelInfo *level)
{
struct LevelFileInfo *level_file_info = &level->file_info;
{
struct LevelFileInfo *level_file_info = &level->file_info;
@@
-6580,8
+6580,6
@@
static void LoadLevel_InitNativeEngines(struct LevelInfo *level,char *filename)
void LoadLevelTemplate(int nr)
{
void LoadLevelTemplate(int nr)
{
- char *filename;
-
if (!fileExists(getGlobalLevelTemplateFilename()))
{
Error(ERR_WARN, "no level template found for this level");
if (!fileExists(getGlobalLevelTemplateFilename()))
{
Error(ERR_WARN, "no level template found for this level");
@@
-6590,33
+6588,29
@@
void LoadLevelTemplate(int nr)
}
setLevelFileInfo(&level_template.file_info, nr);
}
setLevelFileInfo(&level_template.file_info, nr);
- filename = level_template.file_info.filename;
LoadLevelFromFileInfo(&level_template, &level_template.file_info, FALSE);
LoadLevelFromFileInfo(&level_template, &level_template.file_info, FALSE);
- LoadLevel_InitVersion(&level_template
, filename
);
- LoadLevel_InitElements(&level_template
, filename
);
+ LoadLevel_InitVersion(&level_template);
+ LoadLevel_InitElements(&level_template);
ActivateLevelTemplate();
}
void LoadLevel(int nr)
{
ActivateLevelTemplate();
}
void LoadLevel(int nr)
{
- char *filename;
-
setLevelFileInfo(&level.file_info, nr);
setLevelFileInfo(&level.file_info, nr);
- filename = level.file_info.filename;
LoadLevelFromFileInfo(&level, &level.file_info, FALSE);
if (level.use_custom_template)
LoadLevelTemplate(-1);
LoadLevelFromFileInfo(&level, &level.file_info, FALSE);
if (level.use_custom_template)
LoadLevelTemplate(-1);
- LoadLevel_InitVersion(&level
, filename
);
- LoadLevel_InitElements(&level
, filename
);
- LoadLevel_InitPlayfield(&level
, filename
);
+ LoadLevel_InitVersion(&level);
+ LoadLevel_InitElements(&level);
+ LoadLevel_InitPlayfield(&level);
- LoadLevel_InitNativeEngines(&level
, filename
);
+ LoadLevel_InitNativeEngines(&level);
}
void LoadLevelInfoOnly(int nr)
}
void LoadLevelInfoOnly(int nr)