projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with not recognizing ".mode_loop: false" for music
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 21bede9a7be2fbf873b82a6ee3b2ae10e64d0512..79c7787936dc2ab8cc8cee8ed272c911a90f73f7 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-6620,21
+6620,21
@@
void LoadLevelTemplate(int nr)
LoadLevelTemplate_LoadAndInit();
}
LoadLevelTemplate_LoadAndInit();
}
-static void Load
LevelTemplateFromNetwork(struct LevelFileInfo *lfi_network_template
)
+static void Load
NetworkLevelTemplate(struct NetworkLevelInfo *network_level
)
{
{
- copyLevelFileInfo(
lfi_network_template
, &level_template.file_info);
+ copyLevelFileInfo(
&network_level->tmpl_info
, &level_template.file_info);
LoadLevelTemplate_LoadAndInit();
}
LoadLevelTemplate_LoadAndInit();
}
-static void LoadLevel_LoadAndInit(struct
LevelFileInfo *lfi_network_template
)
+static void LoadLevel_LoadAndInit(struct
NetworkLevelInfo *network_level
)
{
LoadLevelFromFileInfo(&level, &level.file_info, FALSE);
if (level.use_custom_template)
{
{
LoadLevelFromFileInfo(&level, &level.file_info, FALSE);
if (level.use_custom_template)
{
- if (
lfi_network_template
!= NULL)
- Load
LevelTemplateFromNetwork(lfi_network_template
);
+ if (
network_level
!= NULL)
+ Load
NetworkLevelTemplate(network_level
);
else
LoadLevelTemplate(-1);
}
else
LoadLevelTemplate(-1);
}
@@
-6648,6
+6648,8
@@
static void LoadLevel_LoadAndInit(struct LevelFileInfo *lfi_network_template)
void LoadLevel(int nr)
{
void LoadLevel(int nr)
{
+ SetLevelSetInfo(leveldir_current->identifier, nr);
+
setLevelFileInfo(&level.file_info, nr);
LoadLevel_LoadAndInit(NULL);
setLevelFileInfo(&level.file_info, nr);
LoadLevel_LoadAndInit(NULL);
@@
-6660,12
+6662,14
@@
void LoadLevelInfoOnly(int nr)
LoadLevelFromFileInfo(&level, &level.file_info, TRUE);
}
LoadLevelFromFileInfo(&level, &level.file_info, TRUE);
}
-void LoadLevelFromNetwork(struct LevelFileInfo *lfi_network_level,
- struct LevelFileInfo *lfi_network_template)
+void LoadNetworkLevel(struct NetworkLevelInfo *network_level)
{
{
- copyLevelFileInfo(lfi_network_level, &level.file_info);
+ SetLevelSetInfo(network_level->leveldir_identifier,
+ network_level->file_info.nr);
+
+ copyLevelFileInfo(&network_level->file_info, &level.file_info);
- LoadLevel_LoadAndInit(
lfi_network_template
);
+ LoadLevel_LoadAndInit(
network_level
);
}
static int SaveLevel_VERS(FILE *file, struct LevelInfo *level)
}
static int SaveLevel_VERS(FILE *file, struct LevelInfo *level)