summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2013-05-05 20:51:08 +0200
committerkrzys-h <krzys_h@interia.pl>2013-05-05 20:51:08 +0200
commit40954038abfbba7d1c5986c93f5d88f0e3da11ec (patch)
tree078a22de493ef7caa26f69b0796235520bc628a7 /src
parent4dcee0a4d17cfe3b263a86c1b21d1a2bbf1eebca (diff)
downloadcolobot-40954038abfbba7d1c5986c93f5d88f0e3da11ec.tar.gz
colobot-40954038abfbba7d1c5986c93f5d88f0e3da11ec.tar.bz2
colobot-40954038abfbba7d1c5986c93f5d88f0e3da11ec.zip
Added error message for undefined command
Diffstat (limited to 'src')
-rw-r--r--src/object/robotmain.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 5791826..3715424 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -4005,6 +4005,10 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
continue;
}
+ if (Cmd(line, "Title")) continue; // Ignore
+ if (Cmd(line, "Resume")) continue; // Ignore
+ if (Cmd(line, "ScriptName")) continue; // Ignore
+
if (Cmd(line, "ScriptFile") && !resetObject) {
OpString(line, "name", m_scriptFile);
continue;
@@ -4915,6 +4919,11 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
AddNewScriptName(OpTypeObject(line, "type", OBJECT_NULL), name);
continue;
}
+
+ if (line[0] == '\n') continue; // Ignore empty lines
+ if (read[0] != 0) continue; // Ignore when loading saved game
+
+ GetLogger()->Error("Syntax error in file '%s' (line %d): Unknown command: %s", filename, lineNum, line); // Don't add \n at the end of log message - it's included in line variable
}
fclose(file);