Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed bug: Wrong error message 'illegal level', if loading .cm maps for network play.

Browse source
This commit is contained in:
johns 2002-03-31 17:37:19 +00:00
parent 1ffde615e0
commit 5101cadc15
2 changed files with 12 additions and 3 deletions

3
doc/ChangeLog.html
View file

@ -762,7 +762,8 @@
<LI>New video frame and game simulation timing code written. Closes bug
#205006.
<LI>Fixed feature request #499301: Find idle workers (from Jimmy Salmon).
<LI>++
<LI>Fixed bug: Wrong error message "illegal level", if loading .cm maps for network play.
<LI>+++
</UL>
</UL>

12
src/game/game.cpp
View file

@ -85,17 +85,25 @@ local void LoadFreeCraftMap(const char* filename,
DebugLevel3Fn("%p \n",map);
if (lcm_prevent_recurse) {
fprintf(stderr,"recursive use of load clone map!\n");
fprintf(stderr,"recursive use of load FreeCraft map!\n");
exit(-1);
}
lcm_prevent_recurse = 1;
gh_eval_file((char*)filename);
lcm_prevent_recurse = 0;
#if 0
// Not true if multiplayer levels!
if (!ThisPlayer) { /// ARI: bomb if nothing was loaded!
fprintf(stderr,"%s: invalid clone map\n", filename);
fprintf(stderr,"%s: invalid FreeCraft map\n", filename);
exit(-1);
}
// FIXME: Retrieve map->Info from somewhere... If LoadPud is used in CCL it magically is set there :)
#endif
if( !TheMap.Width || !TheMap.Height ) {
fprintf(stderr,"%s: invalid FreeCraft map\n", filename);
exit(-1);
}
}
/**