Fix regression introduced in revision 29355. First loadgame performed was destroying the game flags.

svn-id: r29356
This commit is contained in:
Nicola Mettifogo 2007-11-01 15:15:43 +00:00
parent 7c8bf86a45
commit c7f315b32c
2 changed files with 7 additions and 6 deletions

View File

@ -263,6 +263,8 @@ int Parallaction_ns::go() {
guiStart();
_engineFlags &= ~kEngineChangeLocation;
LocationName locname;
locname.bind(_location._name);

View File

@ -92,15 +92,14 @@ void Parallaction_ns::doLoadGame(uint16 slot) {
if (!f) return;
char s[30];
char n[16];
char l[16];
f->readLine(s, 29);
f->readLine(s, 15);
_char.setName(s);
f->readLine(n, 15);
f->readLine(_location._name, 15);
strcat(_location._name, ".");
f->readLine(l, 15);
f->readLine(s, 15);
_location._startPosition.x = atoi(s);
@ -160,7 +159,7 @@ void Parallaction_ns::doLoadGame(uint16 slot) {
// bugs, but it's a good maneuver anyway
strcpy(_characterName1, "null");
strcat(_location._name, _char.getName());
sprintf(_location._name, "%s.%s" , l, n);
_engineFlags |= kEngineChangeLocation;
return;